You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/18 21:26:49 UTC
svn commit: r1220529 - in /httpd/httpd/branches/2.4.x: ./
docs/manual/index.xml docs/manual/platform/index.xml
docs/manual/platform/rpm.xml
Author: minfrin
Date: Sun Dec 18 20:26:48 2011
New Revision: 1220529
URL: http://svn.apache.org/viewvc?rev=1220529&view=rev
Log:
Backport:
Document the RPM platform.
Added:
httpd/httpd/branches/2.4.x/docs/manual/platform/rpm.xml
- copied unchanged from r1220524, httpd/httpd/trunk/docs/manual/platform/rpm.xml
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/index.xml
httpd/httpd/branches/2.4.x/docs/manual/platform/index.xml
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 18 20:26:48 2011
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524
Modified: httpd/httpd/branches/2.4.x/docs/manual/index.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/index.xml?rev=1220529&r1=1220528&r2=1220529&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/index.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/index.xml Sun Dec 18 20:26:48 2011
@@ -80,6 +80,7 @@ Documentation</title>
<category id="platform"><title>Platform Specific Notes</title>
<page href="platform/windows.html">Microsoft Windows</page>
+ <page href="platform/rpm.html">RPM-based Systems (Redhat / CentOS / Fedora)</page>
<page href="platform/netware.html">Novell NetWare</page>
<page href="platform/ebcdic.html">EBCDIC Port</page>
</category>
Modified: httpd/httpd/branches/2.4.x/docs/manual/platform/index.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/platform/index.xml?rev=1220529&r1=1220528&r2=1220529&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/platform/index.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/platform/index.xml Sun Dec 18 20:26:48 2011
@@ -32,7 +32,7 @@
<dl>
<dt>Using Apache</dt>
<dd>
- <p>This document explains how to install, configure and run Apache 2.0
+ <p>This document explains how to install, configure and run Apache 2.4
under Microsoft Windows.</p>
<p>See: <a href="windows.html">Using Apache with Microsoft Windows</a></p>
@@ -52,6 +52,22 @@
</section>
+ <section id="unix">
+
+ <title>Unix Systems</title>
+
+ <dl>
+ <dt>RPM Based Systems (Redhat / CentOS / Fedora)</dt>
+ <dd>
+ <p>This document explains how to build, install, and run Apache 2.4
+ on systems supporting the RPM packaging format.</p>
+
+ <p>See: <a href="rpm.html">Using Apache With RPM Based Systems</a></p>
+ </dd>
+ </dl>
+
+ </section>
+
<section id="other">
<title>Other Platforms</title>
@@ -59,7 +75,7 @@
<dl>
<dt>Novell NetWare</dt>
<dd>
- <p>This document explains how to install, configure and run Apache 2.0
+ <p>This document explains how to install, configure and run Apache 2.4
under Novell NetWare 5.1 and above.</p>
<p>See: <a href="netware.html">Using Apache With Novell NetWare</a></p>
@@ -75,7 +91,7 @@
<note type="warning"><strong>Warning:</strong> This document
has not been updated to take into account changes made in
- the 2.0 version of the Apache HTTP Server. Some of the
+ the 2.4 version of the Apache HTTP Server. Some of the
information may still be relevant, but please use it
with care.</note>