merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1437834 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index 49cdbdadafda33099808054f8e9e1379f5702280..9e66fb7b5377a93c63c94e493b6ff2b4ecd913ab 100644 (file)
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -450,13 +450,15 @@ AddOutputFilter INCLUDES .shtml
     </section> <!-- /include -->
 
     <section id="element.printenv"><title>The printenv Element</title>
-      <p>This prints out a listing of all existing variables and
+      <p>This prints out a plain text listing of all existing variables and
       their values. Special characters are entity encoded (see the <code><a
       href="#element.echo">echo</a></code> element for details)
       before being output. There are no attributes.</p>
 
       <example><title>Example</title>
-        &lt;!--#printenv --&gt;
+        &lt;pre&gt;
+          &lt;!--#printenv --&gt;
+        &lt;/pre&gt;
       </example>
     </section> <!-- /printenv -->