Index: server/config.c
===================================================================
--- server/config.c	(revision 154044)
+++ server/config.c	(working copy)
@@ -1404,8 +1404,9 @@
     errmsg = ap_build_config(&parms, p, ptemp, conftree);
     if (errmsg) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                     "Syntax error in -C/-c directive:" APR_EOL_STR "%s",
-                     errmsg);
+                     "Syntax error in -C/-c directive:");
+        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                     "%s", errmsg);
         exit(1);
     }
 
Index: server/mpm/winnt/mpm_winnt.c
===================================================================
--- server/mpm/winnt/mpm_winnt.c	(revision 153439)
+++ server/mpm/winnt/mpm_winnt.c	(working copy)
@@ -668,7 +668,7 @@
     if ((rv = apr_procattr_io_set(attr, APR_FULL_BLOCK, 
                                   APR_NO_PIPE, APR_NO_PIPE)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
-                        "Parent: Unable to create child stdin pipe.\n");
+                        "Parent: Unable to create child stdin pipe.");
         apr_pool_destroy(ptemp);
         return -1;
     }
@@ -679,7 +679,7 @@
         || ((rv = apr_procattr_child_out_set(attr, child_out, NULL)) 
                 != APR_SUCCESS)) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
-                        "Parent: Unable to connect child stdout to NUL.\n");
+                        "Parent: Unable to connect child stdout to NUL.");
         apr_pool_destroy(ptemp);
         return -1;
     }
@@ -697,7 +697,7 @@
         if ((rv = apr_procattr_child_err_set(attr, child_err, NULL))
                 != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
-                            "Parent: Unable to connect child stderr.\n");
+                            "Parent: Unable to connect child stderr.");
             apr_pool_destroy(ptemp);
             return -1;
         }
Index: server/mpm_common.c
===================================================================
--- server/mpm_common.c	(revision 153439)
+++ server/mpm_common.c	(working copy)
@@ -225,8 +225,7 @@
             ap_log_error(APLOG_MARK, APLOG_ALERT,
                          0, ap_server_conf,
                          "Child %" APR_PID_T_FMT
-                         " returned a Fatal error..." APR_EOL_STR
-                         "Apache is exiting!",
+                         " returned a Fatal error... Apache is exiting!",
                          pid->pid);
             return APEXIT_CHILDFATAL;
         }
Index: modules/proxy/proxy_util.c
===================================================================
--- modules/proxy/proxy_util.c	(revision 153439)
+++ modules/proxy/proxy_util.c	(working copy)
@@ -707,7 +707,7 @@
 
 	if (bits != 32)		/* no warning for fully qualified IP address */
             ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-	      "Warning: NetMask not supplied with IP-Addr; guessing: %s/%ld\n",
+	      "Warning: NetMask not supplied with IP-Addr; guessing: %s/%ld",
 		 inet_ntoa(This->addr), bits);
     }
 
@@ -715,11 +715,11 @@
 
     if (*addr == '\0' && (This->addr.s_addr & ~This->mask.s_addr) != 0) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-	    "Warning: NetMask and IP-Addr disagree in %s/%ld\n",
+	    "Warning: NetMask and IP-Addr disagree in %s/%ld",
 		inet_ntoa(This->addr), bits);
 	This->addr.s_addr &= This->mask.s_addr;
         ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-	    "         Set to %s/%ld\n",
+	    "         Set to %s/%ld",
 		inet_ntoa(This->addr), bits);
     }
 
Index: modules/ssl/ssl_engine_kernel.c
===================================================================
--- modules/ssl/ssl_engine_kernel.c	(revision 153439)
+++ modules/ssl/ssl_engine_kernel.c	(working copy)
@@ -553,7 +553,7 @@
     if (renegotiate && !renegotiate_quick && (r->method_number == M_POST)) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "SSL Re-negotiation in conjunction "
-                     "with POST method not supported!\n"
+                     "with POST method not supported! "
                      "hint: try SSLOptions +OptRenegotiate");
 
         return HTTP_METHOD_NOT_ALLOWED;
@@ -1794,7 +1794,7 @@
         else if (where & SSL_CB_ALERT) {
             char *str = (where & SSL_CB_READ) ? "read" : "write";
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Alert: %s:%s:%s\n",
+                         "%s: Alert: %s:%s:%s",
                          SSL_LIBRARY_NAME, str,
                          SSL_alert_type_string_long(rc),
                          SSL_alert_desc_string_long(rc));