From: Christophe Jaillet Date: Sun, 5 Jan 2014 18:31:39 +0000 (+0000) Subject: Sync a few doc with 2.4.x branch (!) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5540f51e107c7b9861b6589e235a4ecd9cfe9b3a;p=thirdparty%2Fapache%2Fhttpd.git Sync a few doc with 2.4.x branch (!) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555604 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/getting-started.xml b/docs/manual/getting-started.xml index bfca85087ac..cc375e07282 100644 --- a/docs/manual/getting-started.xml +++ b/docs/manual/getting-started.xml @@ -39,10 +39,10 @@ Addresses on the Web are expressed with URLs - Uniform Resource Locators www.apache.org), a URL-path (e.g. /docs/current/getting-started.html), and possibly a query string (e.g. ?arg=value) used to pass additional -arguments to the server. +arguments to the server.

-

A client (e.g., a web browser) connects to a server (e.g., your Apache HTTP Server), +

A client (e.g., a web browser) connects to a server (e.g., your Apache HTTP Server), with the specified protocol, and makes a request for a resource using the URL-path.

diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml index 43edd940396..7829aa6194a 100644 --- a/docs/manual/new_features_2_4.xml +++ b/docs/manual/new_features_2_4.xml @@ -34,7 +34,7 @@
Core Enhancements
-
Loadable MPMs
+
Run-time Loadable MPMs
Multiple MPMs can now be built as loadable modules at compile time. The MPM of choice can be configured at run time.