From 428dbcc57459db04e8ec0b8066670f8f67fbfdde Mon Sep 17 00:00:00 2001
From: Richard Bowen <rbowen@apache.org>
Date: Mon, 21 Jan 2013 14:34:45 +0000
Subject: [PATCH] Adds mod_macro french and resolves svn (minor) svn conflicts.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436372 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_macro.html.en | 18 +++++++++---------
 docs/manual/mod/mod_macro.xml     | 22 ++++++++++------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en
index 7c1af94968a..b537a6f981a 100644
--- a/docs/manual/mod/mod_macro.html.en
+++ b/docs/manual/mod/mod_macro.html.en
@@ -53,8 +53,8 @@
 <div class="section">
 <h2><a name="features" id="features">Features</a></h2>
 
-<p>
-    Definition of a macro:
+<p>Definition of a macro:</p>
+
 </p>
     <ul>
     <li> macro definition within a &lt;Macro&gt; section, following
@@ -87,8 +87,8 @@
          backslash-continued independent lines.</p></li>
     </ul>
 
-<p>
-    Use of a macro:
+<p>Use of a macro:</p>
+
 </p>
     <ul>
     <li> number of arguments must match the definition.</li>
@@ -102,14 +102,14 @@
     <li> <code>@</code>-prefixed parameters are escaped in quotes.</li>
     </ul>
 
-<p>
-   Removal of a macro definition:
+<p>Removal of a macro definition:</p>
+
 </p>
    <ul>
    <li> the macro must be already defined.</li>
    </ul>
 
-    <pre class="prettyprint lang-config">
+<pre class="prettyprint lang-config">
 &lt;Macro DirGroup $dir $group&gt;
   &lt;Directory $dir&gt;
     require group $group
@@ -120,7 +120,7 @@ Use DirGroup /www/apache/private private
 Use DirGroup /www/apache/server  admin
 
 UndefMacro DirGroup
-    </pre>
+</pre>
 
 
 </div>
@@ -188,7 +188,7 @@ UndefMacro RestrictedAccessPolicy
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_macro</td></tr>
 </table>
-    <p> The <code class="directive">Use</code> directive controls the use of a macro.
+    <p>The <code class="directive">Use</code> directive controls the use of a macro.
     The specified macro is expanded. It must be given the same number of
     arguments than in the  macro definition. The provided values are
     associated to their corresponding initial parameters and are substituted
diff --git a/docs/manual/mod/mod_macro.xml b/docs/manual/mod/mod_macro.xml
index 2008fe298da..724cdc0470b 100644
--- a/docs/manual/mod/mod_macro.xml
+++ b/docs/manual/mod/mod_macro.xml
@@ -37,9 +37,8 @@
 
 <section id="features"><title>Features</title>
 
-<p>
-    Definition of a macro:
-</p>
+<p>Definition of a macro:</p>
+
     <ul>
     <li> macro definition within a &lt;Macro&gt; section, following
          the apache style.</li>
@@ -71,9 +70,8 @@
          backslash-continued independent lines.</p></li>
     </ul>
 
-<p>
-    Use of a macro:
-</p>
+<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>
@@ -86,14 +84,13 @@
     <li> <code>@</code>-prefixed parameters are escaped in quotes.</li>
     </ul>
 
-<p>
-   Removal of a macro definition:
-</p>
+<p>Removal of a macro definition:</p>
+
    <ul>
    <li> the macro must be already defined.</li>
    </ul>
 
-    <highlight language="config">
+<highlight language="config">
 &lt;Macro DirGroup $dir $group&gt;
   &lt;Directory $dir&gt;
     require group $group
@@ -104,7 +101,7 @@ Use DirGroup /www/apache/private private
 Use DirGroup /www/apache/server  admin
 
 UndefMacro DirGroup
-    </highlight>
+</highlight>
 
 </section>
 
@@ -159,7 +156,7 @@ UndefMacro DirGroup
 </contextlist>
 
 <usage>
-    <p> The <directive>Use</directive> directive controls the use of a macro.
+    <p>The <directive>Use</directive> directive controls the use of a macro.
     The specified macro is expanded. It must be given the same number of
     arguments than in the  macro definition. The provided values are
     associated to their corresponding initial parameters and are substituted
@@ -183,6 +180,7 @@ deny from all
 allow from 192.54.172.0/24 192.54.148.0/24
     </highlight>
 </usage>
+
 </directivesynopsis>
 
 <!-- UndefMacro -->
-- 
2.47.3