[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-2026-gc42f285

Karolin Seeger kseeger at samba.org
Fri Apr 25 10:53:10 GMT 2008


The branch, v3-2-stable has been updated
       via  c42f2857a3ef78f936701ebc596cf3cb2d3665f7 (commit)
       via  f217bd95486343786de54ed7629b37332782ae94 (commit)
       via  4b74bf9c3c130a94c45dac455697b926fb99bcc8 (commit)
      from  0f642f6da629714f32e3442cdf1dda8bd6e07cd9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit c42f2857a3ef78f936701ebc596cf3cb2d3665f7
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Apr 24 23:46:01 2008 +0400

    Fix yet another set of documentation links
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit a132cc3c6243c049860378f56c4d415d6cb35570)

commit f217bd95486343786de54ed7629b37332782ae94
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Apr 24 23:41:35 2008 +0400

    Ignore intermediary documentation files in git
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit e700cf9ef4aefcb04d500136d117ff13a51e6433)

commit 4b74bf9c3c130a94c45dac455697b926fb99bcc8
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Apr 24 23:40:51 2008 +0400

    Fix documentation build: manpages, links in the HTML documents.
    
    Fixed manpages generation to properly create handle smb.conf parameters' titles
    Changed HTML generator to include links for every smb.conf parameter.
    Now we have correct linking between different HTML documents.
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 056935ff1f5fefc3ca42f7006182fc80c94d91ab)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/{.bzrignore => .gitignore}       |    0 
 docs-xml/Makefile                         |    6 +-
 docs-xml/configure.ac                     |    2 +-
 docs-xml/htmldocs.html                    |    2 +-
 docs-xml/manpages-3/ntlm_auth.1.xml       |    3 +-
 docs-xml/manpages-3/winbindd.8.xml        |    7 +--
 docs-xml/smbdotconf/generate-file-list.sh |    4 +-
 docs-xml/xslt/expand-sambadoc.xsl         |   13 ++++--
 docs-xml/xslt/expand-smbconfdoc.xsl       |   63 ++++++++++++++++++----------
 docs-xml/xslt/html-common.xsl             |    2 +-
 docs-xml/xslt/man.xsl                     |    2 +
 11 files changed, 61 insertions(+), 43 deletions(-)
 rename docs-xml/{.bzrignore => .gitignore} (100%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/.bzrignore b/docs-xml/.gitignore
similarity index 100%
rename from docs-xml/.bzrignore
rename to docs-xml/.gitignore
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 1e41210..0f401d6 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -59,7 +59,7 @@ clean:
 	rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
 			$(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
 			$(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
-	rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
+	rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
 	rm -f *-images-html*
 	rm -f *-images-latex-* latexfigures
 	rm -f xslt/figures/*pdf
@@ -92,11 +92,11 @@ validate: $(addsuffix -validate,$(MAIN_DOCS))
 $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
 	@echo "Converting Samba-specific tags for $*..."
 	@mkdir -p $(@D)
-	$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+	$(XSLTPROC) --stringparam latex.imagebasedir "$*/"  --stringparam noreference 0  --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
 $(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
 	@mkdir -p $(@D)
-	$(XSLTPROC) --xinclude --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
+	$(XSLTPROC) --xinclude --stringparam noreference 0 --output $@ xslt/expand-sambadoc.xsl $<
 
 $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl
 	@mkdir -p $(@D)
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 97c2b22..c0d6686 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -94,4 +94,4 @@ fi
 
 AC_SUBST(TARGETS)
 
-AC_OUTPUT( Makefile.settings)
+AC_OUTPUT( Makefile.settings build/catalog.xml)
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index e22808c..9657691 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -27,7 +27,7 @@
  <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
 </tr>
 <tr>
- <td valign="top"><a href="manpages/index.html">Man pages</a></td>
+ <td valign="top"><a href="manpages-3/index.html">Man pages</a></td>
  <td valign="top">The Samba man pages in HTML.</td>
 </tr>
 <tr>
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index d1301fc..7d529ab 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -183,8 +183,7 @@
 		  <varlistentry>
 		  <term>Full-Username</term>
                 <listitem><para>The fully qualified username, expected to be in
-                Samba's <smbconfoption><name>unix
-                charset</name></smbconfoption> and qualified with the
+                Samba's <smbconfoption name="unix charset"/> and qualified with the
                 <smbconfoption name="winbind separator"/>.
                 </para>
 
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 7e3948c..4af8817 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -225,9 +225,7 @@ hosts:		files wins
 	determine which user and group ids correspond to Windows NT user
 	and group rids. </para>
 
-        <para>See the <smbconfoption><name>idmap
-        domains</name></smbconfoption> or the old <smbconfoption><name>idmap
-	backend</name></smbconfoption> parameters in
+        <para>See the <smbconfoption name="idmap domains"/> or the old <smbconfoption name="idmap backend"/> parameters in
         <filename>smb.conf</filename> for options for sharing this
         database, such as via LDAP.</para>
 </refsect1>
@@ -374,8 +372,7 @@ auth  required    /lib/security/pam_unix.so \
 	<para>If more than one UNIX machine is running <command>winbindd</command>,
 	then in general the user and groups ids allocated by winbindd will not
 	be the same.  The user and group ids will only be valid for the local
-	machine, unless a shared <smbconfoption><name>idmap
-	backend</name></smbconfoption> is configured.</para>
+	machine, unless a shared <smbconfoption name="idmap backend"/> is configured.</para>
 
 	<para>If the the Windows NT SID to UNIX user and group id mapping
 	file is damaged or destroyed then the mappings will be lost. </para>
diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
index 262830d..68b2abe 100755
--- a/docs-xml/smbdotconf/generate-file-list.sh
+++ b/docs-xml/smbdotconf/generate-file-list.sh
@@ -8,12 +8,12 @@ fi
 OLD=`pwd`
 cd $DIR
 
-echo "<variablelist xmlns:xi=\"http://www.w3.org/2003/XInclude\">"
+echo "<section xmlns:xi=\"http://www.w3.org/2003/XInclude\">"
 for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs`
 do 
 	echo "<xi:include href='$I' parse='xml'/>"
 done
                 
-echo "</variablelist>"
+echo "</section>"
 
 cd $OLD
diff --git a/docs-xml/xslt/expand-sambadoc.xsl b/docs-xml/xslt/expand-sambadoc.xsl
index 5b539df..2b88149 100644
--- a/docs-xml/xslt/expand-sambadoc.xsl
+++ b/docs-xml/xslt/expand-sambadoc.xsl
@@ -7,6 +7,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
+        xmlns:xlink='http://www.w3.org/1999/xlink'
 	version="1.1">
 
 	<xsl:output method="xml" encoding="UTF-8" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN" indent="yes" doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
@@ -21,7 +22,7 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template name="smbconfoption">
+	<xsl:template name="xsmbconfoption">
 		<xsl:param name="name"/>
 		<xsl:param name="content"/>
 		<xsl:variable name="linkcontent">
@@ -45,10 +46,12 @@
 				<xsl:value-of select="$linkcontent"/>
 			</xsl:when>
 			<xsl:otherwise>
+				<xsl:variable name="newid"><xsl:value-of select="translate(translate(string($name),' ',''),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:variable>
 				<xsl:element name="link">
 					<xsl:attribute name="linkend">
-						<xsl:value-of select="translate(translate(string($name),' ',''),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+						<xsl:value-of select="$newid"/>
 					</xsl:attribute>
+					<xsl:attribute name="xlink:href">smb.conf.5.html#<xsl:value-of select="$newid"/></xsl:attribute>
 					<xsl:value-of select="$linkcontent"/>
 				</xsl:element>
 			</xsl:otherwise>
@@ -58,7 +61,7 @@
 	<xsl:template match="related">
 		<xsl:element name="para">
 			<xsl:text>Related command: </xsl:text>
-			<xsl:call-template name="smbconfoption">
+			<xsl:call-template name="xsmbconfoption">
 				<xsl:with-param name="name" select="text()"/>
 			</xsl:call-template>
 		</xsl:element>
@@ -100,9 +103,9 @@
 	</xsl:template>
 
 	<xsl:template match="smbconfoption">
-		<xsl:call-template name="smbconfoption">
+		<xsl:call-template name="xsmbconfoption">
 			<xsl:with-param name="name" select="@name"/>
-			<xsl:with-param name="content"><xsl:copy-of select="text()"/></xsl:with-param>
+			<xsl:with-param name="content" select="text()"/>
 		</xsl:call-template>
 	</xsl:template>
 
diff --git a/docs-xml/xslt/expand-smbconfdoc.xsl b/docs-xml/xslt/expand-smbconfdoc.xsl
index 5472d61..3e3dbe1 100644
--- a/docs-xml/xslt/expand-smbconfdoc.xsl
+++ b/docs-xml/xslt/expand-smbconfdoc.xsl
@@ -53,11 +53,11 @@
 		</xsl:variable>
 
 		<xsl:variable name="term">
-			<xsl:element name="indexterm">
 				<xsl:copy-of select="$anchor"/>
-				<xsl:value-of select="@name"/>
-				<xsl:value-of select="$context"/>
-			</xsl:element>
+				<xsl:element name="title">
+					<xsl:value-of select="@name"/>
+					<xsl:value-of select="$context"/>
+				</xsl:element>
 		</xsl:variable>
 
 
@@ -120,8 +120,7 @@
 		</xsl:variable>
 
 		<xsl:for-each select="synonym">
-			<xsl:element name="varlistentry">
-				<xsl:text>&#10;</xsl:text>     
+			<xsl:element name="section">
 				<xsl:element name="indexterm">
 					<xsl:attribute name="significance">
 						<xsl:text>preferred</xsl:text>
@@ -133,7 +132,7 @@
 						<xsl:value-of select="$name"/>
 					</xsl:element>
 				</xsl:element>
-				<xsl:element name="term">
+				<xsl:element name="title">
 					<xsl:element name="anchor">
 						<xsl:attribute name="id">
 							<xsl:value-of select="translate(translate(string(.),' ',''), 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
@@ -141,28 +140,46 @@
 					</xsl:element>
 					<xsl:value-of select="."/>
 				</xsl:element>
-				<xsl:element name="listitem">
-					<xsl:element name="para"><xsl:text>This parameter is a synonym for </xsl:text><xsl:copy-of select="$name"/><xsl:text>.</xsl:text></xsl:element>
+				<xsl:element name="variablelist">
+					<xsl:element name="varlistentry">
+						<xsl:element name="listitem">
+							<xsl:element name="para">
+								<xsl:text>This parameter is a synonym for </xsl:text>
+								<xsl:element name="link">
+									<xsl:attribute name="linkend">
+										<xsl:value-of select="translate(translate(string($name),' ',''), 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+									</xsl:attribute>
+									<xsl:value-of select="$name"/>
+								</xsl:element>
+								<xsl:text>.</xsl:text>
+							</xsl:element>
+						</xsl:element>
+					</xsl:element>
 				</xsl:element>
+				<xsl:text>&#10;</xsl:text>     
 			</xsl:element>
 		</xsl:for-each>
 
-		<xsl:element name="varlistentry">
-			<xsl:text>&#10;</xsl:text>     
-			<xsl:element name="indexterm">
-				<xsl:attribute name="significance">
-					<xsl:text>preferred</xsl:text>
-				</xsl:attribute>
-				<xsl:element name="primary">
-					<xsl:value-of select="@name"/>
+		<xsl:element name="section">
+					<xsl:element name="indexterm">
+						<xsl:attribute name="significance">
+							<xsl:text>preferred</xsl:text>
+						</xsl:attribute>
+						<xsl:element name="primary">
+						<xsl:value-of select="@name"/>
+						</xsl:element>
+					</xsl:element>
+					<xsl:copy-of select="$term"/>
+			<xsl:element name="variablelist">
+				<xsl:element name="varlistentry">
+					<xsl:element name="listitem">
+						<xsl:copy-of select="$content"/> <xsl:text>&#10;</xsl:text>
+						<xsl:copy-of select="$default"/> <xsl:text>&#10;</xsl:text>
+						<xsl:copy-of select="$examples"/> <xsl:text>&#10;</xsl:text>
+					</xsl:element>
 				</xsl:element>
 			</xsl:element>
-			<xsl:copy-of select="$term"/>
-			<xsl:element name="listitem">
-				<xsl:copy-of select="$content"/> <xsl:text>&#10;</xsl:text>
-				<xsl:copy-of select="$default"/> <xsl:text>&#10;</xsl:text>
-				<xsl:copy-of select="$examples"/> <xsl:text>&#10;</xsl:text>
-			</xsl:element>
+			<xsl:text>&#10;</xsl:text>
 		</xsl:element>
 	</xsl:template>
 </xsl:stylesheet>
diff --git a/docs-xml/xslt/html-common.xsl b/docs-xml/xslt/html-common.xsl
index b584214..d2609d5 100644
--- a/docs-xml/xslt/html-common.xsl
+++ b/docs-xml/xslt/html-common.xsl
@@ -10,7 +10,7 @@
 <xsl:param name="bridgehead.in.toc" select="1"/>
 <xsl:param name="citerefentry.link" select="'1'"/>
 <xsl:param name="css.decoration" select="1"/>
-<xsl:param name="html.stylesheet" select="'samba.css'"/>
+<xsl:param name="html.stylesheet" select="'../samba.css'"/>
 <xsl:param name="html.stylesheet.type">text/css</xsl:param>
 <xsl:param name="use.extensions" select="'0'"/>
 <xsl:param name="use.id.as.filename" select="'1'"/>
diff --git a/docs-xml/xslt/man.xsl b/docs-xml/xslt/man.xsl
index 99b2112..e259004 100644
--- a/docs-xml/xslt/man.xsl
+++ b/docs-xml/xslt/man.xsl
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <!-- vim:set sts=2 shiftwidth=2 syntax=xml: -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	        xmlns:xlink='http://www.w3.org/1999/xlink'
                 version='1.0'>
 
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
@@ -8,6 +9,7 @@
 <xsl:param name="chunk.section.depth" select="0"/>
 <xsl:param name="chunk.first.sections" select="1"/>
 <xsl:param name="use.id.as.filename" select="1"/>
+<xsl:param name="man.endnotes.are.numbered" select="0"/>
 
 <!-- 
     Our ulink stylesheet omits @url part if content was specified


-- 
Samba Shared Repository


More information about the samba-cvs mailing list