svn commit: samba-docs r1122 - in trunk: . Samba3-Developers-Guide manpages-3 templates xslt

[ab at samba.org]

Author: ab
Date: 2007-06-06 13:43:17 +0000 (Wed, 06 Jun 2007)
New Revision: 1122

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1122

Log:
Fix Samba documentation build for manpages
Added:
   trunk/templates/attributions.xml
Modified:
   trunk/Makefile
   trunk/Samba3-Developers-Guide/index.xml
   trunk/manpages-3/smb.conf.5.xml
   trunk/xslt/man.xsl


Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-06-06 13:19:10 UTC (rev 1121)
+++ trunk/Makefile	2007-06-06 13:43:17 UTC (rev 1122)
@@ -53,6 +53,18 @@
 all: $(TARGETS)
 everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson 
 release: manpages3 htmlman3 html pdf 
+clean:
+	@echo "Cleaning up..." 
+	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
+	rm -f $(patsubst %.dia,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
+			$(patsubst %.dia,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
+			$(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia)))
+	rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
+	rm -f *-images-html*
+	rm -f *-images-latex-* latexfigures
+	rm -f xslt/figures/*pdf
+	rm -f $(SMBDOTCONFDOC)/parameters.*.xml
+	rm -f $(addsuffix .*,$(MAIN_DOCS))
 
 # Output format targets
 pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
@@ -115,6 +127,7 @@
 # Attributions
 %-attributions.xml: 
 	@echo "Generating attributions file $@ from $*/"
+	@cp -f templates/attributions.xml $@
 	$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml 
 
 # Text files
@@ -302,18 +315,6 @@
 distclean clobber: clean
 	rm Makefile.settings config.status config.log configure
 
-clean: 
-	@echo "Cleaning up..." 
-	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
-	rm -f $(patsubst %.dia,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
-			$(patsubst %.dia,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
-			$(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia)))
-	rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
-	rm -f *-images-html*
-	rm -f *-images-latex-* latexfigures
-	rm -f xslt/figures/*pdf
-	rm -f $(SMBDOTCONFDOC)/parameters.*.xml
-	rm -f $(addsuffix .*,$(MAIN_DOCS))
 
 # Always keep intermediate files if we can
 .SECONDARY:

Modified: trunk/Samba3-Developers-Guide/index.xml
===================================================================
--- trunk/Samba3-Developers-Guide/index.xml	2007-06-06 13:19:10 UTC (rev 1121)
+++ trunk/Samba3-Developers-Guide/index.xml	2007-06-06 13:43:17 UTC (rev 1122)
@@ -44,7 +44,7 @@
 
 </bookinfo>
 
-<xi:include href="../Samba-Developers-Guide-attributions.xml">
+<xi:include href="../Samba3-Developers-Guide-attributions.xml">
 	<xi:fallback/>
 </xi:include>
 

Modified: trunk/manpages-3/smb.conf.5.xml
===================================================================
--- trunk/manpages-3/smb.conf.5.xml	2007-06-06 13:19:10 UTC (rev 1121)
+++ trunk/manpages-3/smb.conf.5.xml	2007-06-06 13:43:17 UTC (rev 1122)
@@ -55,7 +55,7 @@
 	</para>
 
 	<para>
-	Any line ending in a <quote>\</quote> is continued on the next line in the customary UNIX fashion.
+	Any line ending in a <quote>\\</quote> is continued on the next line in the customary UNIX fashion.
 	</para>
 
 	<para>

Added: trunk/templates/attributions.xml
===================================================================
--- trunk/templates/attributions.xml	2007-06-06 13:19:10 UTC (rev 1121)
+++ trunk/templates/attributions.xml	2007-06-06 13:43:17 UTC (rev 1122)
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<preface>
+</preface>
+

Modified: trunk/xslt/man.xsl
===================================================================
--- trunk/xslt/man.xsl	2007-06-06 13:19:10 UTC (rev 1121)
+++ trunk/xslt/man.xsl	2007-06-06 13:43:17 UTC (rev 1122)
@@ -132,6 +132,12 @@
   <xsl:text>\fR</xsl:text>
 </xsl:template>
 
+<xsl:template match="//quote">
+  <xsl:text>\fB</xsl:text>
+  <xsl:apply-templates/>
+  <xsl:text>\fR</xsl:text>
+</xsl:template>
+
 <xsl:template match="para|simpara|remark" mode="list">
   <xsl:variable name="foo">
     <xsl:apply-templates/>