From 4e9eaa8538ed54f0bcfb3162204dabb9d7c763d1 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 6 Jun 2011 21:29:36 +0000
Subject: NO-JIRA: update out-of-date URLs for the mailing list archives at
 Nabble, fix broken svn props url, make XSL stylesheet location a constant and
 add possible alternative setting for Ubuntu users

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1132783 13f79535-47bb-0310-9956-ffa450edef68
---
 doc/book/build-book.sh                     | 12 +++++++++---
 doc/website/content/mailing_lists.html     |  5 ++---
 doc/website/content/source_repository.html |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc/book/build-book.sh b/doc/book/build-book.sh
index 74a2ec963d..46192907e6 100755
--- a/doc/book/build-book.sh
+++ b/doc/book/build-book.sh
@@ -29,6 +29,12 @@
 #
 ########################################################################
 
+# DOCBOOK XSL STYLESHEET LOCATION
+# Fedora, RHEL:
+DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets
+# Ubuntu:
+# DOCBOOK_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
+
 rm -rf build/$1
 mkdir -p build/$1
 mkdir -p build/$1/html-single
@@ -38,16 +44,16 @@ cp -r src/images build/$1/html-single
 cp -r src/images build/$1/html
 
 # Create single-page .html
-xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl src/$1.xml >build/$1/html-single/$1.html
+xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 ${DOCBOOK_XSL}/html/docbook.xsl src/$1.xml >build/$1/html-single/$1.html
 
 # Create chunked .html
 INFILE=$(readlink -f src/$1.xml)
 pushd build/$1/html
-xsltproc --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl $INFILE
+xsltproc --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 ${DOCBOOK_XSL}/html/chunk.xsl $INFILE
 popd
 
 # Create the .fo
-xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl src/$1.xml >build/$1/pdf/$1.fo
+xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 ${DOCBOOK_XSL}/fo/docbook.xsl src/$1.xml >build/$1/pdf/$1.fo
 
 # Use Apache FOP to create the PDF
 fop build/$1/pdf/$1.fo build/$1/pdf/$1.pdf
diff --git a/doc/website/content/mailing_lists.html b/doc/website/content/mailing_lists.html
index b1c5266e40..3494e092e0 100644
--- a/doc/website/content/mailing_lists.html
+++ b/doc/website/content/mailing_lists.html
@@ -39,7 +39,7 @@
     <li>The user's mailing list is archived. You can view the archive at:
         <ul>
             <li>Apache archive: <a href="http://mail-archives.apache.org/mod_mbox/qpid-users/">http://mail-archives.apache.org/mod_mbox/qpid-users/</a><br/></li>
-            <li>Nabble archive: <a href="http://n2.nabble.com/Apache-Qpid-users-f2158936.html">http://n2.nabble.com/Apache-Qpid-users-f2158936.html</a></li>
+            <li>Nabble archive: <a href="http://apache-qpid-users.2158936.n2.nabble.com">http://apache-qpid-users.2158936.n2.nabble.com</a></li>
         </ul>
     </li>
   </ul>
@@ -57,8 +57,7 @@
     <li>The developer's mailing list is archived. You can view the archive at:
         <ul>
             <li>Apache archive: <a href="http://mail-archives.apache.org/mod_mbox/qpid-dev/">http://mail-archives.apache.org/mod_mbox/qpid-dev/</a></li>
-            <li>Nabble archive: <a href="http://www.nabble.com/Qpid-Developers-f16694.html">http://www.nabble.com/Qpid-Developers-f16694.html</a><br/>
-            and <a href="http://n2.nabble.com/Apache-Qpid-developers-f2158895.html">http://n2.nabble.com/Apache-Qpid-developers-f2158895.html</a></li>
+            <li>Nabble archive: <a href="http://apache-qpid-developers.2158895.n2.nabble.com">http://apache-qpid-developers.2158895.n2.nabble.com</a></li>
         </ul>
     </li>
   </ul>
diff --git a/doc/website/content/source_repository.html b/doc/website/content/source_repository.html
index 147669991e..ebb0e1321e 100644
--- a/doc/website/content/source_repository.html
+++ b/doc/website/content/source_repository.html
@@ -69,6 +69,6 @@ git clone http://git.apache.org/qpid.git qpid
   <p>When adding files to subversion, it's important that your subversion client is properly setup to the appropriate subversion properties are set.  The client can do it automatically by modifying the auto-props section of the subversion config file.   Use the contents of:</p>
 
 <pre>
-http://svn.apache.org/repos/asf/qpid/trunk/etc/svn-auto-props
+http://svn.apache.org/repos/asf/qpid/trunk/qpid/etc/svn-auto-props
 </pre>
 </div>
-- 
cgit v1.2.1