From: Jeff Trawick Date: Thu, 6 Nov 2014 14:22:41 +0000 (+0000) Subject: make docs X-Git-Tag: 2.4.11~192 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8358b4efe599d541cfb0120efd7e172529f8fea;p=apache make docs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1637115 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 00b0b9f950..514b307c20 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -454,7 +454,8 @@ listfunction ::= listfuncname "(" word ")"Hash the string using SHA1, then encode the hash with hexadecimal encoding file - Read contents from a fileyes + Read contents from a file (including line endings, when present) + yes filesize Return size of a file (or 0 if file does not exist or is not regular file)yes @@ -502,7 +503,12 @@ listfunction ::= listfuncname "(" word ")" +</Directory> + +# Check a HTTP header for a list of values +<If "%{HTTP:X-example-header} in { 'foo', 'bar', 'baz'}"> + Header set matched true +</If>
top
@@ -512,7 +518,7 @@ listfunction ::= listfuncname "(" word ")"NameAlternative Description -in in - string contained in string list + string contained in wordlist /regexp/ m#regexp# Regular expression (the second form allows different diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr index 4c182faf88..f254bfcbb0 100644 --- a/docs/manual/expr.html.fr +++ b/docs/manual/expr.html.fr @@ -24,6 +24,8 @@

Langues Disponibles:  en  |  fr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

Historiquement, il existe de nombreuses variantes dans la syntaxe des expressions permettant d'exprimer une condition dans les diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr index cf7ff8fe65..79209522c5 100644 --- a/docs/manual/expr.xml.fr +++ b/docs/manual/expr.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta index d5a2e5e1a5..ea324a8bb2 100644 --- a/docs/manual/expr.xml.meta +++ b/docs/manual/expr.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en index 1cefa2fc50..b8ab605459 100644 --- a/docs/manual/platform/win_compiling.html.en +++ b/docs/manual/platform/win_compiling.html.en @@ -28,21 +28,24 @@

There are many important points to consider before you begin compiling - Apache. See Using Apache with Microsoft - Windows before you begin.

+ Apache HTTP Server (httpd). See Using Apache HTTP + Server on Microsoft Windows before you begin.

+ +

httpd can be built on Windows using a cmake-based build system or with + Visual Studio project files maintained by httpd developers. The cmake-based + build system directly supports more versions of Visual Studio but currently + has considerable functional limitations.

-
-
top
-
-

Building from Unix sources

+ + +

Building from Unix sources

@@ -281,9 +284,9 @@ below.

-
top
-
-

Command-Line Build

+ + +

Command-Line Build

@@ -306,9 +309,9 @@ Review the initial comments in Makefile.win for additional options that can be provided when invoking the build.

-
top
-
-

Developer Studio Workspace IDE Build

+ + +

Developer Studio Workspace IDE Build

@@ -362,9 +365,9 @@ zlib exist, and based on the setting of DBD_LIST and DBM_LIST environment variables.

-
top
-
-

Exporting command-line .mak files

+ + +

Exporting command-line .mak files

@@ -406,9 +409,9 @@ should be simple, with minimal compilation and linkage flags that can be recognized by all Visual Studio environments.

-
top
-
-

Installation

+ + +

Installation

@@ -430,9 +433,9 @@ to be installed into \Apache22 (of the current drive).

-
top
-
-

Warning about building Apache from the development tree

+ + +

Warning about building Apache from the development tree

@@ -444,6 +447,33 @@ unnecessary if you build from within the Microsoft Developer Studio environment.
+ +
top
+
+

Building httpd with cmake

+ + +

The primary documentation for this build mechanism is in the + README.cmake file in the source distribution. Refer to that file + for detailed instructions.

+ +

Building httpd with cmake requires building APR and APR-util separately. + Refer to their README.cmake files for instructions.

+ +

The primary limitations of the cmake-based build are inherited from the APR-util + project, and are listed below because of their impact on httpd:

+ + +

Available Languages:  en  | diff --git a/docs/manual/platform/win_compiling.html.fr b/docs/manual/platform/win_compiling.html.fr index becfa13f91..0e2251b216 100644 --- a/docs/manual/platform/win_compiling.html.fr +++ b/docs/manual/platform/win_compiling.html.fr @@ -26,6 +26,8 @@  fr  |  ko 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

Il y a de nombreux points importants à connaître avant de diff --git a/docs/manual/platform/win_compiling.xml.fr b/docs/manual/platform/win_compiling.xml.fr index 862ded0970..d3a4e8ad70 100644 --- a/docs/manual/platform/win_compiling.xml.fr +++ b/docs/manual/platform/win_compiling.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/platform/win_compiling.xml.ko b/docs/manual/platform/win_compiling.xml.ko index 401a8ef7dc..b6f3e282f7 100644 --- a/docs/manual/platform/win_compiling.xml.ko +++ b/docs/manual/platform/win_compiling.xml.ko @@ -1,7 +1,7 @@ - + - + + + +