diff options
author | Stefan Fritsch <sf@apache.org> | 2011-10-01 22:57:36 +0200 |
---|---|---|
committer | Stefan Fritsch <sf@apache.org> | 2011-10-01 22:57:36 +0200 |
commit | a83284e10365f9baf39331e545dde65ecdc99ef1 (patch) | |
tree | 62b5783c3c8bdd535762acfcac4676621f71bc25 /docs/manual/platform | |
parent | grammar fix (diff) | |
download | apache2-a83284e10365f9baf39331e545dde65ecdc99ef1.tar.xz apache2-a83284e10365f9baf39331e545dde65ecdc99ef1.zip |
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1178089 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/platform')
-rw-r--r-- | docs/manual/platform/netware.html.en | 58 | ||||
-rw-r--r-- | docs/manual/platform/netware.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/platform/win_compiling.html.en | 42 | ||||
-rw-r--r-- | docs/manual/platform/win_compiling.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/platform/windows.html.en | 12 | ||||
-rw-r--r-- | docs/manual/platform/windows.xml.ko | 2 |
6 files changed, 59 insertions, 59 deletions
diff --git a/docs/manual/platform/netware.html.en b/docs/manual/platform/netware.html.en index 4a1eee1f76..15ce059c1c 100644 --- a/docs/manual/platform/netware.html.en +++ b/docs/manual/platform/netware.html.en @@ -58,9 +58,9 @@ - <p>Apache 2.0 is designed to run on NetWare 6.0 service pack 3 + <p>Apache 2.0 is designed to run on NetWare 6.0 service pack 3 and above. If you are running a service pack less - than SP3, you must install the latest + than SP3, you must install the latest <a href="http://developer.novell.com/ndk/libc.htm">NetWare Libraries for C (LibC)</a>.</p> @@ -69,7 +69,7 @@ <p>Apache 2.0 for NetWare can also be run in a NetWare 5.1 environment as long as the latest service pack or the latest version of the <a href="http://developer.novell.com/ndk/libc.htm">NetWare Libraries - for C (LibC)</a> has been installed . <strong>WARNING:</strong> Apache 2.0 + for C (LibC)</a> has been installed . <strong>WARNING:</strong> Apache 2.0 for NetWare has not been targeted for or tested in this environment.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -83,7 +83,7 @@ will list the current release, any more recent alpha or beta-test releases, together with details of mirror web and anonymous ftp sites. Binary builds of the latest releases of - Apache 2.0 for NetWare can be downloaded from + Apache 2.0 for NetWare can be downloaded from <a href="http://www.apache.org/dist/httpd/binaries/netware">here</a>.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -93,7 +93,7 @@ <p>There is no Apache install program for NetWare currently. If you - are building Apache 2.0 for NetWare from source, you will need to + are building Apache 2.0 for NetWare from source, you will need to copy the files over to the server manually.</p> <p>Follow these steps to install Apache on NetWare from the @@ -127,7 +127,7 @@ <li>Create a directory under <code>SYS:/APACHE2</code> called <code>BIN</code></li> - <li>Copy <code>HTDIGEST.NLM</code>, <code>HTPASSWD.NLM</code>, + <li>Copy <code>HTDIGEST.NLM</code>, <code>HTPASSWD.NLM</code>, <code>HTDBM.NLM</code>, <code>LOGRES.NLM</code>, <code>ROTLOGS.NLM</code> to <code>SYS:/APACHE2/BIN</code></li> @@ -138,7 +138,7 @@ <code>SYS:/APACHE2/CONF</code> directory and rename to <code>HTTPD.CONF</code></li> - <li>Copy the <code>MIME.TYPES</code>, <code>CHARSET.CONV</code> and + <li>Copy the <code>MIME.TYPES</code>, <code>CHARSET.CONV</code> and <code>MAGIC</code> files to <code>SYS:/APACHE2/CONF</code> directory</li> <li>Copy all files and subdirectories in <code>\HTTPD-2.0\DOCS\ICONS</code> @@ -174,9 +174,9 @@ <p>Apache may be installed to other volumes besides the default <code>SYS</code> volume.</p> <p>During the build process, adding the keyword "install" to the makefile command line - will automatically produce a complete distribution package under the subdirectory - <code>DIST</code>. Install Apache by simply copying the distribution that was produced - by the makfiles to the root of a NetWare volume (see: <a href="#comp">Compiling Apache for + will automatically produce a complete distribution package under the subdirectory + <code>DIST</code>. Install Apache by simply copying the distribution that was produced + by the makfiles to the root of a NetWare volume (see: <a href="#comp">Compiling Apache for NetWare</a> below).</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -277,7 +277,7 @@ <p>Apache 2.0 for NetWare includes a set of command line directives that can be used to modify or display information about the running instance of the - web server. These directives are only available while Apache is running. Each + web server. These directives are only available while Apache is running. Each of these directives must be preceded by the keyword <code>APACHE2</code>.</p> <dl> @@ -299,7 +299,7 @@ <dt>SETTINGS</dt> <dd>Enables or disables the thread status display - on the console. When enabled, the state of each running threads is displayed + on the console. When enabled, the state of each running threads is displayed on the Apache console screen.</dd> <dt>SHUTDOWN</dt> @@ -322,7 +322,7 @@ <p>Apache is configured by reading configuration files usually stored - in the <code>conf</code> directory. These are the same as files used + in the <code>conf</code> directory. These are the same as files used to configure the Unix version, but there are a few different directives for Apache on NetWare. See the <a href="../">Apache documentation</a> for all the available directives.</p> @@ -370,11 +370,11 @@ </li> <li> - <p>The directives that accept filenames as arguments must use - NetWare filenames instead of Unix names. However, because Apache - uses Unix-style names internally, forward slashes must be used - rather than backslashes. It is recommended that all rooted file paths - begin with a volume name. If omitted, Apache will assume the + <p>The directives that accept filenames as arguments must use + NetWare filenames instead of Unix names. However, because Apache + uses Unix-style names internally, forward slashes must be used + rather than backslashes. It is recommended that all rooted file paths + begin with a volume name. If omitted, Apache will assume the <code>SYS:</code> volume which may not be correct.</p> </li> @@ -425,8 +425,8 @@ - <p>Compiling Apache requires MetroWerks CodeWarrior 6.x or higher. Once - Apache has been built, it can be installed to the root of any NetWare + <p>Compiling Apache requires MetroWerks CodeWarrior 6.x or higher. Once + Apache has been built, it can be installed to the root of any NetWare volume. The default is the <code>sys:/Apache2</code> directory.</p> <p>Before running the server you must fill out the <code>conf</code> @@ -495,7 +495,7 @@ for example: <div class="example"><p><code>Set ZLIBSDK=D:\NOVELL\zlib</code></p></div> </li> - + <li>Set the environment variable <code>PCRESDK</code> to the location where you installed the source code for the PCRE Library, for example: <div class="example"><p><code>Set PCRESDK=D:\NOVELL\pcre</code></p></div> @@ -527,11 +527,11 @@ <li>Change directory to <code>\httpd-2.0</code> and build the prebuild utilities by running "<code>gmake -f nwgnumakefile prebuild</code>". This target will create - the directory <code>\httpd-2.0\nwprebuild</code> and copy each of the utilities + the directory <code>\httpd-2.0\nwprebuild</code> and copy each of the utilities to this location that are necessary to complete the following build steps. </li> - <li>Copy the files <code>\httpd-2.0\nwprebuild\GENCHARS.nlm</code> and + <li>Copy the files <code>\httpd-2.0\nwprebuild\GENCHARS.nlm</code> and <code>\httpd-2.0\nwprebuild\DFTABLES.nlm</code> to the <code>SYS:</code> volume of a NetWare server and run them using the following commands: <div class="example"><p><code> @@ -589,7 +589,7 @@ <ul> - <li>To build all of the experimental modules, set the environment + <li>To build all of the experimental modules, set the environment variable <code>EXPERIMENTAL</code>: <div class="example"><p><code>Set EXPERIMENTAL=1</code></p></div> </li> @@ -607,14 +607,14 @@ - <p>By default Apache for NetWare uses the built-in module + <p>By default Apache for NetWare uses the built-in module <code class="module"><a href="../mod/mod_nw_ssl.html">mod_nw_ssl</a></code> to provide SSL services. This module simply enables the native SSL services implemented in NetWare OS to handle all encryption for a given port. Alternatively, mod_ssl can also be used in the same manner as on other platforms.</p> <p>Before mod_ssl can be built for the NetWare platform, the OpenSSL - libraries must be provided. This can be done through the following + libraries must be provided. This can be done through the following steps:</p> <ul> @@ -623,8 +623,8 @@ page (older 0.9.7 versions need to be patched and are therefore not recommended).</li> - <li>Edit the file <code>NetWare/set_env.bat</code> and modify any - tools and utilities paths so that they correspond to your build + <li>Edit the file <code>NetWare/set_env.bat</code> and modify any + tools and utilities paths so that they correspond to your build environment.</li> <li>From the root of the OpenSSL source directory, run the following @@ -635,7 +635,7 @@ </code></p></div> For performance reasons you should enable to build with ASM code. Download NASM from the <a href="http://nasm.sourceforge.net/">SF site</a>. - Then configure OpenSSL to use ASM code: + Then configure OpenSSL to use ASM code: <div class="example"><p><code> Netware\build netware-libc nw-nasm enable-mdc2 enable-md5 </code></p></div> diff --git a/docs/manual/platform/netware.xml.ko b/docs/manual/platform/netware.xml.ko index c630da97e3..4a52341733 100644 --- a/docs/manual/platform/netware.xml.ko +++ b/docs/manual/platform/netware.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 105989:1021924 (outdated) --> +<!-- English Revision: 105989:1174747 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en index dc33e706dd..997b52e849 100644 --- a/docs/manual/platform/win_compiling.html.en +++ b/docs/manual/platform/win_compiling.html.en @@ -100,7 +100,7 @@ a newer or different version of the Platform SDK.</p> <p>To use Visual C++ 6.0 or 7.0 (Studio 2000 .NET), the Platform SDK - environment must be prepared using the <code>setenv.bat</code> + environment must be prepared using the <code>setenv.bat</code> script (installed by the Platform SDK) before starting the command line build or launching the msdev/devenv GUI environment. Installing the Platform SDK for Visual Studio Express versions (2003 and later) @@ -117,7 +117,7 @@ <p>Several steps recommended here require a perl interpreter during the build preparation process, but it is otherwise not required.</p> - + <p>To install Apache within the build system, several files are modified using the <code>awk.exe</code> utility. awk was chosen since it is a very small download (compared with Perl or WSH/VB) and @@ -141,12 +141,12 @@ awk.exe is in your system path.</div> <div class="note">Also note that if you are using Cygwin tools - (<a href="http://www.cygwin.com/">http://www.cygwin.com/</a>) - the awk utility is named <code>gawk.exe</code> and that the file + (<a href="http://www.cygwin.com/">http://www.cygwin.com/</a>) + the awk utility is named <code>gawk.exe</code> and that the file <code>awk.exe</code> is really a symlink to the <code>gawk.exe</code> - file. The Windows command shell does not recognize symlinks, and - because of this building InstallBin will fail. A workaround is - to delete <code>awk.exe</code> from the cygwin installation and + file. The Windows command shell does not recognize symlinks, and + because of this building InstallBin will fail. A workaround is + to delete <code>awk.exe</code> from the cygwin installation and copy <code>gawk.exe</code> to <code>awk.exe</code>. Also note the cygwin/mingw ports of gawk 3.0.x were buggy, please upgrade to 3.1.x before attempting to use any gawk port.</div> @@ -156,9 +156,9 @@ <p>[Optional] zlib library (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p> <p>Zlib must be installed into a <code>srclib</code> subdirectory named - <code>zlib</code>. This must be built in-place. Zlib can be obtained + <code>zlib</code>. This must be built in-place. Zlib can be obtained from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the - <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is confirmed to work correctly with + <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is confirmed to work correctly with version 1.2.3.</p> <div class="example"><p><code> @@ -177,22 +177,22 @@ software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see - if this is permitted. See + if this is permitted. See <a href="http://www.wassenaar.org/">http://www.wassenaar.org/</a> for more information.</div> <p>Configuring and building OpenSSL requires perl to be installed.</p> - <p>OpenSSL must be installed into a <code>srclib</code> subdirectory - named <code>openssl</code>, obtained from - <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile + <p>OpenSSL must be installed into a <code>srclib</code> subdirectory + named <code>openssl</code>, obtained from + <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> or the <code>abs.exe</code> project, which - is ab.c with SSL support enabled. To prepare OpenSSL to be linked + is ab.c with SSL support enabled. To prepare OpenSSL to be linked to Apache mod_ssl or abs.exe, and disable patent encumbered features in OpenSSL, you might use the following build commands:</p> <div class="example"><p><code> - perl Configure no-rc5 no-idea enable-mdc2 enable-zlib VC-WIN32 + perl Configure no-rc5 no-idea enable-mdc2 enable-zlib VC-WIN32 -Ipath/to/srclib/zlib -Lpath/to/srclib/zlib<br /> ms\do_masm.bat<br /> nmake -f ms\ntdll.mak @@ -203,7 +203,7 @@ load the zlib dll. Note the suggested patch enables the -L flag to work with windows builds, corrects the name of zdll.lib and ensures .pdb files are generated for troubleshooting. If the assembler is - not installed, you would add no-asm above and use ms\do_ms.bat + not installed, you would add no-asm above and use ms\do_ms.bat instead of the ms\do_masm.bat script.</div> </li> @@ -266,7 +266,7 @@ step the code to find bugs and track down problems.</p> <p>You can add your apr-util dbd and dbm provider choices with the - additional make (environment) variables DBD_LIST and DBM_LIST, + additional make (environment) variables DBD_LIST and DBM_LIST, see the comments about [Optional] Database libraries, above. Review the initial comments in Makefile.win for additional options that can be provided when invoking the build.</p> @@ -318,7 +318,7 @@ <p>Visual Studio 2002 (.NET) and later users should also use the Build menu, Configuration Manager dialog to uncheck both the <code>Debug</code> - and <code>Release</code> Solution modules <code>abs</code>, + and <code>Release</code> Solution modules <code>abs</code>, <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> and <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> components, as well as every component starting with <code>apr_db*</code>. These modules are built by invoking <code>nmake</code>, or the IDE directly with the @@ -339,8 +339,8 @@ <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>. The .mak files also support a broader range of C++ tool chain distributions, such as Visual Studio Express.</p> - <p>You must first build all projects in order to create all dynamic - auto-generated targets, so that dependencies can be parsed correctly. + <p>You must first build all projects in order to create all dynamic + auto-generated targets, so that dependencies can be parsed correctly. Build the entire project from within the Visual Studio 6.0 (98) IDE, using the <code>BuildAll</code> target, then use the Project Menu Export for all makefiles (checking on "with dependencies".) Run the following @@ -363,7 +363,7 @@ a <code>sysincl.dat</code> file, which lists all exceptions. Update this file (including both forward and backslashed paths, such as both <code>sys/time.h</code> and <code>sys\time.h</code>) to ignore such - newer dependencies. Including local-install paths in a distributed + newer dependencies. Including local-install paths in a distributed <code>.mak</code> file will cause the build to fail completely.</p> <p>If you contribute back a patch that revises project files, we diff --git a/docs/manual/platform/win_compiling.xml.ko b/docs/manual/platform/win_compiling.xml.ko index 9cefade6d9..ce299a474a 100644 --- a/docs/manual/platform/win_compiling.xml.ko +++ b/docs/manual/platform/win_compiling.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 105989:1029865 (outdated) --> +<!-- English Revision: 105989:1174747 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en index 5f229189a9..805c6ba35c 100644 --- a/docs/manual/platform/windows.html.en +++ b/docs/manual/platform/windows.html.en @@ -25,7 +25,7 @@ <p>This document explains how to install, configure and run Apache 2.3 under Microsoft Windows. If you have questions after reviewing the documentation (and any event and error logs), you - should consult the peer-supported + should consult the peer-supported <a href="http://httpd.apache.org/userslist.html">users' mailing list</a>.</p> @@ -78,7 +78,7 @@ <p>There is a choice between an *-openssl-*.msi flavor and a *-no_ssl.msi flavor. The *-openssl-*.msi flavor is distributed - by the Apache Software Foundation under ECCN 5D002 pursuant to + by the Apache Software Foundation under ECCN 5D002 pursuant to US Export Law license exception TSU. This law may or may not apply to your circumstance, please review the httpd README as well as the <a href="http://www.apache.org/licenses/exports/">ASF @@ -139,7 +139,7 @@ <li><p><strong>Where to install.</strong> The default path is <code>C:\Program Files\Apache Software Foundation</code> - under which a directory called + under which a directory called <code>Apache2.3</code> will be created by default.</p></li> </ol> @@ -189,7 +189,7 @@ <p>The installation options above can be customized by users familiar with msiexec.exe options and silent installation. The actual installer - sources are available in the httpd/httpd/win32-msi/ tree of the httpd + sources are available in the httpd/httpd/win32-msi/ tree of the httpd project subversion respository. For reference, some of the more common variables which may be modified are;</p> @@ -211,7 +211,7 @@ <li><code>SetupType</code> (default "Typical")</li> </ul> - <p>The installation level of various features, which may be individually + <p>The installation level of various features, which may be individually toggled, include;</p> <ul> @@ -273,7 +273,7 @@ <li><p>The directives that accept filenames as arguments must use Windows filenames instead of Unix ones. However, because Apache may interpret backslashes as an "escape character" sequence, you - should consistently use forward slashes in path names, not + should consistently use forward slashes in path names, not backslashes. Drive letters can be used; if omitted, the drive of the SystemRoot directive (or -d command line option) becomes the default.</p></li> diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko index e6105b4b0f..939297be03 100644 --- a/docs/manual/platform/windows.xml.ko +++ b/docs/manual/platform/windows.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 105989:1043126 (outdated) --> +<!-- English Revision: 105989:1174747 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more |