summaryrefslogtreecommitdiffstats
path: root/docs/manual/getting-started.xml
diff options
context:
space:
mode:
authorTakashi Sato <takashi@apache.org>2014-05-23 04:23:44 +0200
committerTakashi Sato <takashi@apache.org>2014-05-23 04:23:44 +0200
commitf1e916cdd84c3d0b6908167aa90b89c2ee71c9b1 (patch)
tree592acf24e59953ecb91c5ae83e93d6b4e4b06e14 /docs/manual/getting-started.xml
parentthe fixup hook should log (what is expected to be) local (diff)
downloadapache2-f1e916cdd84c3d0b6908167aa90b89c2ee71c9b1.tar.xz
apache2-f1e916cdd84c3d0b6908167aa90b89c2ee71c9b1.zip
merge r1537109 from 2.4(!):
Doc : reordering a section for better understanding git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1597004 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/getting-started.xml')
-rw-r--r--docs/manual/getting-started.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/manual/getting-started.xml b/docs/manual/getting-started.xml
index 8192076b25..730b756118 100644
--- a/docs/manual/getting-started.xml
+++ b/docs/manual/getting-started.xml
@@ -75,15 +75,15 @@ the servername to an IP address - the location on the Internet where the
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