You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2011/12/15 09:36:10 UTC
svn commit: r1214657 - in /hadoop/common/branches/branch-1: CHANGES.txt
build.xml src/docs/src/documentation/content/xdocs/tabs.xml
Author: mattf
Date: Thu Dec 15 08:36:09 2011
New Revision: 1214657
URL: http://svn.apache.org/viewvc?rev=1214657&view=rev
Log:
HADOOP-7923. Update doc versions from 0.20 to 1.0, and automate the updating of version numbers in the doc system. Contributed by Nicholas Sze.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/build.xml
hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/tabs.xml
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1214657&r1=1214656&r2=1214657&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Dec 15 08:36:09 2011
@@ -176,6 +176,9 @@ Release 1.0.0 - unreleased
HDFS-2604. Add a log message to show if WebHDFS is enabled and a
configuration section in the forrest doc. (szetszwo)
+ HADOOP-7923. Update doc versions from 0.20 to 1.0, and automate the
+ updating of version numbers in the doc system. (szetszwo via mattf)
+
BUG FIXES
HADOOP-7869. HADOOP_HOME warning happens all of the time (Owen O'Malley
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 08:36:09 2011
@@ -3,7 +3,7 @@
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1174370,1174917,1176042,1176248,1176638,1176645,1200050,1200078,1200199,1202378,1203419,1205530
-/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738
+/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-1/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1214657&r1=1214656&r2=1214657&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Thu Dec 15 08:36:09 2011
@@ -1228,6 +1228,9 @@
<!-- ================================================================== -->
<target name="docs" depends="forrest.check" description="Generate forrest-based documentation. To use, specify -Dforrest.home=<base of Apache Forrest installation> on the command line." if="forrest.home">
+ <echo file="${build.dir}/hadoop.ent" append="false">
+ <!ENTITY HadoopVersion "${version}">
+ </echo>
<exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
failonerror="true">
<env key="JAVA_HOME" value="${java5.home}"/>
@@ -1243,7 +1246,6 @@
<style basedir="${mapred.src.dir}" destdir="${build.docs}"
includes="mapred-default.xml" style="conf/configuration.xsl"/>
<antcall target="changes-to-html"/>
- <antcall target="cn-docs"/>
</target>
<target name="cn-docs" depends="forrest.check, init"
Modified: hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/tabs.xml?rev=1214657&r1=1214656&r2=1214657&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/tabs.xml (original)
+++ hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/tabs.xml Thu Dec 15 08:36:09 2011
@@ -15,8 +15,12 @@
limitations under the License.
-->
-<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN"
- "http://forrest.apache.org/dtd/tab-cocoon-v10.dtd">
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
+ "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd" [
+ <!ENTITY % hadoop-entities PUBLIC "-//Apache//ENTITIES Hadoop//EN"
+ "../../../../../../build/hadoop.ent">
+ %hadoop-entities;
+]>
<tabs software="Hadoop"
title="Hadoop"
@@ -31,6 +35,6 @@
<tab label="Project" href="http://hadoop.apache.org/core/" />
<tab label="Wiki" href="http://wiki.apache.org/hadoop" />
- <tab label="Hadoop 0.20 Documentation" dir="" />
+ <tab label="Hadoop &HadoopVersion; Documentation" dir="" />
</tabs>