You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2014/05/23 04:23:44 UTC
svn commit: r1597004 - in /httpd/httpd/trunk/docs: ./
manual/getting-started.xml
Author: takashi
Date: Fri May 23 02:23:44 2014
New Revision: 1597004
URL: http://svn.apache.org/r1597004
Log:
merge r1537109 from 2.4(!):
Doc : reordering a section for better understanding
Modified:
httpd/httpd/trunk/docs/ (props changed)
httpd/httpd/trunk/docs/manual/getting-started.xml
Propchange: httpd/httpd/trunk/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 02:23:44 2014
@@ -0,0 +1,3 @@
+/httpd/httpd/branches/2.4.x/docs:1537109
+/httpd/httpd/branches/revert-ap-ldap/docs:1150158-1150173
+/httpd/httpd/branches/wombat-integration/docs:723609-723841
Modified: httpd/httpd/trunk/docs/manual/getting-started.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/getting-started.xml?rev=1597004&r1=1597003&r2=1597004&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/getting-started.xml (original)
+++ httpd/httpd/trunk/docs/manual/getting-started.xml Fri May 23 02:23:44 2014
@@ -75,15 +75,15 @@ the servername to an IP address - the lo
server resides. Thus, in order for your web server to be reachable, it
is necessary that the servername be in DNS.</p>
+<p>If you don't know how to do this, you'll need to contact your network
+administrator, or Internet service provider, to perform this step for
+you.</p>
+
<p>More than one hostname may point to the same IP address, and more
than one IP address can be attached to the same physical server. Thus, you
can run more than one web site on the same physical server, using a
feature called <a href="vhosts/">virtual hosts</a>.</p>
-<p>If you don't know how to do this, you'll need to contact your network
-administrator, or Internet service provider, to perform this step for
-you.</p>
-
<p>If you are testing a server that is not Internet-accessible, you
can put host names in your hosts file in order to do local resolution.
For example, you might want to put a record in your hosts file to map a