avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r1057895 - in /avro/trunk: ./ doc/src/ doc/src/content/xdocs/ doc/src/resources/images/
Date Tue, 11 Jan 2011 22:26:06 GMT
Author: cutting
Date: Tue Jan 11 22:26:06 2011
New Revision: 1057895

URL: http://svn.apache.org/viewvc?rev=1057895&view=rev
Log:
AVRO-731. Documentation: Improve identification of Apache trademarks.

Added:
    avro/trunk/doc/src/resources/images/apache_feather.gif   (with props)
Removed:
    avro/trunk/doc/src/resources/images/hadoop-logo.jpg
Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/doc/src/content/xdocs/idl.xml
    avro/trunk/doc/src/content/xdocs/index.xml
    avro/trunk/doc/src/content/xdocs/sasl.xml
    avro/trunk/doc/src/content/xdocs/spec.xml
    avro/trunk/doc/src/resources/images/avro-logo.png   (contents, props changed)
    avro/trunk/doc/src/skinconf.xml

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue Jan 11 22:26:06 2011
@@ -107,6 +107,9 @@ Avro 1.5.0 (unreleased)
 
     AVRO-729. C: Update to Jansson 1.3. (Douglas Creager via brucem)
 
+    AVRO-731. Documentation: Improve identification of Apache
+    trademarks. (cutting)
+
   BUG FIXES
 
     AVRO-675. C: Bytes and fixed setters don't update datum size.

Modified: avro/trunk/doc/src/content/xdocs/idl.xml
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/content/xdocs/idl.xml?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
--- avro/trunk/doc/src/content/xdocs/idl.xml (original)
+++ avro/trunk/doc/src/content/xdocs/idl.xml Tue Jan 11 22:26:06 2011
@@ -22,7 +22,7 @@
 ]>
 <document>
   <header>
-    <title>Avro IDL &AvroVersion;</title>
+    <title>Apache Avro&#153; &AvroVersion; IDL</title>
   </header>
   <body>
 
@@ -409,5 +409,9 @@ protocol Simple {
       </source>
       <p>Additional examples may be found in the Avro source tree under the <code>src/test/idl/input</code>
directory.</p>
     </section>
+
+  <p><em>Apache Avro, Avro, Apache, and the Avro and Apache logos are
+   trademarks of The Apache Software Foundation.</em></p>
+
   </body>
 </document>

Modified: avro/trunk/doc/src/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/content/xdocs/index.xml?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
--- avro/trunk/doc/src/content/xdocs/index.xml (original)
+++ avro/trunk/doc/src/content/xdocs/index.xml Tue Jan 11 22:26:06 2011
@@ -15,15 +15,20 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+   "http://forrest.apache.org/dtd/document-v20.dtd" [
+  <!ENTITY % avro-entities PUBLIC "-//Apache//ENTITIES Avro//EN"
+	   "../../../../build/avro.ent">
+  %avro-entities;
+]>
 <document>
   <header>
-    <title>Welcome to Avro!</title>
+    <title>Apache Avro&#153; &AvroVersion; Documentation</title>
   </header>
   <body>
     <section id="intro">
       <title>Introduction</title>
-      <p>Avro is a data serialization system.</p>
+      <p>Apache Avro&#153; is a data serialization system.</p>
       <p>Avro provides:</p>
 	<ul>
 	  <li>Rich data structures.</li>
@@ -83,5 +88,9 @@
 	  symbolically, using field names.</li>
       </ul>
     </section>
+
+  <p><em>Apache Avro, Avro, Apache, and the Avro and Apache logos are
+   trademarks of The Apache Software Foundation.</em></p>
+
   </body>
 </document>

Modified: avro/trunk/doc/src/content/xdocs/sasl.xml
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/content/xdocs/sasl.xml?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
--- avro/trunk/doc/src/content/xdocs/sasl.xml (original)
+++ avro/trunk/doc/src/content/xdocs/sasl.xml Tue Jan 11 22:26:06 2011
@@ -15,10 +15,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+   "http://forrest.apache.org/dtd/document-v20.dtd" [
+  <!ENTITY % avro-entities PUBLIC "-//Apache//ENTITIES Avro//EN"
+	   "../../../../build/avro.ent">
+  %avro-entities;
+]>
 <document>
   <header>
-    <title>Avro SASL profile</title>
+    <title>Apache Avro&#153; &AvroVersion; SASL Profile</title>
   </header>
   <body>
     <section id="intro">
@@ -140,5 +145,8 @@
       response.</p>
     </section>
 
+  <p><em>Apache Avro, Avro, Apache, and the Avro and Apache logos are
+   trademarks of The Apache Software Foundation.</em></p>
+
   </body>
 </document>

Modified: avro/trunk/doc/src/content/xdocs/spec.xml
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/content/xdocs/spec.xml?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
--- avro/trunk/doc/src/content/xdocs/spec.xml (original)
+++ avro/trunk/doc/src/content/xdocs/spec.xml Tue Jan 11 22:26:06 2011
@@ -22,14 +22,14 @@
 ]>
 <document>
   <header>
-    <title>Avro &AvroVersion; Specification</title>
+    <title>Apache Avro&#153; &AvroVersion; Specification</title>
   </header>
   <body>
 
     <section id="preamble">
       <title>Introduction</title>
 
-      <p>This document defines Avro.  It is intended to be the
+      <p>This document defines Apache Avro.  It is intended to be the
         authoritative specification. Implementations of Avro must
         adhere to this document.
       </p>
@@ -1117,5 +1117,9 @@
         the "doc" portion of a schema may be dropped at serialization.</p>
 
     </section>
+
+  <p><em>Apache Avro, Avro, Apache, and the Avro and Apache logos are
+   trademarks of The Apache Software Foundation.</em></p>
+
   </body>
 </document>

Added: avro/trunk/doc/src/resources/images/apache_feather.gif
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/resources/images/apache_feather.gif?rev=1057895&view=auto
==============================================================================
Binary file - no diff available.

Propchange: avro/trunk/doc/src/resources/images/apache_feather.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: avro/trunk/doc/src/resources/images/avro-logo.png
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/resources/images/avro-logo.png?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
Binary files - no diff available.

Propchange: avro/trunk/doc/src/resources/images/avro-logo.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: avro/trunk/doc/src/skinconf.xml
URL: http://svn.apache.org/viewvc/avro/trunk/doc/src/skinconf.xml?rev=1057895&r1=1057894&r2=1057895&view=diff
==============================================================================
--- avro/trunk/doc/src/skinconf.xml (original)
+++ avro/trunk/doc/src/skinconf.xml Tue Jan 11 22:26:06 2011
@@ -67,14 +67,14 @@ which will be used to configure the chos
   <!-- project logo -->
   <project-name>Avro</project-name>
   <project-description>Serialization System</project-description>
-  <project-url>http://hadoop.apache.org/avro/</project-url>
+  <project-url>http://avro.apache.org/</project-url>
   <project-logo>images/avro-logo.png</project-logo>
 
   <!-- group logo -->
-  <group-name>Hadoop</group-name>
-  <group-description>Apache Hadoop</group-description>
-  <group-url>http://hadoop.apache.org/</group-url>
-  <group-logo>images/hadoop-logo.jpg</group-logo>
+  <group-name>Apache</group-name>
+  <group-description>The Apache Software Foundation</group-description>
+  <group-url>http://www.apache.org/</group-url>
+  <group-logo>images/apache_feather.gif</group-logo>
 
   <!-- optional host logo (e.g. sourceforge logo)
        default skin: renders it at the bottom-left corner -->
@@ -98,8 +98,8 @@ which will be used to configure the chos
   -->
   <trail>
     <link1 name="Apache" href="http://www.apache.org/"/>
-    <link2 name="Hadoop" href="http://hadoop.apache.org/"/>
-    <link3 name="Avro" href="http://hadoop.apache.org/avro/"/>
+    <link2 name="Avro" href="http://avro.apache.org/"/>
+    <link3 name="Avro" href="http://avro.apache.org/"/>
   </trail>
 
   <!-- Configure the TOC, i.e. the Table of Contents.



Mime
View raw message