refine TPF-specific build instructions based on feedback

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@124817 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/htdocs/manual/install-tpf.html b/htdocs/manual/install-tpf.html
index e9600d7e6869f5f01ec375fad9c5d7f275ef59d6..56eb76e9d77853084a42a594ec50998b692126e8 100644 (file)
--- a/htdocs/manual/install-tpf.html
+++ b/htdocs/manual/install-tpf.html
@@ -26,6 +26,7 @@
         [ <a href="#download">Download</a> |
         <a href="#compilation">Compilation</a> |
         <a href="#installation">Installation</a> |
+        <a href="#activation">Activation</a> |
         <a href="#linkmap">Link Map</a>&nbsp;] 
         <hr />
     </center>
@@ -66,9 +67,13 @@
 
     <ol>
         <li>
-            <p>Download the compressed Apache files (the "tarball")
-            to your PC. The file name on the web site will be
-            <tt>apache_1.3.<i>vv</i>.tar.Z</tt>.</p>
+            <p>Download the compressed Apache 1.3 files (the "tarball") from
+           <a href="http://httpd.apache.org/download.cgi">http://httpd.apache.org/download.cgi</a>
+           to your PC.  The file name on the web site will be
+           <tt>apache_1.3.<i>vv</i>.tar.Z</tt>, where "<tt><i>vv</i></tt>" 
+           is the version number.
+           Replaced "<tt><i>vv</i></tt>" throughout these instructions
+           with the actual version number.</p>
 
             <p>
             <font color="#CC6600"><font size="+1">TIP:</font></font>
@@ -119,8 +124,7 @@
                 binary:&nbsp;&nbsp;<b><tt>binary</tt></b>&nbsp;</li>
 
                 <li>send the file to OS/390 UNIX:<br />
-                 <b><tt>&nbsp;&nbsp;&nbsp;send&nbsp;"c:/<i>path</i>/apache_1.3.
-                <i>vv</i>.tar.Z"&nbsp;apache_1.3.<i>vv</i>.tar.Z</tt></b></li>
+                 <b><tt>&nbsp;&nbsp;&nbsp;send&nbsp;"c:/<i>path</i>/apache_1.3.<i>vv</i>.tar.Z"&nbsp;apache_1.3.<i>vv</i>.tar.Z</tt></b></li>
 
                 <li>exit FTP:&nbsp;&nbsp;<b><tt>bye</tt></b></li>
             </ul>
@@ -135,7 +139,7 @@
         </li>
 
         <li>
-            <p>Decompress and extract the archived files necessary
+       <p>On your OS/390 UNIX machine, decompress and extract the archived files necessary
             for compiling Apache:</p>
 
             <p class="indented">
@@ -413,7 +417,7 @@
                to generate modules.c, include/ap_config_auto.h, and
                necessary Makefiles:</p>
 
-            <p class="indented"><b><tt>Configure</tt></b></p>
+            <p class="indented"><b><tt>./Configure</tt></b></p>
 
             <table class="indented">
                 <tr>
@@ -445,7 +449,7 @@ $
             you want to maintain multiple configurations:</p>
 
             <p class="indented">
-            <b><tt>Configure&nbsp;-file&nbsp;Configuration.2nd</tt></b></p>
+            <b><tt>./Configure&nbsp;-file&nbsp;Configuration.2nd</tt></b></p>
 
             <table class="indented">
                 <tr>
@@ -696,7 +700,8 @@ Creating Makefile
             <p>Create the Apache run-time configuration file. The
             server requires a configuration file to initialize
             itself during activation.<br />
-             Copy the distribution version, conf/httpd.conf-dist,
+           Copy the distribution version, conf/httpd.conf-dist
+           from the decompressed tarball on your PC,
             to conf/httpd.conf and then edit the conf/httpd.conf
             copy with your site specific information.</p>
 
@@ -841,15 +846,22 @@ Creating Makefile
 
              <b><tt>zinet&nbsp;start&nbsp;s-apache</tt></b></p>
         </li>
+    </ol>
 
-        <li>
-            <p>Request a page from your browser:</p>
+    <center>
+        <h2><a id="activation"
+           name="activation"></a>Activation</h2>
+    </center>
+
+    <ol>
+           <li><p>Request a page from your browser:</p>
 
             <p class="indented">
             <tt><b>http://<i>xx.xx.xx.xx</i></b></tt>&nbsp;&nbsp;&nbsp;(where
             <i>xx.xx.xx.xx</i> is your test system IP address)</p>
         </li>
-    </ol><br />
+    </ol>
+    <br />
      
 
     <center>
@@ -972,6 +984,7 @@ regex/regfree.o
         [ <a href="#top">top</a> | <a href="#download">Download</a>
         | <a href="#compilation">Compilation</a> |
         <a href="#installation">Installation</a> |
+        <a href="#activation">Activation</a> |
         <a href="#linkmap">Link Map</a>&nbsp;]
     </center>
 </body>

diff --git a/htdocs/manual/install-ztpf.html b/htdocs/manual/install-ztpf.html
index 85e80ed942435429ad4d7b6908eb31d078deb5e4..d25a1fe283ee1ecacad4532aab25fd196541f126 100644 (file)
--- a/htdocs/manual/install-ztpf.html
+++ b/htdocs/manual/install-ztpf.html
@@ -26,7 +26,8 @@
         [ <a href="#download">Download</a> |
         <a href="#setup">MakeTPF Setup</a> |
         <a href="#compilation">Compilation</a> |
-        <a href="#installation">Installation</a>&nbsp;] 
+        <a href="#installation">Installation</a> |
+        <a href="#activation">Activation</a>&nbsp;] 
         <hr />
     </center>
 
@@ -68,9 +69,13 @@
 
     <ol>
         <li>
-            <p>Download the compressed Apache files (the "tarball")
-            to your PC. The file name on the web site will be
-            <tt>apache_1.3.<i>vv</i>.tar.Z</tt>.</p>
+            <p>Download the compressed Apache 1.3 files (the "tarball") from
+           <a href="http://httpd.apache.org/download.cgi">http://httpd.apache.org/download.cgi</a>
+           to your PC.  The file name on the web site will be
+           <tt>apache_1.3.<i>vv</i>.tar.Z</tt>, where "<tt><i>vv</i></tt>" 
+           is the version number.
+           Replaced "<tt><i>vv</i></tt>" throughout these instructions
+           with the actual version number.</p>
 
             <p>
             <font color="#CC6600"><font size="+1">TIP:</font></font>
@@ -122,8 +127,7 @@
 
                 <li>send the file to your Linux build
                 machine:<br />
-                 <b><tt>&nbsp;&nbsp;&nbsp;send&nbsp;"c:/<i>path</i>/apache_1.3.
-                <i>vv</i>.tar.Z"&nbsp;apache_1.3.<i>vv</i>.tar.Z</tt></b></li>
+                 <b><tt>&nbsp;&nbsp;&nbsp;send&nbsp;"c:/<i>path</i>/apache_1.3.<i>vv</i>.tar.Z"&nbsp;apache_1.3.<i>vv</i>.tar.Z</tt></b></li>
 
                 <li>exit FTP:&nbsp;&nbsp;<b><tt>bye</tt></b></li>
             </ul>
@@ -134,8 +138,8 @@
         </li>
 
         <li>
-            <p>Decompress and extract the archived files necessary
-            for compiling Apache:</p>
+       <p>On your Linux build machine, decompress and extract the
+               archived files necessary for compiling Apache:</p>
 
             <p class="indented"><b><tt>tar -xzkf
             apache_1.3.<i>vv</i>.tar.Z "*/src"</tt></b></p>
@@ -154,8 +158,7 @@
             for other platforms but are not for z/TPF:</p>
 
             <p class="indented"><b><tt>cp
-            apache_1.3.<i>vv</i>/src/os/tpf/samples/test_char.txt&nbsp;&nbsp;apache_1.3.<i>
-            vv</i>/src/main/test_char.h<br />
+            apache_1.3.<i>vv</i>/src/os/tpf/samples/test_char.txt&nbsp;&nbsp;apache_1.3.<i>vv</i>/src/main/test_char.h<br />
              cp
             apache_1.3.<i>vv</i>/src/os/tpf/samples/uri_delims.txt
             apache_1.3.<i>vv</i>/src/main/uri_delims.h</tt></b></p>
@@ -175,10 +178,11 @@
              Replace "<tt>foobar</tt>" below with your actual
             directory name:</p>
 
-            <p class="indented"><b><tt>mkdir -p
-            foobar/opensource<br />
+           <p class="indented"><b><tt>
              export AROOT="foobar/opensource/apache"<br />
-             mv apache_1.3.<i>vv</i> $AROOT<br /></tt></b></p>
+            mkdir -p $AROOT<br />
+            mv apache_1.3.<i>vv</i>/* $AROOT<br />
+            </tt></b></p>
         </li>
 
         <li>
@@ -293,7 +297,7 @@
 
             <p class="indented"><b><tt>export TPF=YES; export
             TPF64BIT=YES<br />
-             Configure</tt></b></p>
+             ./Configure</tt></b></p>
 
             <table class="indented">
                 <tr>
@@ -332,7 +336,7 @@ $
             you want to maintain multiple configurations:</p>
 
             <p class="indented">
-            <b><tt>Configure&nbsp;-file&nbsp;Configuration.2nd</tt></b></p>
+            <b><tt>./Configure&nbsp;-file&nbsp;Configuration.2nd</tt></b></p>
 
             <table class="indented">
                 <tr>
@@ -421,7 +425,8 @@ Creating Makefile
             <p>Create the Apache run-time configuration file. The
             server requires a configuration file to initialize
             itself during activation.<br />
-             Copy the distribution version, conf/httpd.conf-dist,
+           Copy the distribution version, conf/httpd.conf-dist
+           from the decompressed tarball on your PC,
             to conf/httpd.conf and then edit the conf/httpd.conf
             copy with your site specific information.</p>
 
@@ -514,11 +519,9 @@ Creating Makefile
 
             <table class="indented">
                 <tr>
-                    <td class="output">
-                        <pre>
-[<i>timestamp</i>] [notice] Apache/1.3.<i>vv</i> (TPF) configured -- resuming normal operations
-[<i>timestamp</i>] [notice] Accept mutex: tpfcore (Default: tpfcore)
-                        </pre>
+                   <td class="output">
+<pre>[<i>timestamp</i>] [notice] Apache/1.3.<i>vv</i> (TPF) configured -- resuming normal operations
+[<i>timestamp</i>] [notice] Accept mutex: tpfcore (Default: tpfcore)</pre>
                     </td>
                 </tr>
             </table>
@@ -534,22 +537,32 @@ Creating Makefile
 
              <b><tt>zinet&nbsp;start&nbsp;s-apache</tt></b></p>
         </li>
+    </ol>
+    <br />
+     
 
-        <li>
-            <p>Request a page from your browser:</p>
+    <center>
+        <h2><a id="activation"
+           name="activation"></a>Activation</h2>
+    </center>
+
+    <ol>
+           <li><p>Request a page from your browser:</p>
 
             <p class="indented">
             <tt><b>http://<i>xx.xx.xx.xx</i></b></tt>&nbsp;&nbsp;&nbsp;(where
             <i>xx.xx.xx.xx</i> is your test system IP address)</p>
         </li>
     </ol>
+
     <hr />
 
     <center>
         [ <a href="#top">top</a> | <a href="#download">Download</a>
         [ <a href="#setup">MakeTPF Setup</a> |
         <a href="#compilation">Compilation</a> |
-        <a href="#installation">Installation</a>&nbsp;]
+        <a href="#installation">Installation</a> |
+        <a href="#activation">Activation</a>&nbsp;]
     </center>
 </body>
 </html>