You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/01/05 16:59:15 UTC

svn commit: r1555531 - in /cayenne/main/branches/STABLE-3.1/docs/docbook: docbook-stylesheets/src/main/resources/stylesheets/html.xsl docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl pom.xml

Author: aadamchik
Date: Sun Jan  5 15:59:14 2014
New Revision: 1555531

URL: http://svn.apache.org/r1555531
Log:
Using only major version in docs metadata

otherwise Google is confused how to find docs for a given v. of Cayenne

(cherry picked from commit 212afab6627714e8db6061af980db663489994ce)

Modified:
    cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl
    cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl
    cayenne/main/branches/STABLE-3.1/docs/docbook/pom.xml

Modified: cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl?rev=1555531&r1=1555530&r2=1555531&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl (original)
+++ cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl Sun Jan  5 15:59:14 2014
@@ -73,8 +73,8 @@
             <link rev="made" href="{$link.mailto.url}"/>
         </xsl:if>
 
-        <meta name="keywords" content="Cayenne ${pom.version} documentation"/>
-        <meta name="description" content="User documentation for Apache Cayenne version ${pom.version}"/>
+        <meta name="keywords" content="Cayenne ${cayenne.version.major} documentation"/>
+        <meta name="description" content="User documentation for Apache Cayenne version ${cayenne.version.major}"/>
 
         <xsl:if test="$generate.meta.abstract != 0">
             <xsl:variable name="info" select="(d:articleinfo
@@ -166,7 +166,7 @@ body { background-image: url('</xsl:text
                         <!-- Add Apache Cayenne version info -->
                         <xsl:if test="$row1">
                             <tr>
-                                <th class="versioninfo">v.${pom.version}</th>
+                                <th class="versioninfo">v.${cayenne.version.major} (${pom.version})</th>
                                 <th align="center">
                                     <xsl:apply-templates select="." mode="object.title.markup"/>
                                 </th>

Modified: cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl?rev=1555531&r1=1555530&r2=1555531&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl (original)
+++ cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl Sun Jan  5 15:59:14 2014
@@ -155,7 +155,7 @@
         <xsl:param name="position" select="''"/>
         <xsl:param name="gentext-key" select="''"/>
         <xsl:variable name="Version">
-            <fo:inline min-width="150mm">v.${pom.version}</fo:inline>
+            <fo:inline min-width="150mm">v.${cayenne.version.major}</fo:inline>
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$sequence='blank'">

Modified: cayenne/main/branches/STABLE-3.1/docs/docbook/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/docs/docbook/pom.xml?rev=1555531&r1=1555530&r2=1555531&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/docs/docbook/pom.xml (original)
+++ cayenne/main/branches/STABLE-3.1/docs/docbook/pom.xml Sun Jan  5 15:59:14 2014
@@ -40,6 +40,9 @@
 
     <properties>
         <project.stylesheetdir>${project.parent.basedir}/docbook-stylesheets/target/classes</project.stylesheetdir>
+
+        <!-- This property allows to only expose major version in the docs metadata to avoid confusing SEO -->
+        <cayenne.version.major>3.2</cayenne.version.major>
     </properties>
 
 	<groupId>org.apache.cayenne.docs</groupId>