Commit 806ca5ac authored by Mike Rumph's avatar Mike Rumph
Browse files

Generated doc changes 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1772233 13f79535-47bb-0310-9956-ffa450edef68
parent f79768fb

docs/manual/install.html.en

+5 −5
Original line number Diff line number Diff line
@@ -165,14 +165,14 @@ 
      the affected support scripts. Of course, you will still be able to 

      build and use Apache HTTPd.</dd>



      <dt><a href="http://apr.apache.org">apr/apr-util &gt;= 1.2</a></dt>

      <dt><a href="http://apr.apache.org">apr/apr-util &gt;= 1.4</a></dt>

      <dd><code>apr</code> and <code>apr-util</code> are bundled

      with the Apache HTTPd source releases, and will be used without any 

      problems in almost all circumstances. However, if 

      <code>apr</code> or <code>apr-util</code>, versions 1.0 or 1.1,

      <code>apr</code> or <code>apr-util</code>, versions 1.0, 1.1 or 1.2,

      are installed on your system, you must either upgrade your

      <code>apr</code>/<code>apr-util</code> installations to

      1.2, force the use of the bundled libraries or have httpd use 

      1.4, force the use of the bundled libraries or have httpd use 

      separate builds. To use the bundled 

      <code>apr</code>/<code>apr-util</code> sources specify the 

      <code>--with-included-apr</code> option to configure:
@@ -188,13 +188,13 @@ 
      To build Apache HTTPd against a manually installed 

      <code>apr</code>/<code>apr-util</code>:

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

        # Build and install apr 1.2<br />

        # Build and install apr 1.4<br />

        cd srclib/apr<br />

        ./configure --prefix=/usr/local/apr-httpd/<br />

        make<br />

        make install<br />

        <br />

        # Build and install apr-util 1.2<br />

        # Build and install apr-util 1.4<br />

        cd ../apr-util<br />

        ./configure --prefix=/usr/local/apr-util-httpd/ 

          --with-apr=/usr/local/apr-httpd/<br />

docs/manual/install.xml.de

+1 −1
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>

<!-- English Revision: 421100:1760551 (outdated) -->

<!-- English Revision: 421100:1772232 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/install.xml.es

+1 −1
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>

<!-- English Revision: 105989:1760551 (outdated) -->

<!-- English Revision: 105989:1772232 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/install.xml.fr

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>

<!-- English Revision: 1760551 -->

<!-- English Revision: 1760551:1772232 (outdated) -->

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : Vincent Deffontaines -->

docs/manual/install.xml.ja

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>

<!-- English Revision: 421100:1760551 (outdated) -->

<!-- English Revision: 421100:1772232 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more