Author: jelmer Date: 2004-09-05 16:14:06 +0000 (Sun, 05 Sep 2004) New Revision: 216
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=216&nolog=1 Log: - Respect the scale= attribute. - Better conformance to the DocBook specs Modified: trunk/Samba-HOWTO-Collection/CUPS-printing.xml trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml trunk/Samba-HOWTO-Collection/Passdb.xml trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml trunk/xslt/expand-sambadoc.xsl Changeset: Modified: trunk/Samba-HOWTO-Collection/CUPS-printing.xml =================================================================== --- trunk/Samba-HOWTO-Collection/CUPS-printing.xml 2004-09-05 14:46:49 UTC (rev 215) +++ trunk/Samba-HOWTO-Collection/CUPS-printing.xml 2004-09-05 16:14:06 UTC (rev 216) @@ -1717,7 +1717,7 @@ <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 @@ <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 @@ <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 @@ <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> Modified: trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml =================================================================== --- trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml 2004-09-05 14:46:49 UTC (rev 215) +++ trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml 2004-09-05 16:14:06 UTC (rev 216) @@ -1559,7 +1559,7 @@ <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> Modified: trunk/Samba-HOWTO-Collection/Passdb.xml =================================================================== --- trunk/Samba-HOWTO-Collection/Passdb.xml 2004-09-05 14:46:49 UTC (rev 215) +++ trunk/Samba-HOWTO-Collection/Passdb.xml 2004-09-05 16:14:06 UTC (rev 216) @@ -1413,8 +1413,8 @@ <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> Modified: trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml =================================================================== --- trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml 2004-09-05 14:46:49 UTC (rev 215) +++ trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml 2004-09-05 16:14:06 UTC (rev 216) @@ -332,7 +332,7 @@ <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> Modified: trunk/xslt/expand-sambadoc.xsl =================================================================== --- trunk/xslt/expand-sambadoc.xsl 2004-09-05 14:46:49 UTC (rev 215) +++ trunk/xslt/expand-sambadoc.xsl 2004-09-05 16:14:06 UTC (rev 216) @@ -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>
