You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2013/04/18 18:17:19 UTC
svn commit: r1469406 - in /httpd/httpd/branches/2.4.x/docs: man/ manual/
manual/mod/ manual/programs/
Author: humbedooh
Date: Thu Apr 18 16:17:19 2013
New Revision: 1469406
URL: http://svn.apache.org/r1469406
Log:
xforms
Modified:
httpd/httpd/branches/2.4.x/docs/man/fcgistarter.8
httpd/httpd/branches/2.4.x/docs/manual/expr.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.html.en
httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.html.en
httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.tr
httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en
Modified: httpd/httpd/branches/2.4.x/docs/man/fcgistarter.8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/man/fcgistarter.8?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/man/fcgistarter.8 (original)
+++ httpd/httpd/branches/2.4.x/docs/man/fcgistarter.8 Thu Apr 18 16:17:19 2013
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "FCGISTARTER" 8 "2012-03-16" "Apache HTTP Server" "fcgistarter"
+.TH "FCGISTARTER" 8 "2013-04-18" "Apache HTTP Server" "fcgistarter"
.SH NAME
fcgistarter \- Start a FastCGI program
@@ -49,10 +49,10 @@ Currently only works on Unix systems\&.
FastCGI program
.TP
-p \fIport\fR
-Port which the program will listens on
+Port which the program will listen on
.TP
-i \fIinterface\fR
-Interface which the program will listens on
+Interface which the program will listen on
.TP
-N \fInum\fR
Number of instances of the program
Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.html.en?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.html.en Thu Apr 18 16:17:19 2013
@@ -434,9 +434,17 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>unescape</code></td>
<td>Unescape %hex encoded string, leaving encoded slashes alone;
return empty string if %00 is found</td><td /></tr>
-<tr class="odd"><td><code>file</code></td>
+<tr class="odd"><td><code>base64</code></td>
+ <td>Encode the string using base64 encoding</td><td /></tr>
+<tr><td><code>unbase64</code></td>
+ <td>Decode base64 encoded string, return truncated string if 0x00 is
+ found</td><td /></tr>
+<tr class="odd"><td><code>sha1</code></td>
+ <td>Hash the string using SHA1, then encode the hash with hexadecimal
+ encoding</td><td /></tr>
+<tr><td><code>file</code></td>
<td>Read contents from a file</td><td>yes</td></tr>
-<tr><td><code>filesize</code></td>
+<tr class="odd"><td><code>filesize</code></td>
<td>Return size of a file (or 0 if file does not exist or is not
regular file)</td><td>yes</td></tr>
</table>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.html.en?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.html.en Thu Apr 18 16:17:19 2013
@@ -53,7 +53,7 @@
<div class="section">
<h2><a name="features" id="features">Features</a></h2>
- Definition of a macro:
+ <p>Definition of a macro:</p>
<ul>
<li> macro definition within a <Macro> section, following
the apache style.</li>
@@ -85,7 +85,7 @@
backslash-continued independent lines.</p></li>
</ul>
- Use of a macro:
+ <p>Use of a macro:</p>
<ul>
<li> number of arguments must match the definition.</li>
<li> all occurences of macro parameters are substituted by their values.</li>
@@ -98,10 +98,10 @@
<li> <code>@</code>-prefixed parameters are escaped in quotes.</li>
</ul>
- Removal of a macro definition:
+ <p>Removal of a macro definition:</p>
<ul>
<li> the macro must be already defined.</li>
- </ul>
+ </ul>
<pre class="prettyprint lang-config">
<Macro DirGroup $dir $group>
@@ -194,7 +194,7 @@ Use RestrictedAccessPolicy "192.54.172.0
</pre>
- is equivalent, with the macros defined above, to:
+ <p>is equivalent, with the macros defined above, to:</p>
<pre class="prettyprint lang-config">
order deny,allow
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.html.en?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.html.en Thu Apr 18 16:17:19 2013
@@ -53,10 +53,10 @@
<dd>FastCGI program</dd>
<dt><code>-p <var>port</var></code></dt>
- <dd>Port which the program will listens on</dd>
+ <dd>Port which the program will listen on</dd>
<dt><code>-i <var>interface</var></code></dt>
- <dd>Interface which the program will listens on</dd>
+ <dd>Interface which the program will listen on</dd>
<dt><code>-N <var>num</var></code></dt>
<dd>Number of instances of the program</dd>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.fr?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.fr Thu Apr 18 16:17:19 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1301728 -->
+<!-- English Revision: 1301728:1469400 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.meta?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.meta Thu Apr 18 16:17:19 2013
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
- <variant>tr</variant>
+ <variant outdated="yes">fr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.tr?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/fcgistarter.xml.tr [utf-8] Thu Apr 18 16:17:19 2013
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1301728 -->
+<!-- English Revision: 1301728:1469400 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en?rev=1469406&r1=1469405&r2=1469406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en Thu Apr 18 16:17:19 2013
@@ -118,6 +118,10 @@
<code class="directive"><a href="./mod/mod_authz_core.html#requirenone">RequireNone</a></code>, and
<code class="directive"><a href="./mod/mod_authz_core.html#requireall">RequireAll</a></code>.</p>
+ <p>If you use <code class="module"><a href="./mod/mod_authz_dbm.html">mod_authz_dbm</a></code>, you must port your
+ configuration to use <code>Require dbm-group ...</code> in place
+ of <code>Require group ...</code>.</p>
+
<h4><a name="access" id="access">Access control</a></h4>