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 om...@apache.org on 2011/05/19 22:48:02 UTC

svn commit: r1125094 - in /hadoop/site: author/src/documentation/content/xdocs/ author/src/documentation/skins/hadoop-pelt/xslt/fo/ author/src/documentation/skins/hadoop-pelt/xslt/html/ publish/ publish/skin/images/

Author: omalley
Date: Thu May 19 20:48:01 2011
New Revision: 1125094

URL: http://svn.apache.org/viewvc?rev=1125094&view=rev
Log:
Added trademark footer and trademarks on other apache projects.

Added:
    hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl
    hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/pdfoutline.xsl
Modified:
    hadoop/site/author/src/documentation/content/xdocs/index.xml
    hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/document-to-fo.xsl
    hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl
    hadoop/site/publish/bylaws.html
    hadoop/site/publish/bylaws.pdf
    hadoop/site/publish/general_lists.html
    hadoop/site/publish/general_lists.pdf
    hadoop/site/publish/index.html
    hadoop/site/publish/index.pdf
    hadoop/site/publish/linkmap.html
    hadoop/site/publish/linkmap.pdf
    hadoop/site/publish/mailing_lists.html
    hadoop/site/publish/mailing_lists.pdf
    hadoop/site/publish/privacy_policy.html
    hadoop/site/publish/privacy_policy.pdf
    hadoop/site/publish/skin/images/rc-b-l-15-1body-2menu-3menu.png
    hadoop/site/publish/skin/images/rc-b-r-15-1body-2menu-3menu.png
    hadoop/site/publish/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
    hadoop/site/publish/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
    hadoop/site/publish/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
    hadoop/site/publish/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
    hadoop/site/publish/skin/images/rc-t-r-15-1body-2menu-3menu.png
    hadoop/site/publish/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
    hadoop/site/publish/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
    hadoop/site/publish/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
    hadoop/site/publish/who.html
    hadoop/site/publish/who.pdf

Modified: hadoop/site/author/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/hadoop/site/author/src/documentation/content/xdocs/index.xml?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/author/src/documentation/content/xdocs/index.xml (original)
+++ hadoop/site/author/src/documentation/content/xdocs/index.xml Thu May 19 20:48:01 2011
@@ -6,13 +6,13 @@
 <document> 
 
   <header> 
-    <title>Welcome to Apache Hadoop!</title> 
+    <title>Welcome to Apache&trade; Hadoop&trade;!</title> 
   </header> 
 
   <body> 
 
     <section>
-      <title>What Is Apache&trade; Hadoop&trade;?</title>
+      <title>What Is Apache Hadoop?</title>
 
       <p>
       
@@ -23,7 +23,7 @@
       
       <p>
       
-      The Apache&trade; Hadoop&trade; software library is a framework that
+      The Apache Hadoop software library is a framework that
       allows for the distributed processing of large data sets across clusters
       of computers using a simple programming model. It is designed to scale up
       from single servers to thousands of machines, each offering local
@@ -43,7 +43,7 @@
       <li><a href="ext:common"><strong>Hadoop Common</strong></a>: 
       The common utilities that support the other Hadoop subprojects. </li>
 
-      <li><a href="ext:hdfs"><strong>Hadoop Distributed File System (HDFS)</strong></a>: 
+      <li><a href="ext:hdfs"><strong>Hadoop Distributed File System (HDFS&trade;)</strong></a>: 
       A distributed file system that provides high-throughput access to application data.  </li>
       
       <li><a href="ext:mr"><strong>Hadoop MapReduce</strong></a>: 
@@ -53,28 +53,28 @@
       <p>Other Hadoop-related projects at Apache include:</p>
       <ul>
 
-      <li><a href="ext:avro"><strong>Avro</strong></a>: 
+      <li><a href="ext:avro"><strong>Avro&trade;</strong></a>: 
       A data serialization system.</li>
 
-      <li><a href="ext:cassandra"><strong>Cassandra</strong></a>: 
+      <li><a href="ext:cassandra"><strong>Cassandra&trade;</strong></a>: 
       A scalable multi-master database with no single points of failure.</li>
 
-      <li><a href="ext:chukwa"><strong>Chukwa</strong></a>: 
+      <li><a href="ext:chukwa"><strong>Chukwa&trade;</strong></a>: 
       A data collection system for managing large distributed systems.  </li>
 
-      <li><a href="ext:hbase"><strong>HBase</strong></a>: 
+      <li><a href="ext:hbase"><strong>HBase&trade;</strong></a>: 
       A scalable, distributed database that supports structured data storage for large tables.  </li>
 
-      <li><a href="ext:hive"><strong>Hive</strong></a>:  
+      <li><a href="ext:hive"><strong>Hive&trade;</strong></a>:  
       A data warehouse infrastructure that provides data summarization and ad hoc querying. </li>
       
-      <li><a href="ext:mahout"><strong>Mahout</strong></a>:
+      <li><a href="ext:mahout"><strong>Mahout&trade;</strong></a>:
       A Scalable machine learning and data mining library. </li>
       
-      <li><a href="ext:pig"><strong>Pig</strong></a>: 
+      <li><a href="ext:pig"><strong>Pig&trade;</strong></a>: 
       A high-level data-flow language and execution framework for parallel computation.</li>
       
-      <li><a href="ext:zookeeper"><strong>ZooKeeper</strong></a>: 
+      <li><a href="ext:zookeeper"><strong>ZooKeeper&trade;</strong></a>: 
       A high-performance coordination service for distributed applications. </li>
 
       </ul>

Modified: hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/document-to-fo.xsl?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/document-to-fo.xsl (original)
+++ hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/document-to-fo.xsl Thu May 19 20:48:01 2011
@@ -18,5 +18,997 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
-  <xsl:import href="../../../common/xslt/fo/document-to-fo.xsl"/>
+<!-- left, justify, right -->
+  <xsl:variable name="text-align" select="string(//skinconfig/pdf/page/@text-align)"/>
+<!-- print URL of external links -->
+  <xsl:variable name="show-external-urls" select="//skinconfig/pdf/show-external-urls"/>
+<!-- Get the section depth to use when generating the minitoc (default is 2) -->
+  <xsl:variable name="toc-max-depth" select="number(//skinconfig/toc/@max-depth)"/>
+<!-- The page size to be used -->
+  <xsl:variable name="pagesize"
+                select="string(//skinconfig/pdf/page/@size)"/>
+<!-- The page orientation ("portrait" or "landscape") -->
+  <xsl:variable name="pageorientation"
+                select="string(//skinconfig/pdf/page/@orientation)"/>
+<!-- Double-sided printing toggle -->
+  <xsl:variable name="doublesided"
+                select="string(//skinconfig/pdf/margins/@double-sided)"/>
+<!-- The top page margin -->
+  <xsl:variable name="topmargin"
+                select="string(//skinconfig/pdf/margins/top)"/>
+<!-- The bottom page margin -->
+  <xsl:variable name="bottommargin"
+                select="string(//skinconfig/pdf/margins/bottom)"/>
+<!-- The inner page margin (always the left margin if
+  double-sided printing is off, alternating between left and right if
+  it's on) -->
+  <xsl:variable name="innermargin"
+                select="string(//skinconfig/pdf/margins/inner)"/>
+<!-- The outer page margin (always the right margin if
+  double-sided printing is off, alternating between right and left if
+  it's on)-->
+  <xsl:variable name="outermargin"
+                select="string(//skinconfig/pdf/margins/outer)"/>
+  <xsl:param name="numbersections" select="'true'"/>
+<!-- page breaks after TOC and each page if an aggregate document -->
+  <xsl:variable name="page-break-top-sections" select="'true'"/>
+<!-- page numbering format -->
+  <xsl:variable name="page-numbering-format" select="string(//skinconfig/pdf/page-numbering-format)"/>
+<!-- Section depth at which we stop numbering and just indent -->
+  <xsl:param name="numbering-max-depth" select="'3'"/>
+  <xsl:param name="imagesdir" select="."/>
+  <xsl:param name="xmlbasedir"/>
+  <xsl:include href="pdfoutline.xsl"/>
+  <xsl:include href="footerinfo.xsl"/>
+<!-- Determine page height for various page sizes (US Letter portrait
+  is the default) -->
+<!-- FIXME: JJP:would this be better of a file? -->
+  <xsl:variable name="pageheight">
+    <xsl:choose>
+      <xsl:when test="$pageorientation = 'landscape'">
+        <xsl:choose>
+          <xsl:when test="$pagesize = 'a0'">841mm</xsl:when>
+          <xsl:when test="$pagesize = 'a1'">594mm</xsl:when>
+          <xsl:when test="$pagesize = 'a2'">420mm</xsl:when>
+          <xsl:when test="$pagesize = 'a3'">297mm</xsl:when>
+          <xsl:when test="$pagesize = 'a4'">210mm</xsl:when>
+          <xsl:when test="$pagesize = 'a5'">148mm</xsl:when>
+          <xsl:when test="$pagesize = 'executive'">7.25in</xsl:when>
+          <xsl:when test="$pagesize = 'folio'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'ledger'">11in</xsl:when>
+          <xsl:when test="$pagesize = 'legal'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'letter'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'quarto'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'tabloid'">11in</xsl:when>
+          <xsl:otherwise>8.5in</xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$pagesize = 'a0'">1189mm</xsl:when>
+          <xsl:when test="$pagesize = 'a1'">841mm</xsl:when>
+          <xsl:when test="$pagesize = 'a2'">594mm</xsl:when>
+          <xsl:when test="$pagesize = 'a3'">420mm</xsl:when>
+          <xsl:when test="$pagesize = 'a4'">297mm</xsl:when>
+          <xsl:when test="$pagesize = 'a5'">210mm</xsl:when>
+          <xsl:when test="$pagesize = 'executive'">10.5in</xsl:when>
+          <xsl:when test="$pagesize = 'folio'">13in</xsl:when>
+          <xsl:when test="$pagesize = 'ledger'">17in</xsl:when>
+          <xsl:when test="$pagesize = 'legal'">14in</xsl:when>
+          <xsl:when test="$pagesize = 'quarto'">10.83in</xsl:when>
+          <xsl:when test="$pagesize = 'tabloid'">17in</xsl:when>
+          <xsl:otherwise>11in</xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+<!-- Determine page width for various page sizes (US Letter portrait
+  is the default) -->
+  <xsl:variable name="pagewidth">
+    <xsl:choose>
+      <xsl:when test="$pageorientation = 'landscape'">
+        <xsl:choose>
+          <xsl:when test="$pagesize = 'a0'">1189mm</xsl:when>
+          <xsl:when test="$pagesize = 'a1'">841mm</xsl:when>
+          <xsl:when test="$pagesize = 'a2'">594mm</xsl:when>
+          <xsl:when test="$pagesize = 'a3'">420mm</xsl:when>
+          <xsl:when test="$pagesize = 'a4'">297mm</xsl:when>
+          <xsl:when test="$pagesize = 'a5'">210mm</xsl:when>
+          <xsl:when test="$pagesize = 'executive'">10.5in</xsl:when>
+          <xsl:when test="$pagesize = 'folio'">13in</xsl:when>
+          <xsl:when test="$pagesize = 'ledger'">17in</xsl:when>
+          <xsl:when test="$pagesize = 'legal'">14in</xsl:when>
+          <xsl:when test="$pagesize = 'quarto'">10.83in</xsl:when>
+          <xsl:when test="$pagesize = 'tabloid'">17in</xsl:when>
+          <xsl:otherwise>11in</xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$pagesize = 'a0'">841mm</xsl:when>
+          <xsl:when test="$pagesize = 'a1'">594mm</xsl:when>
+          <xsl:when test="$pagesize = 'a2'">420mm</xsl:when>
+          <xsl:when test="$pagesize = 'a3'">297mm</xsl:when>
+          <xsl:when test="$pagesize = 'a4'">210mm</xsl:when>
+          <xsl:when test="$pagesize = 'a5'">148mm</xsl:when>
+          <xsl:when test="$pagesize = 'executive'">7.25in</xsl:when>
+          <xsl:when test="$pagesize = 'folio'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'ledger'">11in</xsl:when>
+          <xsl:when test="$pagesize = 'legal'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'letter'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'quarto'">8.5in</xsl:when>
+          <xsl:when test="$pagesize = 'tabloid'">11in</xsl:when>
+          <xsl:otherwise>8.5in</xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="first-page"
+          page-height="{$pageheight}"
+          page-width="{$pagewidth}"
+          margin-top="{$topmargin}"
+          margin-bottom="{$bottommargin}"
+          margin-left="{$innermargin}"
+          margin-right="{$outermargin}">
+          <fo:region-body
+            margin-top="0.5in"
+            margin-bottom=".5in"/>
+          <fo:region-after
+            region-name="first-footer"
+            extent=".5in"
+            display-align="before"/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="even-page"
+          page-height="{$pageheight}"
+          page-width="{$pagewidth}"
+          margin-top="{$topmargin}"
+          margin-bottom="{$bottommargin}">
+          <xsl:choose>
+            <xsl:when test="$doublesided = 'true'">
+              <xsl:attribute name="margin-left">
+                <xsl:value-of select="$outermargin"/>
+              </xsl:attribute>
+              <xsl:attribute name="margin-right">
+                <xsl:value-of select="$innermargin"/>
+              </xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="margin-left">
+                <xsl:value-of select="$innermargin"/>
+              </xsl:attribute>
+              <xsl:attribute name="margin-right">
+                <xsl:value-of select="$outermargin"/>
+              </xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
+          <fo:region-before
+            region-name="even-header"
+            extent="0.5in"
+            border-bottom="0.5pt solid"/>
+          <fo:region-body
+            margin-top="0.5in"
+            margin-bottom=".5in"/>
+          <fo:region-after
+            region-name="even-footer"
+            extent=".5in"
+            display-align="before"/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="odd-page"
+          page-height="{$pageheight}"
+          page-width="{$pagewidth}"
+          margin-top="{$topmargin}"
+          margin-bottom="{$bottommargin}"
+          margin-left="{$innermargin}"
+          margin-right="{$outermargin}">
+          <fo:region-before
+            region-name="odd-header"
+            extent="0.5in"
+            border-bottom="0.5pt solid"/>
+          <fo:region-body
+            margin-top="0.5in"
+            margin-bottom=".5in"/>
+          <fo:region-after
+            region-name="odd-footer"
+            extent=".5in"
+            display-align="before"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="book">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference
+              page-position="first"
+              master-reference="first-page"/>
+            <fo:conditional-page-master-reference
+              odd-or-even="odd"
+              master-reference="odd-page"/>
+            <fo:conditional-page-master-reference
+              odd-or-even="even"
+              master-reference="even-page"/>
+          </fo:repeatable-page-master-alternatives>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+      <xsl:apply-templates select="/site/document" mode="outline"/>
+      <fo:page-sequence master-reference="book">
+        <xsl:apply-templates select="/site/document"/>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+  <xsl:template match="document">
+    <fo:title>
+      <xsl:value-of select="header/title"/>
+    </fo:title>
+    <fo:static-content flow-name="first-footer">
+      <fo:block
+        border-top="0.25pt solid"
+        padding-before="6pt"
+        text-align="center">
+        <xsl:apply-templates select="footer"/>
+      </fo:block>
+<!-- don't list page number on first page if it's contents is just the TOC -->
+      <xsl:if test="not($toc-max-depth > 0 and $page-break-top-sections)">
+        <xsl:call-template name="insertPageNumber">
+          <xsl:with-param name="text-align">start</xsl:with-param>
+        </xsl:call-template>
+      </xsl:if>
+      <xsl:call-template name="info"/>
+    </fo:static-content>
+    <fo:static-content flow-name="even-header">
+      <fo:block
+        font-size="70%"
+        text-align="end"
+        font-style="italic">
+        <xsl:value-of select="header/title"/>
+      </fo:block>
+    </fo:static-content>
+    <fo:static-content flow-name="even-footer">
+      <fo:block
+        border-top="0.25pt solid"
+        padding-before="6pt"
+        text-align="center">
+        <xsl:apply-templates select="footer"/>
+      </fo:block>
+      <xsl:call-template name="insertPageNumber">
+        <xsl:with-param name="text-align">end</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="info"/>
+    </fo:static-content>
+    <fo:static-content flow-name="odd-header">
+      <fo:block
+        font-size="70%"
+        text-align="start"
+        font-style="italic">
+        <xsl:value-of select="header/title"/>
+      </fo:block>
+    </fo:static-content>
+    <fo:static-content flow-name="odd-footer">
+      <fo:block
+        border-top="0.25pt solid"
+        padding-before="6pt"
+        text-align="center">
+        <xsl:apply-templates select="footer"/>
+      </fo:block>
+      <xsl:call-template name="insertPageNumber">
+        <xsl:with-param name="text-align">start</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="info"/>
+    </fo:static-content>
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block
+        padding-before="24pt"
+        padding-after="24pt"
+        font-size="24pt"
+        font-weight="bold"
+        id="{generate-id()}">
+        <xsl:value-of select="header/title"/>
+      </fo:block>
+      <fo:block
+        text-align="{$text-align}"
+        padding-before="18pt"
+        padding-after="18pt">
+        <xsl:apply-templates/>
+      </fo:block>
+<!-- Total number of pages calculation... -->
+      <fo:block id="term"/>
+    </fo:flow>
+  </xsl:template>
+  <xsl:template match="abstract">
+    <fo:block
+      font-size="12pt"
+      text-align="center"
+      space-before="20pt"
+      space-after="25pt"
+      width="7.5in"
+      font-family="serif"
+      font-style="italic">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="notice">
+    <fo:block
+      font-size="10pt"
+      text-align="left"
+      space-before="20pt"
+      width="7.5in"
+      font-family="serif"
+      border-top="0.25pt solid"
+      border-bottom="0.25pt solid"
+      padding-before="6pt"
+      padding-after="6pt">
+      <xsl:call-template name="insertPageBreaks"/>
+<!-- insert i18n stuff here -->
+      NOTICE: <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="anchor">
+    <fo:block id="{@id}"/>
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="section">
+    <xsl:param name="level">0</xsl:param>
+    <xsl:variable name="size">
+<!-- 14pt for level 1 12pt for level 2 -->
+      <xsl:value-of select="14-number($level)"/>
+    </xsl:variable>
+    <xsl:variable name="background-color" select="//skinconfig/colors/color[@name='body']/@value"/>
+    <xsl:variable name="heading-color" select="//skinconfig/colors/color[@name='subheading']/@value"/>
+    <xsl:variable name="heading-type" select="//skinconfig/headings/@type"/>
+    <fo:block
+      font-family="serif"
+      font-size="{$size}pt"
+      font-weight="bold"
+      space-before="12pt"
+      space-after="4pt">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:if test="$heading-type = 'boxed'">
+        <xsl:attribute name="background-color">
+          <xsl:value-of select="$heading-color"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:attribute name="id">
+        <xsl:choose>
+          <xsl:when test="normalize-space(@id)!=''">
+            <xsl:value-of select="@id"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="generate-id()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:if test="$numbersections = 'true' and number($level) &lt; $numbering-max-depth+1">
+        <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
+<xsl:text>. </xsl:text>
+      </xsl:if>
+<!-- For sections 4  or more nestings deep, indent instead of number -->
+      <xsl:if test="number($level) &gt; $numbering-max-depth+1">
+        <xsl:attribute name="start-indent">
+          <xsl:value-of select="4+number($level)"/>
+<xsl:text>pt</xsl:text>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:value-of select="title"/>
+    </fo:block>
+    <xsl:if test="$heading-type = 'underlined'">
+<!-- The non-breaking space in this block is required, otherwise
+      the block won't be rendered at all. -->
+      <fo:block
+        font-family="serif"
+        font-size="{10 div (number($level) +1 )}pt"
+        background-color="{$heading-color}">&#160;</fo:block>
+    </xsl:if>
+    <fo:block
+        background-color="{$background-color}">
+      <xsl:apply-templates>
+        <xsl:with-param name="level" select="number($level)+1"/>
+      </xsl:apply-templates>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="title">
+<!-- do nothing as titles are handled in their parent templates -->
+  </xsl:template>
+  <xsl:template match="subtitle">
+    <xsl:param name="level">0</xsl:param>
+    <xsl:variable name="size" select="16-(number($level)*1.5)"/>
+    <fo:block
+      font-weight="bold"
+      font-size="{$size}pt">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="authors">
+    <fo:block
+      space-before="20pt"
+      font-weight="bold"
+      font-size="9pt">
+      <xsl:call-template name="insertPageBreaks"/>
+<!-- insert i18n stuff here -->
+      by
+      <xsl:for-each select="person">
+        <xsl:value-of select="@name"/>
+        <xsl:if test="not(position() = last())">, </xsl:if>
+      </xsl:for-each>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="p">
+    <xsl:choose>
+      <xsl:when test="ancestor::li and not(preceding-sibling::*)">
+        <fo:block
+          space-after="4pt"
+          font-family="serif">
+          <xsl:call-template name="insertPageBreaks"/>
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:block
+          space-before="4pt"
+          space-after="4pt"
+          font-family="serif">
+          <xsl:call-template name="insertPageBreaks"/>
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="source">
+    <xsl:variable name="color" select="//skinconfig/colors/color[@name='code']/@value"/>
+    <fo:block
+      font-family="monospace"
+      font-size="10pt"
+      background-color="{$color}"
+      white-space-collapse="false"
+      linefeed-treatment="preserve"
+      white-space-treatment="preserve"
+      wrap-option="wrap"
+      text-align="start">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="ol|ul">
+    <fo:list-block
+      provisional-distance-between-starts="18pt"
+      provisional-label-separation="3pt"
+      text-align="start">
+      <xsl:apply-templates/>
+    </fo:list-block>
+  </xsl:template>
+  <xsl:template match="ol/li">
+    <fo:list-item>
+      <xsl:if test="not(following-sibling::li[1])">
+        <xsl:attribute name="space-after">6pt"</xsl:attribute>
+      </xsl:if>
+      <fo:list-item-label
+        end-indent="label-end()">
+        <fo:block>
+          <xsl:number format="1."/>
+        </fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body
+        start-indent="body-start()">
+        <fo:block
+          font-family="serif">
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+<!-- Emulate browser handling of these invalid combinations that our DTD
+  unfortunately allows -->
+  <xsl:template match="ul/ul | ul/ol | ol/ul | ol/ol">
+    <fo:list-item>
+      <fo:list-item-label end-indent="label-end()">
+        <fo:block></fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()">
+        <fo:block font-family="serif">
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+  <xsl:template match="ul/li">
+    <fo:list-item>
+      <xsl:if test="not(following-sibling::li[1])">
+        <xsl:attribute name="space-after">6pt</xsl:attribute>
+      </xsl:if>
+      <fo:list-item-label end-indent="label-end()">
+        <fo:block>&#x2022;</fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()">
+        <fo:block
+          font-family="serif">
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+  <xsl:template match="dl">
+    <fo:list-block
+      provisional-distance-between-starts="18pt"
+      provisional-label-separation="3pt"
+      text-align="start">
+      <xsl:apply-templates/>
+    </fo:list-block>
+  </xsl:template>
+  <xsl:template match="dt">
+    <fo:list-item>
+      <fo:list-item-label end-indent="label-end()">
+        <fo:block></fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()">
+        <fo:block
+          font-weight="bold">
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+  <xsl:template match="dd">
+    <fo:list-item>
+      <fo:list-item-label end-indent="label-end()">
+        <fo:block></fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()">
+        <fo:block>
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+  <xsl:template match="strong">
+    <fo:inline font-weight="bold">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+  <xsl:template match="em">
+    <fo:inline font-style="italic">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+  <xsl:template match="code">
+    <fo:inline font-family="monospace">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+  <xsl:template match="warning">
+    <xsl:variable name="color" select="//skinconfig/colors/color[@name='warning']/@value"/>
+    <fo:block
+      margin-left="0.25in"
+      margin-right="0.25in"
+      font-weight="bold"
+      font-size="10pt"
+      font-family="serif"
+      space-before="10pt"
+      border-before-style="solid"
+      border-start-style="solid"
+      border-end-style="solid"
+      border-color="{$color}"
+      background-color="{$color}"
+      color="#ffffff">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:choose>
+        <xsl:when test="@label">
+          <xsl:value-of select="@label"/>
+        </xsl:when>
+        <xsl:otherwise>Warning: </xsl:otherwise>
+      </xsl:choose>
+      <xsl:value-of select="title"/>
+    </fo:block>
+    <fo:block
+      margin-left="0.25in"
+      margin-right="0.25in"
+      font-family="serif"
+      font-size="8pt"
+      border-after-style="solid"
+      border-start-style="solid"
+      border-end-style="solid"
+      border-color="{$color}"
+      background-color="#fff0f0"
+      padding-start="3pt"
+      padding-end="3pt"
+      padding-before="3pt"
+      padding-after="3pt"
+      space-after="10pt">
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="note">
+    <xsl:variable name="color" select="//skinconfig/colors/color[@name='note']/@value"/>
+    <fo:block
+      margin-left="0.25in"
+      margin-right="0.25in"
+      font-weight="bold"
+      font-size="10pt"
+      color="#ffffff"
+      font-family="serif"
+      space-before="10pt"
+      border-before-style="solid"
+      border-start-style="solid"
+      border-end-style="solid"
+      border-color="{$color}"
+      background-color="{$color}">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:choose>
+        <xsl:when test="@label">
+          <xsl:value-of select="@label"/>
+        </xsl:when>
+<!-- insert i18n stuff here -->
+        <xsl:otherwise>Note: </xsl:otherwise>
+      </xsl:choose>
+      <xsl:value-of select="title"/>
+    </fo:block>
+    <fo:block
+      margin-left="0.25in"
+      margin-right="0.25in"
+      font-family="serif"
+      font-size="8pt"
+      space-after="10pt"
+      border-after-style="solid"
+      border-start-style="solid"
+      border-end-style="solid"
+      border-color="{$color}"
+      background-color="#F0F0FF"
+      padding-start="3pt"
+      padding-end="3pt"
+      padding-before="3pt"
+      padding-after="3pt">
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="fixme">
+    <xsl:variable name="color" select="//skinconfig/colors/color[@name='fixme']/@value"/>
+    <fo:block
+      margin-left="0.25in"
+      margin-right="0.25in"
+      font-weight="bold"
+      font-size="10pt"
+      color="#FFFFFF"
+      font-family="serif"
+      space-before="10pt"
+      border-before-style="solid"
+      border-start-style="solid"
+      border-end-style="solid"
+      border-color="{$color}"
+      background-color="{$color}">
+      <xsl:call-template name="insertPageBreaks"/>
+<!-- insert i18n stuff here -->
+      FIXME (<xsl:value-of select="@author"/>): <xsl:value-of select="title"/>
+    </fo:block>
+    <fo:block
+      margin-left="0.25in"
+      margin-right="0.25in"
+      font-family="serif"
+      font-size="8pt"
+      space-after="10pt"
+      border-after-style="solid"
+      border-start-style="solid"
+      border-end-style="solid"
+      border-color="{$color}"
+      background-color="#FFF0F0"
+      padding-start="3pt"
+      padding-end="3pt"
+      padding-before="3pt"
+      padding-after="3pt">
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="link|fork|jump">
+    <xsl:variable name="color" select="//skinconfig/colors/color[@name = 'body']/@link"/>
+    <xsl:choose>
+      <xsl:when test="starts-with(@href, '#')">
+        <fo:basic-link color="{$color}" text-decoration="underline" internal-destination="{substring(@href,2)}">
+          <xsl:apply-templates/>
+        </fo:basic-link>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:basic-link color="{$color}" text-decoration="underline" external-destination="{@href}">
+          <xsl:apply-templates/>
+        </fo:basic-link>
+        <xsl:if test="$show-external-urls = 'true' and @href != string(.)">
+          (<xsl:value-of select="@href"/>)
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="figure|img">
+    <fo:block text-align="center">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:if test="normalize-space(@id)!=''">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
+<!-- Make relative paths absolute -->
+      <xsl:variable name="imgpath">
+        <xsl:choose>
+<!-- resources image dir -->
+          <xsl:when test="starts-with(string(@src),'images/')">
+            <xsl:value-of select="concat($imagesdir,substring-after(@src,'images'))"/>
+          </xsl:when>
+          <xsl:when test="contains(string(@src),'/images/')">
+            <xsl:value-of select="concat($imagesdir,substring-after(@src,'/images'))"/>
+          </xsl:when>
+<!-- already absolute -->
+          <xsl:when test="contains(string(@src),':') or starts-with(string(@src),'/')">
+            <xsl:value-of select="@src"/>
+          </xsl:when>
+<!-- relative to document -->
+          <xsl:otherwise>
+            <xsl:value-of select="concat($xmlbasedir,@src)"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <fo:external-graphic src="{$imgpath}">
+        <xsl:if test="@height">
+          <xsl:attribute name="height">
+            <xsl:value-of select="@height"/>
+          </xsl:attribute>
+        </xsl:if>
+        <xsl:if test="@width">
+          <xsl:attribute name="width">
+            <xsl:value-of select="@width"/>
+          </xsl:attribute>
+        </xsl:if>
+      </fo:external-graphic>
+<!-- alt text -->
+      <xsl:if test="//skinconfig/pdf/show-image-alt-text='true'">
+        <xsl:if test="normalize-space(@alt)!=''">
+          <fo:block>
+            <xsl:value-of select="@alt"/>
+          </fo:block>
+        </xsl:if>
+      </xsl:if>
+    </fo:block>
+  </xsl:template>
+  <xsl:template match="table">
+<!-- FIXME: Apache FOP must have column widths specified at present,
+         this section can be removed when this limitation is removed from Fop.
+         Unfortunately, this means that each column is a fixed width,
+         but at least the table displays! -->
+    <xsl:variable name="max-number-columns-td">
+      <xsl:for-each select="tr">
+        <xsl:sort select="count(td|th)" data-type="number"
+          order="descending"/>
+        <xsl:if test="position() = 1">
+          <xsl:value-of select="count(td|th)"/>
+        </xsl:if>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:variable name="max-number-columns-colspan">
+      <xsl:for-each select="tr">
+        <xsl:sort select="count(td|th)" data-type="number"
+          order="descending"/>
+        <xsl:if test="position() = 1">
+          <xsl:value-of
+            select="sum(td/@colspan|th/@colspan)"/>
+        </xsl:if>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:variable name="max-number-columns">
+      <xsl:choose>
+        <xsl:when
+          test="$max-number-columns-colspan&gt;$max-number-columns-td">
+          <xsl:value-of
+            select="$max-number-columns-colspan"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$max-number-columns-td"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="column-width">
+      <xsl:value-of select="6.25 div number($max-number-columns)"/>in
+    </xsl:variable>
+    <fo:table>
+      <fo:table-column>
+        <xsl:attribute name="column-width">
+          <xsl:value-of select="$column-width"/>
+        </xsl:attribute>
+        <xsl:attribute name="number-columns-repeated">
+          <xsl:value-of select="number($max-number-columns)"/>
+        </xsl:attribute>
+      </fo:table-column>
+<!-- End of hack for Fop support (if removing this hack, remember
+           you need the <fo:table> element) -->
+      <fo:table-body
+        font-size="10pt"
+        font-family="sans-serif">
+        <xsl:apply-templates select="tr"/>
+      </fo:table-body>
+    </fo:table>
+<!-- FIXME: Apache Fop does not support the caption element yet.
+         This hack will display the table caption accordingly. -->
+    <xsl:if test="caption">
+      <fo:block
+        text-align="center"
+        font-weight="bold">
+<!-- insert i18n stuff here -->
+        Table
+        <xsl:text> </xsl:text>
+        <xsl:number count="table" level="multiple"/>
+<xsl:text>: </xsl:text>
+        <xsl:value-of select="caption"/>
+      </fo:block>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="tr">
+    <fo:table-row>
+      <xsl:apply-templates/>
+    </fo:table-row>
+  </xsl:template>
+  <xsl:template match="th">
+    <xsl:variable name="border-color" select="//skinconfig/colors/color[@name = 'table']/@value"/>
+    <xsl:variable name="background-color" select="$border-color"/>
+    <fo:table-cell
+        padding-before="4pt"
+        padding-after="4pt"
+        padding-start="4pt"
+        padding-end="4pt"
+        color="#FFFFFF"
+        background-color="{$background-color}"
+        border="1pt solid {$border-color}">
+      <xsl:attribute name="number-columns-spanned">
+        <xsl:value-of select="@colspan"/>
+      </xsl:attribute>
+      <xsl:attribute name="number-rows-spanned">
+        <xsl:value-of select="@rowspan"/>
+      </xsl:attribute>
+      <fo:block
+          text-align="center">
+        <xsl:apply-templates/>
+      </fo:block>
+    </fo:table-cell>
+  </xsl:template>
+  <xsl:template match="td">
+    <xsl:variable name="border-color" select="//skinconfig/colors/color[@name = 'table']/@value"/>
+    <xsl:variable name="background-color" select="//skinconfig/colors/color[@name = 'table-cell']/@value"/>
+    <fo:table-cell
+      padding-before="4pt"
+      padding-after="4pt"
+      padding-start="4pt"
+      padding-end="4pt"
+      background-color="{$background-color}"
+      border="1pt solid {$border-color}">
+      <xsl:attribute name="number-columns-spanned">
+        <xsl:value-of select="@colspan"/>
+      </xsl:attribute>
+      <xsl:attribute name="number-rows-spanned">
+        <xsl:value-of select="@rowspan"/>
+      </xsl:attribute>
+      <fo:block>
+        <xsl:apply-templates/>
+      </fo:block>
+    </fo:table-cell>
+  </xsl:template>
+  <xsl:template match="br">
+    <fo:block></fo:block>
+  </xsl:template>
+  <xsl:template match="legal">
+    <fo:inline
+      font-size="8pt">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+  <xsl:template match="body[count(//section) != 0]">
+    <xsl:if test="$toc-max-depth > 0">
+      <fo:block font-family="serif" font-size="14pt" font-weight="bold"
+      space-after="5pt" space-before="5pt" text-align="justify" width="7.5in">
+        <xsl:call-template name="insertPageBreaks"/>
+<!-- insert i18n stuff here -->
+<xsl:text>Table of contents</xsl:text>
+      </fo:block>
+      <fo:block font-family="sans" font-size="12pt" space-after="5pt"
+      space-before="0pt" text-align="justify" width="7.5in">
+        <xsl:if test="$page-break-top-sections">
+          <xsl:attribute name="break-after">page</xsl:attribute>
+        </xsl:if>
+        <xsl:apply-templates select="section" mode="toc" />
+      </fo:block>
+    </xsl:if>
+    <xsl:apply-templates />
+  </xsl:template>
+  <xsl:template match="section" mode="toc">
+<!-- FIXME: see bug FOR-640 -->
+    <xsl:param name="depth" select="'1'"/>
+    <fo:block space-before="5pt" text-align-last="justify" start-indent=".5em" text-indent=".5em">
+      <fo:inline>
+        <xsl:variable name="id">
+          <xsl:choose>
+            <xsl:when test="normalize-space(@id)!=''">
+              <xsl:value-of select="@id"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="generate-id()"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <fo:basic-link internal-destination="{$id}">
+          <xsl:value-of select="substring('&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;', 0, 2 * $depth - 1)" />
+          <fo:inline font-size="10pt">
+            <xsl:number count="section" format="1.1.1.1.1.1.1" level="multiple" />
+          </fo:inline>
+<xsl:text> </xsl:text>
+          <xsl:value-of select="title" />
+          <fo:leader leader-pattern="dots" />
+          <fo:page-number-citation ref-id="{$id}" />
+        </fo:basic-link>
+      </fo:inline>
+      <xsl:if test="$toc-max-depth > $depth">
+        <xsl:apply-templates select="section" mode="toc">
+          <xsl:with-param name="depth" select="$depth + 1"/>
+        </xsl:apply-templates>
+      </xsl:if>
+    </fo:block>
+  </xsl:template>
+<!-- ====================================================================== -->
+<!-- Local Extensions section -->
+<!-- ====================================================================== -->
+  <xsl:template match="citation">
+    <fo:inline>
+     [<xsl:value-of select="@def"/>]
+   </fo:inline>
+  </xsl:template>
+  <xsl:template match="p[@class='quote']">
+    <fo:block start-indent="1em"
+     space-before="4pt"
+     space-after="4pt"
+     background-color="#f0f0f0"
+     font-family="monospace">
+      <xsl:call-template name="insertPageBreaks"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+  <xsl:template name="insertPageBreaks">
+<!-- if marked as a 'pageBreakBefore', and we're breaking on pages, and were not the first node -->
+    <xsl:if test="contains(@class, 'pageBreakBefore') and preceding-sibling::node()">
+      <xsl:attribute name="break-before">page</xsl:attribute>
+    </xsl:if>
+<!-- if marked as a 'pageBreakAfter', and we're breaking on pages, and were not the last node -->
+    <xsl:if test="contains(@class, 'pageBreakAfter') and following-sibling::node()">
+      <xsl:attribute name="break-after">page</xsl:attribute>
+    </xsl:if>
+  </xsl:template>
+<!-- Display the document numerotation -->
+  <xsl:template name="insertPageNumber">
+    <xsl:param name="text-align" select="'start'"/>
+    <xsl:variable name="prefixe" select="substring-before($page-numbering-format,'1')"/>
+    <xsl:variable name="sep" select="substring-before(substring-after($page-numbering-format,'1'),'1')"/>
+    <xsl:variable name="postfixe">
+      <xsl:choose>
+        <xsl:when test="contains(substring-after($page-numbering-format,'1'),'1')">
+          <xsl:value-of select="substring-after(substring-after($page-numbering-format,'1'),'1')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="substring-after($page-numbering-format,'1')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+<!-- if 'page-numbering-format' contains 1 digits, the page number is displayed in the footer -->
+    <xsl:if test="contains($page-numbering-format,'1')">
+      <fo:block font-size="70%" text-align="{$text-align}">
+<!-- if the separator is not found, the total page number is skipped -->
+        <xsl:value-of select="$prefixe"/>
+        <fo:page-number/>
+        <xsl:if test="$sep != ''">
+          <xsl:value-of select="$sep"/>
+          <fo:page-number-citation ref-id="term"/>
+        </xsl:if>
+        <xsl:value-of select="$postfixe"/>
+      </fo:block>
+    </xsl:if>
+  </xsl:template>
+<!-- ====================================================================== -->
+<!-- Temporary section - subject to change on short notice  -->
+<!-- ====================================================================== -->
+  <xsl:template match="//style">
+<!-- HACK: The OpenOffice.org input plugin currently produces
+   intermediate documents that contain a style element, invalid per
+   the Forrest Document DTD. This style element must be ignored
+   here. To find out why this is done this way, read the comments
+   attached to issue FOR-433. -->
+  </xsl:template>
 </xsl:stylesheet>

Added: hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl
URL: http://svn.apache.org/viewvc/hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl?rev=1125094&view=auto
==============================================================================
--- hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl (added)
+++ hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/footerinfo.xsl Thu May 19 20:48:01 2011
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+<!--
+Named template to generate a short message in the PDF footer, from text in
+skinconf.xml.  By default, the message is a copyright statement.  If a credit
+with @role='pdf' is present, that is used instead.  Eg:
+
+<credit role="pdf">
+  <name>Generated by Apache FOP 1.0-dev</name>
+  <url>http://xml.apache.org/fop/dev/</url>
+</credit>
+-->
+  <xsl:template name="info">
+    <xsl:variable name="disable-copyright-footer" select="//skinconfig/pdf/disable-copyright-footer"/>
+    <xsl:variable name="pdfcredit" select="//skinconfig/credits/credit[@role = 'pdf']"/>
+    <xsl:variable name="text">
+      <xsl:if test="$pdfcredit">
+        <xsl:value-of select="$pdfcredit/name"/>
+      </xsl:if>
+      <xsl:if test="not($pdfcredit) and not($disable-copyright-footer = 'true')">
+<xsl:text>Copyright &#169; </xsl:text>
+        <xsl:value-of select="//skinconfig/year"/>&#160;<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 Foundataion.
+</xsl:text>
+      </xsl:if>
+    </xsl:variable>
+    <xsl:variable name="url" select="$pdfcredit/url"/>
+    <fo:block-container font-style="italic" absolute-position="absolute"
+      left="0pt" top="0pt" right="6.25in" bottom="150pt"
+      font-size="10pt">
+      <xsl:if test="not($url)">
+        <fo:block text-align="center" color="lightgrey">
+          <xsl:value-of select="$text"/>
+        </fo:block>
+      </xsl:if>
+      <xsl:if test="$url">
+        <fo:block text-align="center">
+          <fo:basic-link color="lightgrey"
+            external-destination="{$url}">
+            <xsl:value-of select="$text"/>
+          </fo:basic-link>
+        </fo:block>
+        <fo:block text-align="center">
+          <fo:basic-link color="lightgrey"
+            external-destination="{$url}">
+            <xsl:value-of select="$url"/>
+          </fo:basic-link>
+        </fo:block>
+      </xsl:if>
+    </fo:block-container>
+  </xsl:template>
+</xsl:stylesheet>

Added: hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/pdfoutline.xsl
URL: http://svn.apache.org/viewvc/hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/pdfoutline.xsl?rev=1125094&view=auto
==============================================================================
--- hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/pdfoutline.xsl (added)
+++ hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/fo/pdfoutline.xsl Thu May 19 20:48:01 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                xmlns:fox="http://xml.apache.org/fop/extensions"
+                version="1.0">
+  <xsl:template match="document" mode="outline">
+    <xsl:apply-templates select="body/section" mode="outline"/>
+  </xsl:template>
+  <xsl:template match="section" mode="outline">
+    <fox:outline>
+      <xsl:attribute name="internal-destination">
+        <xsl:choose>
+          <xsl:when test="normalize-space(@id)!=''">
+            <xsl:value-of select="@id"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="generate-id()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <fox:label>
+        <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
+<xsl:text> </xsl:text>
+        <xsl:value-of select="normalize-space(title)"/>
+      </fox:label>
+      <xsl:apply-templates select="section" mode="outline"/>
+    </fox:outline>
+  </xsl:template>
+</xsl:stylesheet>

Modified: hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl (original)
+++ hadoop/site/author/src/documentation/skins/hadoop-pelt/xslt/html/site-to-xhtml.xsl Thu May 19 20:48:01 2011
@@ -335,7 +335,10 @@ footer, searchbar, css etc.  As input, i
                 <xsl:otherwise>
                   <xsl:value-of select="$config/vendor"/>
                 </xsl:otherwise>
-              </xsl:choose>
+              </xsl:choose><br/>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
             </div>
           </xsl:if>
           <xsl:if test="$filename = 'index.html'">

Modified: hadoop/site/publish/bylaws.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/bylaws.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/bylaws.html (original)
+++ hadoop/site/publish/bylaws.html Thu May 19 20:48:01 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
 <title>Apache Hadoop Project Bylaws</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -212,7 +212,7 @@ document.write("Last Published: " + docu
 </div> 
 
     
-<a name="N1000D"></a><a name="Introduction"></a>
+<a name="N1000C"></a><a name="Introduction"></a>
 <h2 class="h3">Introduction</h2>
 <div class="section">
 <p>This document defines the bylaws under which the Apache Hadoop project
@@ -230,7 +230,7 @@ document.write("Last Published: " + docu
 </div>
 
    
-<a name="N10028"></a><a name="Roles+and+Responsibilities"></a>
+<a name="N10027"></a><a name="Roles+and+Responsibilities"></a>
 <h2 class="h3">Roles and Responsibilities</h2>
 <div class="section">
 <p>Apache projects define a set of roles with associated rights and
@@ -367,7 +367,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N10082"></a><a name="Decision+Making"></a>
+<a name="N10081"></a><a name="Decision+Making"></a>
 <h2 class="h3">Decision Making</h2>
 <div class="section">
 <p>Within the Hadoop project, different types of decisions require
@@ -655,7 +655,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <!--+
     |end bottomstrip
     +-->

Modified: hadoop/site/publish/bylaws.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/bylaws.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/bylaws.pdf (original) and hadoop/site/publish/bylaws.pdf Thu May 19 20:48:01 2011 differ

Modified: hadoop/site/publish/general_lists.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/general_lists.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/general_lists.html (original)
+++ hadoop/site/publish/general_lists.html Thu May 19 20:48:01 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
 <title>Hadoop Top Level Project Mailing Lists</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -209,7 +209,7 @@ document.write("Last Published: " + docu
 </div>
 
     
-<a name="N1000D"></a><a name="General"></a>
+<a name="N1000C"></a><a name="General"></a>
 <h2 class="h3">General</h2>
 <div class="section">
 <p>The general mailing list is for discussion of
@@ -241,7 +241,7 @@ document.write("Last Published: " + docu
 
   
     
-<a name="N10034"></a><a name="Security"></a>
+<a name="N10033"></a><a name="Security"></a>
 <h2 class="h3">Security</h2>
 <div class="section">
 <p>The security mailing list is a private list for discussion of
@@ -279,7 +279,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <!--+
     |end bottomstrip
     +-->

Modified: hadoop/site/publish/general_lists.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/general_lists.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/general_lists.pdf (original) and hadoop/site/publish/general_lists.pdf Thu May 19 20:48:01 2011 differ

Modified: hadoop/site/publish/index.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/index.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/index.html (original)
+++ hadoop/site/publish/index.html Thu May 19 20:48:01 2011
@@ -3,9 +3,9 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
-<title>Welcome to Apache Hadoop!</title>
+<title>Welcome to Apache&trade; Hadoop&trade;!</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -199,11 +199,11 @@ document.write("Last Published: " + docu
 <a class="dida" href="index.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
 </div>
-<h1>Welcome to Apache Hadoop!</h1>
+<h1>Welcome to Apache&trade; Hadoop&trade;!</h1>
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
-<a href="#What+Is+Apache%E2%84%A2+Hadoop%E2%84%A2%3F">What Is Apache&trade; Hadoop&trade;?</a>
+<a href="#What+Is+Apache+Hadoop%3F">What Is Apache Hadoop?</a>
 </li>
 <li>
 <a href="#Who+Uses+Hadoop%3F">Who Uses Hadoop?</a>
@@ -241,8 +241,8 @@ document.write("Last Published: " + docu
 </div> 
 
     
-<a name="N1000D"></a><a name="What+Is+Apache%E2%84%A2+Hadoop%E2%84%A2%3F"></a>
-<h2 class="h3">What Is Apache&trade; Hadoop&trade;?</h2>
+<a name="N1000C"></a><a name="What+Is+Apache+Hadoop%3F"></a>
+<h2 class="h3">What Is Apache Hadoop?</h2>
 <div class="section">
 <p>
       
@@ -252,7 +252,7 @@ document.write("Last Published: " + docu
       </p>
 <p>
       
-      The Apache&trade; Hadoop&trade; software library is a framework that
+      The Apache Hadoop software library is a framework that
       allows for the distributed processing of large data sets across clusters
       of computers using a simple programming model. It is designed to scale up
       from single servers to thousands of machines, each offering local
@@ -274,7 +274,7 @@ document.write("Last Published: " + docu
 
       
 <li>
-<a href="http://hadoop.apache.org/hdfs/"><strong>Hadoop Distributed File System (HDFS)</strong></a>: 
+<a href="http://hadoop.apache.org/hdfs/"><strong>Hadoop Distributed File System (HDFS&trade;)</strong></a>: 
       A distributed file system that provides high-throughput access to application data.  </li>
       
       
@@ -288,42 +288,42 @@ document.write("Last Published: " + docu
 
       
 <li>
-<a href="http://avro.apache.org/"><strong>Avro</strong></a>: 
+<a href="http://avro.apache.org/"><strong>Avro&trade;</strong></a>: 
       A data serialization system.</li>
 
       
 <li>
-<a href="http://cassandra.apache.org/"><strong>Cassandra</strong></a>: 
+<a href="http://cassandra.apache.org/"><strong>Cassandra&trade;</strong></a>: 
       A scalable multi-master database with no single points of failure.</li>
 
       
 <li>
-<a href="http://incubator.apache.org/chukwa/"><strong>Chukwa</strong></a>: 
+<a href="http://incubator.apache.org/chukwa/"><strong>Chukwa&trade;</strong></a>: 
       A data collection system for managing large distributed systems.  </li>
 
       
 <li>
-<a href="http://hbase.apache.org/"><strong>HBase</strong></a>: 
+<a href="http://hbase.apache.org/"><strong>HBase&trade;</strong></a>: 
       A scalable, distributed database that supports structured data storage for large tables.  </li>
 
       
 <li>
-<a href="http://hive.apache.org/"><strong>Hive</strong></a>:  
+<a href="http://hive.apache.org/"><strong>Hive&trade;</strong></a>:  
       A data warehouse infrastructure that provides data summarization and ad hoc querying. </li>
       
       
 <li>
-<a href="http://mahout.apache.org/"><strong>Mahout</strong></a>:
+<a href="http://mahout.apache.org/"><strong>Mahout&trade;</strong></a>:
       A Scalable machine learning and data mining library. </li>
       
       
 <li>
-<a href="http://pig.apache.org/"><strong>Pig</strong></a>: 
+<a href="http://pig.apache.org/"><strong>Pig&trade;</strong></a>: 
       A high-level data-flow language and execution framework for parallel computation.</li>
       
       
 <li>
-<a href="http://zookeeper.apache.org/"><strong>ZooKeeper</strong></a>: 
+<a href="http://zookeeper.apache.org/"><strong>ZooKeeper&trade;</strong></a>: 
       A high-performance coordination service for distributed applications. </li>
 
       
@@ -331,7 +331,7 @@ document.write("Last Published: " + docu
 </div>
 
     
-<a name="N10073"></a><a name="Who+Uses+Hadoop%3F"></a>
+<a name="N10072"></a><a name="Who+Uses+Hadoop%3F"></a>
 <h2 class="h3">Who Uses Hadoop?</h2>
 <div class="section">
 <p>
@@ -342,10 +342,10 @@ document.write("Last Published: " + docu
 </div>
 
     
-<a name="N10081"></a><a name="News"></a>
+<a name="N10080"></a><a name="News"></a>
 <h2 class="h3">News</h2>
 <div class="section">
-<a name="N10087"></a><a name="March+2011+-+Apache+Hadoop+takes+top+prize+at+Media+Guardian+Innovation+Awards"></a>
+<a name="N10086"></a><a name="March+2011+-+Apache+Hadoop+takes+top+prize+at+Media+Guardian+Innovation+Awards"></a>
 <h3 class="h4">March 2011 - Apache Hadoop takes top prize at Media Guardian Innovation Awards</h3>
 <p>
        
@@ -359,14 +359,14 @@ document.write("Last Published: " + docu
        The Guardian web site</a>
        
 </p>
-<a name="N10098"></a><a name="January+2011+-+ZooKeeper+Graduates"></a>
+<a name="N10097"></a><a name="January+2011+-+ZooKeeper+Graduates"></a>
 <h3 class="h4">January 2011 - ZooKeeper Graduates</h3>
 <p>Hadoop's ZooKeeper subproject has graduated to become a
      top-level Apache project.</p>
 <p>Apache ZooKeeper can now be found
      at <a href="http://zookeeper.apache.org/">http://zookeeper.apache.org/</a>
 </p>
-<a name="N100A8"></a><a name="September+2010+-+Hive+and+Pig+Graduate"></a>
+<a name="N100A7"></a><a name="September+2010+-+Hive+and+Pig+Graduate"></a>
 <h3 class="h4">September 2010 - Hive and Pig Graduate</h3>
 <p>Hadoop's Hive and Pig subprojects have graduated to become
      top-level Apache projects.</p>
@@ -376,7 +376,7 @@ document.write("Last Published: " + docu
 <p>Pig can now be found
      at <a href="http://pig.apache.org/">http://pig.apache.org/</a>
 </p>
-<a name="N100BE"></a><a name="May+2010+-+Avro+and+HBase+Graduate"></a>
+<a name="N100BD"></a><a name="May+2010+-+Avro+and+HBase+Graduate"></a>
 <h3 class="h4">May 2010 - Avro and HBase Graduate</h3>
 <p>Hadoop's Avro and HBase subprojects have graduated to become
      top-level Apache projects.</p>
@@ -386,7 +386,7 @@ document.write("Last Published: " + docu
 <p>Apache HBase can now be found
      at <a href="http://hbase.apache.org/">http://hbase.apache.org/</a>
 </p>
-<a name="N100D4"></a><a name="July+2009+-+New+Hadoop+Subprojects"></a>
+<a name="N100D3"></a><a name="July+2009+-+New+Hadoop+Subprojects"></a>
 <h3 class="h4">July 2009 - New Hadoop Subprojects</h3>
 <p>Hadoop is getting bigger! </p>
 <ul>
@@ -400,15 +400,15 @@ document.write("Last Published: " + docu
 </ul>
 <p></p>
 <p>See the summary descriptions for all subprojects above. Visit the individual sites for more detailed information.</p>
-<a name="N100EF"></a><a name="March+2009+-+ApacheCon+EU"></a>
+<a name="N100EE"></a><a name="March+2009+-+ApacheCon+EU"></a>
 <h3 class="h4">March 2009 - ApacheCon EU</h3>
 <p>In case you missed it.... <a href="http://www.eu.apachecon.com/c/aceu2009/">ApacheCon Europe 2009</a> 
 </p>
-<a name="N100FD"></a><a name="November+2008+-+ApacheCon+US"></a>
+<a name="N100FC"></a><a name="November+2008+-+ApacheCon+US"></a>
 <h3 class="h4">November 2008 - ApacheCon US</h3>
 <p>In case you missed it.... <a href="http://us.apachecon.com/c/acus2008/">ApacheCon US 2008</a> 
 </p>
-<a name="N1010B"></a><a name="July+2008+-+Hadoop+Wins+Terabyte+Sort+Benchmark"></a>
+<a name="N1010A"></a><a name="July+2008+-+Hadoop+Wins+Terabyte+Sort+Benchmark"></a>
 <h3 class="h4">July 2008 - Hadoop Wins Terabyte Sort Benchmark</h3>
 <p>
      
@@ -436,7 +436,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <div id="logos"></div>
 <!--+
     |end bottomstrip

Modified: hadoop/site/publish/index.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/index.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/index.pdf (original) and hadoop/site/publish/index.pdf Thu May 19 20:48:01 2011 differ

Modified: hadoop/site/publish/linkmap.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/linkmap.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/linkmap.html (original)
+++ hadoop/site/publish/linkmap.html Thu May 19 20:48:01 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
 <title>Site Linkmap Table of Contents</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -386,7 +386,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <!--+
     |end bottomstrip
     +-->

Modified: hadoop/site/publish/linkmap.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/linkmap.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/linkmap.pdf (original) and hadoop/site/publish/linkmap.pdf Thu May 19 20:48:01 2011 differ

Modified: hadoop/site/publish/mailing_lists.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/mailing_lists.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/mailing_lists.html (original)
+++ hadoop/site/publish/mailing_lists.html Thu May 19 20:48:01 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
 <title>Hadoop Project Mailing Lists</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -219,7 +219,7 @@ document.write("Last Published: " + docu
       Please use the appropriate list described below. In most cases it is necessary to first subscribe to a list before posting to it.</p>
 
       
-<a name="N10013"></a><a name="User+Mailing+Lists"></a>
+<a name="N10012"></a><a name="User+Mailing+Lists"></a>
 <h2 class="h3">User Mailing Lists</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -248,7 +248,7 @@ document.write("Last Published: " + docu
 </div>
 
       
-<a name="N10065"></a><a name="Project+Discussion%2FAnnoucement+Mailing+Lists"></a>
+<a name="N10064"></a><a name="Project+Discussion%2FAnnoucement+Mailing+Lists"></a>
 <h2 class="h3">Project Discussion/Annoucement Mailing Lists</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -265,7 +265,7 @@ document.write("Last Published: " + docu
 </div>
 
       
-<a name="N1008F"></a><a name="Developer+Mailing+Lists"></a>
+<a name="N1008E"></a><a name="Developer+Mailing+Lists"></a>
 <h2 class="h3">Developer Mailing Lists</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -290,7 +290,7 @@ document.write("Last Published: " + docu
 </div>
 
       
-<a name="N100CA"></a><a name="Developer+Tracking+Mailing+Lists"></a>
+<a name="N100C9"></a><a name="Developer+Tracking+Mailing+Lists"></a>
 <h2 class="h3">Developer Tracking Mailing Lists</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -345,7 +345,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <!--+
     |end bottomstrip
     +-->

Modified: hadoop/site/publish/mailing_lists.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/mailing_lists.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/mailing_lists.pdf (original) and hadoop/site/publish/mailing_lists.pdf Thu May 19 20:48:01 2011 differ

Modified: hadoop/site/publish/privacy_policy.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/privacy_policy.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/privacy_policy.html (original)
+++ hadoop/site/publish/privacy_policy.html Thu May 19 20:48:01 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
 <title>Privacy Policy</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -206,7 +206,7 @@ document.write("Last Published: " + docu
 </div>
   
     
-<a name="N1000D"></a><a name="Privacy+Policy"></a>
+<a name="N1000C"></a><a name="Privacy+Policy"></a>
 <h2 class="h3">Privacy Policy</h2>
 <div class="section">
 <p>Information about your use of this website is collected using server
@@ -261,7 +261,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <!--+
     |end bottomstrip
     +-->

Modified: hadoop/site/publish/privacy_policy.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/privacy_policy.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/privacy_policy.pdf (original) and hadoop/site/publish/privacy_policy.pdf Thu May 19 20:48:01 2011 differ

Modified: hadoop/site/publish/skin/images/rc-b-l-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-b-l-15-1body-2menu-3menu.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-b-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-b-r-15-1body-2menu-3menu.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-r-15-1body-2menu-3menu.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/hadoop/site/publish/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/site/publish/who.html
URL: http://svn.apache.org/viewvc/hadoop/site/publish/who.html?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
--- hadoop/site/publish/who.html (original)
+++ hadoop/site/publish/who.html Thu May 19 20:48:01 2011
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.9">
+<meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="hadoop-pelt">
 <title>Who We Are</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -212,7 +212,7 @@ document.write("Last Published: " + docu
 </div> 
 
     
-<a name="N1000D"></a><a name="Apache+Hadoop+Project+Members"></a>
+<a name="N1000C"></a><a name="Apache+Hadoop+Project+Members"></a>
 <h2 class="h3">Apache Hadoop Project Members</h2>
 <div class="section">
 <p>Please see individual sub-projects for lists of their
@@ -233,7 +233,7 @@ document.write("Last Published: " + docu
 </div>
 
     
-<a name="N1001A"></a><a name="Hadoop+PMC"></a>
+<a name="N10019"></a><a name="Hadoop+PMC"></a>
 <h2 class="h3">Hadoop PMC</h2>
 <div class="section">
 <p>
@@ -512,7 +512,7 @@ document.write("Last Published: " + docu
 </div>
 
     
-<a name="N102D5"></a><a name="Emeritus+Hadoop+PMC+Members"></a>
+<a name="N102D4"></a><a name="Emeritus+Hadoop+PMC+Members"></a>
 <h2 class="h3">Emeritus Hadoop PMC Members</h2>
 <div class="section">
 <ul>
@@ -545,7 +545,11 @@ document.write("Last Published: " + docu
 <div class="copyright">
         Copyright &copy;
          2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
+<br>
+              Apache Hadoop, Hadoop, HDFS, Avro, Cassandra, Chukwa, HBase, 
+              Hive, Mahout, Pig, Zookeeper are trademarks of the Apache 
+              Software Foundataion.
+            </div>
 <!--+
     |end bottomstrip
     +-->

Modified: hadoop/site/publish/who.pdf
URL: http://svn.apache.org/viewvc/hadoop/site/publish/who.pdf?rev=1125094&r1=1125093&r2=1125094&view=diff
==============================================================================
Files hadoop/site/publish/who.pdf (original) and hadoop/site/publish/who.pdf Thu May 19 20:48:01 2011 differ