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 cd...@apache.org on 2014/03/14 18:59:58 UTC
svn commit: r1577626 - in /hadoop/common/site/main:
author/src/documentation/skins/hadoop-pelt/xslt/fo/
author/src/documentation/skins/hadoop-pelt/xslt/html/ publish/
Author: cdouglas
Date: Fri Mar 14 17:59:58 2014
New Revision: 1577626
URL: http://svn.apache.org/r1577626
Log:
Change footer per trademarks@ request http://s.apache.org/9sM
Modified:
hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl
hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/index.html
hadoop/common/site/main/publish/index.pdf
hadoop/common/site/main/publish/issue_tracking.html
hadoop/common/site/main/publish/issue_tracking.pdf
hadoop/common/site/main/publish/linkmap.html
hadoop/common/site/main/publish/linkmap.pdf
hadoop/common/site/main/publish/mailing_lists.html
hadoop/common/site/main/publish/mailing_lists.pdf
hadoop/common/site/main/publish/privacy_policy.html
hadoop/common/site/main/publish/privacy_policy.pdf
hadoop/common/site/main/publish/releases.html
hadoop/common/site/main/publish/releases.pdf
hadoop/common/site/main/publish/version_control.html
hadoop/common/site/main/publish/version_control.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf
Modified: hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl (original)
+++ hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl Fri Mar 14 17:59:58 2014
@@ -39,9 +39,10 @@ with @role='pdf' is present, that is use
<xsl:text>Copyright © </xsl:text>
<xsl:value-of select="//skinconfig/year"/> <xsl:value-of
select="//skinconfig/vendor"/>
-<xsl:text> Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+<xsl:text> Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</xsl:text>
</xsl:if>
</xsl:variable>
Modified: hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl (original)
+++ hadoop/common/site/main/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl Fri Mar 14 17:59:58 2014
@@ -350,9 +350,10 @@ footer, searchbar, css etc. As input, i
<xsl:value-of select="$config/vendor"/>
</xsl:otherwise>
</xsl:choose><br/>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
</xsl:if>
<xsl:if test="$filename = 'index.html'">
Modified: hadoop/common/site/main/publish/bylaws.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/bylaws.html (original)
+++ hadoop/common/site/main/publish/bylaws.html Fri Mar 14 17:59:58 2014
@@ -727,9 +727,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/bylaws.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/index.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/index.html (original)
+++ hadoop/common/site/main/publish/index.html Fri Mar 14 17:59:58 2014
@@ -554,9 +554,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<div id="logos"></div>
<!--+
Modified: hadoop/common/site/main/publish/index.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/issue_tracking.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/issue_tracking.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/issue_tracking.html (original)
+++ hadoop/common/site/main/publish/issue_tracking.html Fri Mar 14 17:59:58 2014
@@ -313,9 +313,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/issue_tracking.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/issue_tracking.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/linkmap.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/linkmap.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/linkmap.html (original)
+++ hadoop/common/site/main/publish/linkmap.html Fri Mar 14 17:59:58 2014
@@ -457,9 +457,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/linkmap.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/linkmap.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/mailing_lists.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/mailing_lists.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/mailing_lists.html (original)
+++ hadoop/common/site/main/publish/mailing_lists.html Fri Mar 14 17:59:58 2014
@@ -700,9 +700,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/mailing_lists.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/mailing_lists.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/privacy_policy.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/privacy_policy.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/privacy_policy.html (original)
+++ hadoop/common/site/main/publish/privacy_policy.html Fri Mar 14 17:59:58 2014
@@ -291,9 +291,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/privacy_policy.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/privacy_policy.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/releases.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/releases.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/releases.html (original)
+++ hadoop/common/site/main/publish/releases.html Fri Mar 14 17:59:58 2014
@@ -1249,9 +1249,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/releases.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/releases.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/version_control.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/version_control.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/version_control.html (original)
+++ hadoop/common/site/main/publish/version_control.html Fri Mar 14 17:59:58 2014
@@ -310,9 +310,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/version_control.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/version_control.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/who.html
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/who.html?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
--- hadoop/common/site/main/publish/who.html (original)
+++ hadoop/common/site/main/publish/who.html Fri Mar 14 17:59:58 2014
@@ -1657,9 +1657,10 @@ document.write("Last Published: " + docu
Copyright ©
2012 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<br>
- Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase,
- Hive, Mahout, Pig, Zookeeper are trademarks of the Apache
- Software Foundation.
+ Apache Hadoop, Hadoop, Apache, the Apache feather logo, and the Apache
+ Hadoop project logo are either registered trademarks or trademarks of
+ the Apache Software Foundation in the United States and other
+ countries.
</div>
<!--+
|end bottomstrip
Modified: hadoop/common/site/main/publish/who.pdf
URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/who.pdf?rev=1577626&r1=1577625&r2=1577626&view=diff
==============================================================================
Binary files - no diff available.