summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2011-12-19 01:37:19 +0100
committerGraham Leggett <minfrin@apache.org>2011-12-19 01:37:19 +0100
commit38f71bb256233922e89063df71972fde3d0832e0 (patch)
treed1937060cfa0c3834582b25644911ae72aa18897
parentAdd further explanation on RPM packaging. (diff)
downloadapache2-38f71bb256233922e89063df71972fde3d0832e0.tar.xz
apache2-38f71bb256233922e89063df71972fde3d0832e0.zip
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220571 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/index.xml.da2
-rw-r--r--docs/manual/index.xml.de2
-rw-r--r--docs/manual/index.xml.es2
-rw-r--r--docs/manual/index.xml.ja2
-rw-r--r--docs/manual/index.xml.ko2
-rw-r--r--docs/manual/index.xml.meta2
-rw-r--r--docs/manual/index.xml.pt-br2
-rw-r--r--docs/manual/index.xml.tr2
-rw-r--r--docs/manual/platform/index.xml.ko2
-rw-r--r--docs/manual/platform/index.xml.meta2
-rw-r--r--docs/manual/platform/rpm.xml17
11 files changed, 26 insertions, 11 deletions
diff --git a/docs/manual/index.xml.da b/docs/manual/index.xml.da
index 4b2289446b..9e35e8b18e 100644
--- a/docs/manual/index.xml.da
+++ b/docs/manual/index.xml.da
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?>
-<!-- English Revision: 959136:1174747 (outdated) -->
+<!-- English Revision: 959136:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de
index 6d65f2b537..e0392463b3 100644
--- a/docs/manual/index.xml.de
+++ b/docs/manual/index.xml.de
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 1050960:1174747 (outdated) -->
+<!-- English Revision: 1050960:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.es b/docs/manual/index.xml.es
index 2d5768d9ef..9515812f19 100644
--- a/docs/manual/index.xml.es
+++ b/docs/manual/index.xml.es
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:1174747 (outdated) -->
+<!-- English Revision: 105989:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja
index 2c8d9bcf77..690cde8b99 100644
--- a/docs/manual/index.xml.ja
+++ b/docs/manual/index.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 636028:1174747 (outdated) -->
+<!-- English Revision: 636028:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko
index d19b26cf35..d15040079c 100644
--- a/docs/manual/index.xml.ko
+++ b/docs/manual/index.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1174747 (outdated) -->
+<!-- English Revision: 105989:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.meta b/docs/manual/index.xml.meta
index 4a81cf2763..b1118d585f 100644
--- a/docs/manual/index.xml.meta
+++ b/docs/manual/index.xml.meta
@@ -15,7 +15,7 @@
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">pt-br</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
<variant>zh-cn</variant>
</variants>
</metafile>
diff --git a/docs/manual/index.xml.pt-br b/docs/manual/index.xml.pt-br
index 8d9d164d40..283c62f039 100644
--- a/docs/manual/index.xml.pt-br
+++ b/docs/manual/index.xml.pt-br
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 420993:1174747 (outdated) -->
+<!-- English Revision: 420993:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.tr b/docs/manual/index.xml.tr
index 20a8e628ed..d441750bf9 100644
--- a/docs/manual/index.xml.tr
+++ b/docs/manual/index.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1174747 -->
+<!-- English Revision: 1174747:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/platform/index.xml.ko b/docs/manual/platform/index.xml.ko
index 3295fd7351..cc2739e916 100644
--- a/docs/manual/platform/index.xml.ko
+++ b/docs/manual/platform/index.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:1220524 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/platform/index.xml.meta b/docs/manual/platform/index.xml.meta
index 3070356f99..1ac8ab1fa4 100644
--- a/docs/manual/platform/index.xml.meta
+++ b/docs/manual/platform/index.xml.meta
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>ko</variant>
+ <variant outdated="yes">ko</variant>
<variant>zh-cn</variant>
</variants>
</metafile>
diff --git a/docs/manual/platform/rpm.xml b/docs/manual/platform/rpm.xml
index d8c172568a..8c05d1bab7 100644
--- a/docs/manual/platform/rpm.xml
+++ b/docs/manual/platform/rpm.xml
@@ -27,8 +27,17 @@
<summary>
+ <p>While many distributions make Apache httpd available as operating system
+ supported packages, it can sometimes be desirable to install and use the
+ canonical version of Apache httpd on these systems, replacing the natively
+ provided versions of the packages.</p>
+
+ <p>While the Apache httpd project does not currently create binary RPMs
+ for the various distributions out there, it is easy to build your own
+ binary RPMs from the native Apache httpd tarball.</p>
+
<p>This document explains how to build, install, configure and run
- Apache 2.4 under Unix systems supporting the RPM packaging format.</p>
+ Apache httpd 2.4 under Unix systems supporting the RPM packaging format.</p>
</summary>
@@ -54,6 +63,12 @@
rpmbuild -tb httpd-2.4.x.tar.bz2
</example>
+ <p>Corresponding "-devel" packages will be required to be installed on your
+ build system prior to building the RPMs, the <code>rpmbuild</code> command
+ will automatically calculate what RPMs are required and will list any
+ dependencies that are missing on your system. These "-devel" packages will
+ not be required after the build is completed, and can be safely removed.</p>
+
<p>If successful, the following RPMs will be created:</p>
<dl>