sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

Add some updates necessary to build the 3.0 docs (forgot them last night).

Browse Source
This commit is contained in:
Jelmer Vernooij -
parent 13636235af
commit 72434db17a
7 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/docbook/Makefile.in
View File

@ -126,18 +126,18 @@ $(TXTDIR)/%.txt: %.xml
# Adobe PDF files
$(PDFDIR)/%.pdf: %.tex
$(PDFLATEX) $<
$(PDFLATEX) $<
$(PDFLATEX) $<
-$(PDFLATEX) $<
-$(PDFLATEX) $<
-$(PDFLATEX) $<
mv $(patsubst %.tex,%.pdf,$<) $@
epsimages: $(PROJDOC_IMAGES_EPS)
# DVI files
$(DVIDIR)/%.dvi: %.tex epsimages
$(LATEX) $<
$(LATEX) $<
$(LATEX) $<
-$(LATEX) $<
-$(LATEX) $<
-$(LATEX) $<
mv $(patsubst %.tex,%.dvi,$<) $@
%.eps: %.png

8
docs/docbook/projdoc/AccessControls.xml
View File

@ -346,7 +346,7 @@ drwsrwsrwx 2 maryo gnomes 48 2003-05-12 22:29 muchado08
</para>
<para>
An overview of the permissions field can be found in <link linkend="access1"/>.
An overview of the permissions field can be found in <link linkend="access1">the image below</link>.
</para>
<image id="access1" scale="40"><imagedescription>Overview of UNIX permissions field.</imagedescription><imagefile>access1</imagefile></image>
@ -429,7 +429,7 @@ Before using any of the following options, please refer to the man page for &smb
</para>
<para>
<link linkend="ugbc"/> enumerates these controls.
<link linkend="ugbc">The table below</link> enumerates these controls.
</para>
<table frame='all' pgwide='0' id="ugbc"><title>User and Group Based Controls</title>
@ -527,7 +527,7 @@ Before using any of the following options, please refer to the man page for &smb
</para>
<para>
Refer to <link linkend="fdpbc"/> for information regarding the parameters that may be used to affect file and
Refer to <link linkend="fdpbc">the table below</link> for information regarding the parameters that may be used to affect file and
directory permission-based access controls.
</para>
@ -619,7 +619,7 @@ Before using any of the following options, please refer to the man page for &smb
<para>
The following are documented because of the prevalence of administrators creating inadvertent barriers to file
access by not understanding the full implications of &smb.conf; file settings. See <link linkend="mcoc"/>.
access by not understanding the full implications of &smb.conf; file settings. See <link linkend="mcoc">the table below</link>.
</para>
<table frame='all' id="mcoc"><title>Other Controls</title>

2
docs/docbook/projdoc/Bugs.xml
View File

@ -55,7 +55,7 @@ file for correct syntax.
</para>
<para>
Have you looked through <link linkend="diagnosis"/>? This is extremely important.
Have you looked through <link linkend="diagnosis">diagnosis</link>? This is extremely important.
</para>
<para>

16
docs/docbook/projdoc/CUPS-printing.xml
View File

@ -151,7 +151,7 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
<title>Simple &smb.conf; Settings for CUPS</title>
<para>
To summarize, <link linkend="cups-exam-simple"/> shows simplest printing-related setup for &smb.conf; to enable basic CUPS support:
To summarize, <link linkend="cups-exam-simple">the example below</link> shows simplest printing-related setup for &smb.conf; to enable basic CUPS support:
</para>
<para><smbconfexample id="cups-exam-simple">
@ -195,7 +195,7 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
<title>More Complex CUPS &smb.conf; Settings</title>
<para>
<link linkend="overridesettings"/> is a slightly more complex printing-related setup
<link linkend="overridesettings">The example below</link> is a slightly more complex printing-related setup
for &smb.conf;. It enables general CUPS printing
support for all printers, but defines one printer share, which is set
up differently.
@ -1232,7 +1232,7 @@ that generates PostScript from image formats. The <parameter>imagetoraster</para
filter is used to convert directly from image to raster, without the
intermediate PostScript stage. It is used more often than the above
mentioned pre-filters. A summarizing flowchart of image file
filtering is shown in <link linkend="small8"/>.
filtering is shown in <link linkend="small8">the figure below</link>.
</para>
<para>
@ -1656,7 +1656,7 @@ output device.
CUPS by default ships only a few generic PPDs, but they are good for
several hundred printer models. You may not be able to control
different paper trays, or you may get larger margins than your
specific model supports. See <link linkend="cups-ppds"/> for summary information.
specific model supports. See <link linkend="cups-ppds">the figure below</link> for summary information.
</para>
<table frame="all" id="cups-ppds">
@ -1773,7 +1773,7 @@ installation. Therefore the printfile bypasses the <parameter>pstoraster</parame
(and also bypasses the CUPS-raster-drivers
<parameter>rastertosomething</parameter>). After Ghostscript finished its rasterization,
<parameter>cupsomatic</parameter> hands the rendered file directly to the CUPS backend. The
flowchart in <link linkend="cupsomatic-dia"/> illustrates the difference between native CUPS
flowchart in <link linkend="cupsomatic-dia">the image below</link> illustrates the difference between native CUPS
rendering and the <parameter>Foomatic/cupsomatic</parameter> method.
</para>
</sect2>
@ -1817,7 +1817,7 @@ backend, which transfers the job to the printers.</para></listitem>
</itemizedlist>
<para>
The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket"/>.
The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket">the figure below</link>.
</para>
<image id="pdftosocket"><imagefile>pdftosocket</imagefile><imagedescription>PDF to socket chain.</imagedescription></image>
@ -1866,7 +1866,7 @@ which transfers the job to the printers.</para></listitem>
</itemizedlist>
<para>
The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb"/>.
The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb">the figure below</link>.
</para>
<image id="pdftoepsonusb"><imagefile>pdftoepsonusb</imagefile><imagedescription>PDF to USB chain.</imagedescription></image>
@ -1994,7 +1994,7 @@ output.</para></listitem>
</itemizedlist>
<para>
Both print paths are shown in the flowcharts in <link linkend="small11"/> and <link linkend="small12"/>.
Both print paths are shown in the flowcharts in the figures below.
</para>
</sect2>

7
docs/docbook/xslt/expand-sambadoc.xsl
View File

@ -301,4 +301,11 @@
</xsl:template>
<xsl:template match="filterline">
<xsl:element name="programlisting">
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
</xsl:stylesheet>

34
docs/docbook/xslt/html-common.xsl
View File

@ -3,6 +3,40 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:template match="ulink">
<xsl:element name="ulink">
<xsl:attribute name="url">
<xsl:value-of select="@url"/>
</xsl:attribute>
<xsl:choose>
<xsl:when test=". != ''">
<xsl:value-of select="."/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@url"/>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
</xsl:template>
<xsl:template match="link">
<xsl:element name="link">
<xsl:attribute name="linkend">
<xsl:value-of select="@linkend"/>
</xsl:attribute>
<xsl:choose>
<xsl:when test=". != ''">
<xsl:value-of select="."/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@linkend"/>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
</xsl:template>
<xsl:param name="base.dir" select="'../htmldocs/'"/>
<xsl:param name="bridgehead.in.toc" select="1"/>
<xsl:param name="citerefentry.link" select="'1'"/>

1
docs/docbook/xslt/html.xsl
View File

@ -6,4 +6,5 @@
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
<xsl:import href="html-common.xsl"/>
</xsl:stylesheet>