summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/Samba-HOWTO-Collection/CUPS-printing.xml26
-rw-r--r--docs/Samba-HOWTO-Collection/NetworkBrowsing.xml2
-rw-r--r--docs/Samba-HOWTO-Collection/Passdb.xml4
-rw-r--r--docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml2
-rw-r--r--docs/xslt/expand-sambadoc.xsl36
5 files changed, 51 insertions, 19 deletions
diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
index 6dd4d0418d..695e486d86 100644
--- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml
+++ b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
@@ -1717,7 +1717,7 @@ specific model supports. See <link linkend="cups-ppds">PPDs shipped with CUPS</l
<title>PPDs shipped with CUPS</title>
<tgroup cols="2" align="left">
<colspec align="left"/>
- <colspec align="justify" width="1*"/>
+ <colspec align="justify" colwidth="1*"/>
<thead><row><entry>PPD file</entry><entry>Printer type</entry></row></thead>
<tbody>
<row><entry>deskjet.ppd</entry><entry>older HP inkjet printers and compatible</entry></row>
@@ -2585,9 +2585,9 @@ the Windows NT/2000/XP client.
<para>
<itemizedlist>
- <listitem>cups.hlp</listitem>
- <listitem>cupsdrvr.dll</listitem>
- <listitem>cupsui.dll</listitem>
+ <listitem><para>cups.hlp</para></listitem>
+ <listitem><para>cupsdrvr.dll</para></listitem>
+ <listitem><para>cupsui.dll</para></listitem>
</itemizedlist>
</para>
@@ -2601,12 +2601,12 @@ different platforms.
<para>
<itemizedlist>
- <listitem>ADFONTS.MFM</listitem>
- <listitem>ADOBEPS4.DRV</listitem>
- <listitem>ADOBEPS4.HLP</listitem>
- <listitem>DEFPRTR2.PPD</listitem>
- <listitem>ICONLIB.DLL</listitem>
- <listitem>PSMON.DLL</listitem>
+ <listitem><para>ADFONTS.MFM</para></listitem>
+ <listitem><para>ADOBEPS4.DRV</para></listitem>
+ <listitem><para>ADOBEPS4.HLP</para></listitem>
+ <listitem><para>DEFPRTR2.PPD</para></listitem>
+ <listitem><para>ICONLIB.DLL</para></listitem>
+ <listitem><para>PSMON.DLL</para></listitem>
</itemizedlist>
</para>
@@ -2614,9 +2614,9 @@ different platforms.
<para>
<itemizedlist>
- <listitem>ADOBEPS5.DLL</listitem>
- <listitem>ADOBEPSU.DLL</listitem>
- <listitem>ADOBEPSU.HLP</listitem>
+ <listitem><para>ADOBEPS5.DLL</para></listitem>
+ <listitem><para>ADOBEPSU.DLL</para></listitem>
+ <listitem><para>ADOBEPSU.HLP</para></listitem>
</itemizedlist>
</para>
diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
index 9b93c8a434..ceee0becd9 100644
--- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
@@ -1559,7 +1559,7 @@ as shown in <link linkend="brsex3">example below</link>.
<tgroup cols="3" align="left">
<colspec align="left"/>
<colspec align="left"/>
- <colspec align="justify" width="1*"/>
+ <colspec align="justify" colwidth="1*"/>
<thead>
<row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
index 0b81674489..62edfb16ff 100644
--- a/docs/Samba-HOWTO-Collection/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/Passdb.xml
@@ -1413,8 +1413,8 @@ access to attrs=SambaLMPassword,SambaNTPassword
<table iframe="all" id="ldappwsync">
<title>Possible <emphasis>ldap passwd sync</emphasis> values</title>
<tgroup cols="2">
- <colspec align="left" width="1*"/>
- <colspec align="justify" width="4*"/>
+ <colspec align="left" colwidth="1*"/>
+ <colspec align="justify" colwidth="4*"/>
<thead>
<row><entry align="left">Value</entry><entry align="center">Description</entry></row>
</thead>
diff --git a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
index 8c8b023981..b238038858 100644
--- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
+++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
@@ -332,7 +332,7 @@ complete descriptions of new or modified parameters.
<table frame='all' id="tdbfiledesc"><title>TDB File Descriptions</title>
<tgroup cols='3'>
<colspec align="left"/>
- <colspec align="justify" width="1*"/>
+ <colspec align="justify" colwidth="1*"/>
<colspec align="left"/>
<thead>
<row>
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index ca57e7fec8..2832111fa5 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -249,6 +249,10 @@
<xsl:value-of select="@scale"/>
</xsl:when>
+ <xsl:when test="imagefile/@scale != ''">
+ <xsl:value-of select="imagefile/@scale"/>
+ </xsl:when>
+
<xsl:otherwise>
<xsl:text>50</xsl:text>
</xsl:otherwise>
@@ -262,7 +266,21 @@
<xsl:element name="imagedata">
<xsl:attribute name="fileref">
<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
- <xsl:attribute name="scale"><xsl:text>50</xsl:text></xsl:attribute>
+ <xsl:attribute name="scale">
+ <xsl:choose>
+ <xsl:when test="@scale != ''">
+ <xsl:value-of select="@scale"/>
+ </xsl:when>
+
+ <xsl:when test="imagefile/@scale != ''">
+ <xsl:value-of select="imagefile/@scale"/>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:text>50</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
<xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
</xsl:element>
</xsl:element>
@@ -270,7 +288,21 @@
<xsl:element name="imagedata">
<xsl:attribute name="fileref">
<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
- <xsl:attribute name="scale"><xsl:text>50</xsl:text></xsl:attribute>
+ <xsl:attribute name="scale">
+ <xsl:choose>
+ <xsl:when test="@scale != ''">
+ <xsl:value-of select="@scale"/>
+ </xsl:when>
+
+ <xsl:when test="imagefile/@scale != ''">
+ <xsl:value-of select="imagefile/@scale"/>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:text>50</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
<xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
</xsl:element>
</xsl:element>
generated by cgit (git 2.34.1) at 2024-11-11 18:08:59 +0000