Commit 11c65c47 authored by Noirin Plunkett's avatar Noirin Plunkett
Browse files

Tidying up 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@515254 13f79535-47bb-0310-9956-ffa450edef68
parent 01dfdfd2

docs/manual/bind.html.en

+3 −3
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ 
       and port 8080 on another, use</p>



    <div class="example"><p><code>

      Listen 192.170.2.1:80<br />

      Listen 192.170.2.5:8000

      Listen 192.0.2.1:80<br />

      Listen 192.0.2.5:8000

    </code></p></div>



    <p>IPv6 addresses must be enclosed in square brackets, as in the
@@ -119,7 +119,7 @@ 


    <div class="example"><p><code>

      Listen 0.0.0.0:80<br />

      Listen 192.170.2.1:80

      Listen 192.0.2.1:80

    </code></p></div>



    <p>If your platform supports it and you want Apache to handle IPv4 and

docs/manual/bind.xml.meta

+4 −4
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
  <relpath>.</relpath>



  <variants>

    <variant>de</variant>

    <variant htmlonly="yes">de</variant>

    <variant>en</variant>

    <variant outdated="yes">fr</variant>

    <variant outdated="yes">ja</variant>

    <variant outdated="yes">ko</variant>

    <variant htmlonly="yes">fr</variant>

    <variant htmlonly="yes">ja</variant>

    <variant htmlonly="yes">ko</variant>

  </variants>

</metafile>

docs/manual/mod/mpm_common.html.en

+5 −5
Original line number Diff line number Diff line
@@ -90,13 +90,13 @@ accepting requests on network sockets</td></tr> 
      <dd>uses the <code>flock(2)</code> system call to lock the

      file defined by the optional <var>/path/to/lockfile</var>

      parameter. One can also use the <code class="directive"><a href="#lockfile">LockFile</a></code> directive to specify the lockfile,

      although this is depreciated.</dd>

      although this is deprecated.</dd>



      <dt><code>fcntl&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>

      <dd>uses the <code>fcntl(2)</code> system call to lock the

      file defined by the optional <var>/path/to/lockfile</var>

      parameter. One can also use the <code class="directive"><a href="#lockfile">LockFile</a></code> directive to specify the lockfile,

      although this is depreciated.</dd>

      although this is deprecated.</dd>



      <dt><code>file&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>

      <dd>This directive tells Apache to pick the "best" file locking
@@ -371,7 +371,7 @@ The <var>protocol</var> argument was added in 2.1.5</td></tr> 
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

<div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">Directive</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the accept serialization lock file <em>(depreciated)</em></td></tr>

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the accept serialization lock file <em>(deprecated)</em></td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LockFile <var>filename</var></code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LockFile logs/accept.lock</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
@@ -394,8 +394,8 @@ The <var>protocol</var> argument was added in 2.1.5</td></tr> 
      creating a lockfile with the same name as the one the server will try

      to create.</p>

    </div>

    <div class="warning"><h3>Depreciated</h3>

      <p>This directive is depreciated. It is strongly suggested that

    <div class="warning"><h3>Deprecated</h3>

      <p>This directive is deprecated. It is strongly suggested that

      you use <code class="directive"><a href="#acceptmutex">AcceptMutex</a></code> to

      specify both the mutex locking implementation as well as

      the lockfile location.</p>