[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1179-gce623c0

Michael Adam obnox at samba.org
Fri May 16 10:47:28 GMT 2008


The branch, v3-0-test has been updated
       via  ce623c0736388838cbb739e483e561316af77834 (commit)
       via  ec101cf6cf289d338477e78f4814a368cef8b2cc (commit)
       via  32b81133c701bbbfd7c017c8c69401bb2174d5d1 (commit)
       via  3551299a5f37770da24d0043ce278660ce8ae38f (commit)
       via  95e4168f3749fff3fa211643372053541df1ae68 (commit)
      from  b8f0f5ef3d92275c180b8c2043dd92c440b3ade6 (commit)

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


- Log -----------------------------------------------------------------
commit ce623c0736388838cbb739e483e561316af77834
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 25 14:08:10 2008 +0200

    docs: fix the manpage output of parameters list in smb.conf.5.
    
    There were some newlines missing in the template for samba:parameters.
    
    Michael
    (cherry picked from commit a47abfa9276765164870bd7541798ff1201379b1)

commit ec101cf6cf289d338477e78f4814a368cef8b2cc
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 25 14:01:57 2008 +0200

    docs: fix indentation in expand-smbxonfdoc.
    
    Michael
    (cherry picked from commit 79f53a06820b226cbfbc939ae9a6d255e4a4a2d1)

commit 32b81133c701bbbfd7c017c8c69401bb2174d5d1
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 3551299a5f37770da24d0043ce278660ce8ae38f
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)

commit 95e4168f3749fff3fa211643372053541df1ae68
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 16 12:19:35 2008 +0200

    Revert "docs: fix the manpage output of parameters list in smb.conf.5."
    
    This reverts commit 36322154332f9036d4259c5397eecb2c752fdfb1.

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

Summary of changes:
 docs-xml/{.bzrignore => .gitignore} |    0 
 docs-xml/Makefile                   |    2 +-
 docs-xml/configure.ac               |    2 +-
 docs-xml/xslt/expand-smbconfdoc.xsl |   18 +++++++++---------
 4 files changed, 11 insertions(+), 11 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 5bdde51..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
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/xslt/expand-smbconfdoc.xsl b/docs-xml/xslt/expand-smbconfdoc.xsl
index 8bb74d2..5b2de1c 100644
--- a/docs-xml/xslt/expand-smbconfdoc.xsl
+++ b/docs-xml/xslt/expand-smbconfdoc.xsl
@@ -164,15 +164,15 @@
 		</xsl:for-each>
 
 		<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="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">


-- 
Samba Shared Repository


More information about the samba-cvs mailing list