diff options
Diffstat (limited to 'docs')
26 files changed, 213 insertions, 170 deletions
diff --git a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml index 3904fd1708..72892f3806 100644 --- a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml +++ b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml @@ -55,9 +55,9 @@ on <application>Windows 9x/Me</application> systems. The tools set includes: </para> <itemizedlist> - <listitem>Server Manager</listitem> - <listitem>User Manager for Domains</listitem> - <listitem>Event Viewer</listitem> + <listitem><para>Server Manager</para></listitem> + <listitem><para>User Manager for Domains</para></listitem> + <listitem><para>Event Viewer</para></listitem> </itemizedlist> <para> @@ -221,12 +221,12 @@ There are several opportunities for creating a custom network startup configurat </para> <itemizedlist> - <listitem>No Logon Script.</listitem> - <listitem>Simple universal Logon Script that applies to all users.</listitem> - <listitem>Use of a conditional Logon Script that applies per user or per group attributes.</listitem> - <listitem>Use of Samba's preexec and postexec functions on access to the NETLOGON share to create - a custom logon script and then execute it.</listitem> - <listitem>User of a tool such as KixStart.</listitem> + <listitem><para>No Logon Script.</para></listitem> + <listitem><para>Simple universal Logon Script that applies to all users.</para></listitem> + <listitem><para>Use of a conditional Logon Script that applies per user or per group attributes.</para></listitem> + <listitem><para>Use of Samba's preexec and postexec functions on access to the NETLOGON share to create + a custom logon script and then execute it.</para></listitem> + <listitem><para>User of a tool such as KixStart.</para></listitem> </itemizedlist> <para> @@ -327,8 +327,8 @@ Those wishing to use more elaborate or capable logon processing system should ch </para> <itemizedlist> - <listitem><ulink noescape="1" url="http://www.craigelachie.org/rhacer/ntlogon">http://www.craigelachie.org/rhacer/ntlogon</ulink></listitem> - <listitem><ulink noescape="1" url="http://www.kixtart.org">http://www.kixtart.org</ulink></listitem> + <listitem><para><ulink noescape="1" url="http://www.craigelachie.org/rhacer/ntlogon">http://www.craigelachie.org/rhacer/ntlogon</ulink></para></listitem> + <listitem><para><ulink noescape="1" url="http://www.kixtart.org">http://www.kixtart.org</ulink></para></listitem> </itemizedlist> <sect2> diff --git a/docs/Samba-HOWTO-Collection/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml index 4fe03c983b..ae4354f5d6 100644 --- a/docs/Samba-HOWTO-Collection/Bugs.xml +++ b/docs/Samba-HOWTO-Collection/Bugs.xml @@ -151,7 +151,7 @@ prepared for a large volume of log data. <tbody> <row><entry>all</entry><entry>passdb</entry></row> <row><entry>tdb</entry><entry>sam</entry></row> - <row><entry>printdrivers</entry>auth<entry></entry></row> + <row><entry>printdrivers</entry><entry>auth</entry></row> <row><entry>lanman</entry><entry>winbind</entry></row> <row><entry>smb</entry><entry>vfs</entry></row> <row><entry>rpc_parse</entry><entry>idmap</entry></row> diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml index 21784ef2d6..145422fe7e 100644 --- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml +++ b/docs/Samba-HOWTO-Collection/CUPS-printing.xml @@ -414,9 +414,9 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) In <filename>/etc/cups/mime.types</filename>, make sure this line is present: - <filterline> + <programlisting> application/octet-stream - </filterline> + </programlisting> <indexterm><primary>/etc/cups/mime.convs</primary></indexterm> <indexterm><primary>/etc/cups/mime.types</primary></indexterm> @@ -426,9 +426,9 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <indexterm><primary>application/vnd.cups-raw</primary></indexterm> - <filterline> + <programlisting> application/octet-stream application/vnd.cups-raw 0 - - </filterline> + </programlisting> If these two files are not set up correctly for raw Windows client printing, you may encounter the dreaded <computeroutput>Unable to @@ -639,7 +639,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <para> - <image><imagedescription>Windows printing to a local printer.</imagedescription><imagefile>1small</imagefile></image> + <image> + <imagedescription>Windows printing to a local printer.</imagedescription> + <imagefile>1small</imagefile> + </image> </para> </sect2> @@ -732,8 +735,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) </note> <para> - <image><imagedescription>Printing to a PostScript printer.</imagedescription> - <imagefile>2small</imagefile></image> + <image> + <imagedescription>Printing to a PostScript printer.</imagedescription> + <imagefile>2small</imagefile> + </image> </para> @@ -973,9 +978,9 @@ for <filename>mime.types</filename> and in the comments section of the like this: <indexterm><primary>application/pdf</primary></indexterm> -<filterline> +<programlisting> application/pdf pdf string(0,%PDF) -</filterline> +</programlisting> This means if a filename has either a <filename>.pdf</filename> suffix or if the magic @@ -984,9 +989,9 @@ beginning of the file itself (offset 0 from the start), then it is a PDF file (<parameter>application/pdf</parameter>). Another rule is this: -<filterline> +<programlisting> application/postscript ai eps ps string(0,%!) string(0,<04>%!) -</filterline> +</programlisting> If the filename has one of the suffixes <filename>.ai</filename>, <filename>.eps</filename>, @@ -1040,9 +1045,9 @@ conversion filter that can produce the output from the input type and virtual costs associated with this conversion. One example line reads like this: -<filterline> +<programlisting> application/pdf application/postscript 33 pdftops -</filterline> +</programlisting> This means that the <parameter>pdftops</parameter> filter will take <parameter>application/pdf</parameter> as input and produce @@ -1052,27 +1057,27 @@ expensive, costing 66 CUPS-$: <indexterm><primary>pdf</primary></indexterm> -<filterline> +<programlisting> application/vnd.hp-HPGL application/postscript 66 hpgltops -</filterline> +</programlisting> This is the <parameter>hpgltops</parameter>, which processes HP-GL plotter files to PostScript. <indexterm><primary>application/octet-stream</primary></indexterm> -<filterline> +<programlisting> application/octet-stream -</filterline> +</programlisting> Here are two more examples: <indexterm><primary>text/plain</primary></indexterm> -<filterline> +<programlisting> application/x-shell application/postscript 33 texttops text/plain application/postscript 33 texttops -</filterline> +</programlisting> The last two examples name the <parameter>texttops</parameter> filter to work on <parameter>text/plain</parameter> as well as on <parameter>application/x-shell</parameter>. (Hint: @@ -1172,9 +1177,10 @@ print options already embedded into the file. </para> <para> - <image scale="25"><imagedescription>Pre-filtering in CUPS to form PostScript.</imagedescription> - <imagefile>4small</imagefile> -</image> + <image> + <imagedescription>Pre-filtering in CUPS to form PostScript.</imagedescription> + <imagefile scale="25">4small</imagefile> + </image> </para> </sect2> @@ -1191,8 +1197,8 @@ stapling and punching it, and so on) into the PostScript file. </para> <para> - <image scale="25"><imagedescription>Adding device-specific print options.</imagedescription> - <imagefile>5small</imagefile> + <image><imagedescription>Adding device-specific print options.</imagedescription> + <imagefile scale="25">5small</imagefile> </image> </para> @@ -1232,7 +1238,10 @@ that are able to generate device-specific printer data. </para> <para> - <image scale="25"><imagedescription>PostScript to intermediate raster format.</imagedescription><imagefile>6small</imagefile></image> + <image> + <imagedescription>PostScript to intermediate raster format.</imagedescription> + <imagefile scale="25">6small</imagefile> + </image> </para> <para> @@ -1249,7 +1258,8 @@ than one vendor financing the development of CUPS raster drivers). </para> <para> - <image><imagedescription>CUPS-raster production using Ghostscript.</imagedescription> + <image> + <imagedescription>CUPS-raster production using Ghostscript.</imagedescription> <imagefile>7small</imagefile> </image> </para> @@ -1285,7 +1295,8 @@ filtering on <link linkend="small8">next picture</link>. </para> <para> - <image id="small8"><imagedescription>Image format to CUPS-raster format conversion.</imagedescription> + <image id="small8"> + <imagedescription>Image format to CUPS-raster format conversion.</imagedescription> <imagefile>8small</imagefile> </image> </para> @@ -1310,7 +1321,8 @@ closely as possible with CUPS. </para> <para> - <image id="small9"><imagedescription>Raster to printer-specific formats.</imagedescription> + <image id="small9"> + <imagedescription>Raster to printer-specific formats.</imagedescription> <imagefile>9small</imagefile> </image> </para> @@ -1468,9 +1480,9 @@ Printer & Driver Database at Linuxprinting.org. You can recognize these PPDs from the line calling the <parameter>cupsomatic</parameter> filter: -<filterline> +<programlisting> *cupsFilter: "application/vnd.cups-postscript 0 cupsomatic" -</filterline> +</programlisting> You may find this line among the first 40 or so lines of the PPD file. If you have such a PPD installed, the printer shows up in the @@ -1491,9 +1503,9 @@ and more powerful successor is now in a stable beta-version: it is called <param <parameter>foomatic-rip</parameter> as a filter with CUPS, you need the new-type PPDs. These have a similar but different line: -<filterline> +<programlisting> *cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" -</filterline> +</programlisting> The PPD generating engine at Linuxprinting.org has been revamped. The new PPDs comply to the Adobe spec. On top, they also provide a @@ -1613,18 +1625,18 @@ make sure this line is present: <indexterm><primary>application/octet-stream</primary></indexterm> -<filterline> +<programlisting> application/octet-stream -</filterline> +</programlisting> This line (with no specific auto-typing rule set) makes all files not otherwise auto-typed a member of <parameter>application/octet-stream</parameter>. In <filename>/etc/cups/mime.convs</filename>, have this line: -<filterline> +<programlisting> application/octet-stream application/vnd.cups-raw 0 - -</filterline> +</programlisting> <indexterm><primary>MIME</primary></indexterm> @@ -1686,9 +1698,9 @@ CUPS. The most important one looks similar to this: <indexterm><primary>application/vnd.cups-raster</primary></indexterm> -<filterline> +<programlisting> *cupsFilter: application/vnd.cups-raster 66 rastertoprinter -</filterline> +</programlisting> It is the last piece in the CUPS filtering puzzle. This line tells the CUPS daemon to use as a last filter <parameter>rastertoprinter</parameter>. This filter @@ -1776,7 +1788,8 @@ advantages) than other methods. </para> <para> - <image id="cupsomatic-dia"><imagedescription>cupsomatic/foomatic Processing versus Native CUPS.</imagedescription> + <image id="cupsomatic-dia"> + <imagedescription>cupsomatic/foomatic Processing versus Native CUPS.</imagedescription> <imagefile>10small</imagefile> </image> </para> @@ -1785,8 +1798,8 @@ advantages) than other methods. One other method is the <parameter>cupsomatic/foomatic-rip</parameter> way. Note that <parameter>cupsomatic</parameter> is <emphasis>not</emphasis> made by the CUPS developers. It is an independent contribution to printing development, -made by people from Linuxprinting.org <footnote>see also <ulink - noescape="1" url="http://www.cups.org/cups-help.html">http://www.cups.org/cups-help.html</ulink></footnote>. +made by people from Linuxprinting.org <footnote><para>see also <ulink +noescape="1" url="http://www.cups.org/cups-help.html">http://www.cups.org/cups-help.html</ulink></para></footnote>. <parameter>cupsomatic</parameter> is no longer developed and maintained and is no longer supported. It has now been replaced by <parameter>foomatic-rip</parameter>. <parameter>foomatic-rip</parameter> is a complete re-write @@ -1867,7 +1880,10 @@ backend, which transfers the job to the printers.</para></listitem> <para> The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket">PDF to socket chain</link>. - <image id="pdftosocket"><imagefile>pdftosocket</imagefile><imagedescription>PDF to socket chain.</imagedescription></image> + <image id="pdftosocket"> + <imagedescription>PDF to socket chain.</imagedescription> + <imagefile>pdftosocket</imagefile> + </image> </para> @@ -1918,7 +1934,10 @@ which transfers the job to the printers.</para></listitem> The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb">this figure</link>. </para> -<image id="pdftoepsonusb"><imagefile>pdftoepsonusb</imagefile><imagedescription>PDF to USB chain.</imagedescription></image> +<image id="pdftoepsonusb"> + <imagedescription>PDF to USB chain.</imagedescription> + <imagefile>pdftoepsonusb</imagefile> +</image> </sect2> <sect2> @@ -2061,7 +2080,8 @@ clients. </para> <para> - <image id="small11"><imagedescription>Print driver execution on the client.</imagedescription> + <image id="small11"> + <imagedescription>Print driver execution on the client.</imagedescription> <imagefile>11small</imagefile> </image> </para> @@ -2087,7 +2107,8 @@ understand. </para> <para> - <image id="small12"><imagedescription>Print driver execution on the server.</imagedescription> + <image id="small12"> + <imagedescription>Print driver execution on the server.</imagedescription> <imagefile>12small</imagefile> </image> </para> @@ -2159,9 +2180,10 @@ simply use <smbconfoption name="printing">sysv</smbconfoption>). </para> <para> -<image><imagedescription>Printing via CUPS/Samba server.</imagedescription> - <imagefile>13small</imagefile> -</image> + <image> + <imagedescription>Printing via CUPS/Samba server.</imagedescription> + <imagefile>13small</imagefile> + </image> </para> </sect2> @@ -3085,7 +3107,8 @@ not intended to, and does not work with, raw queues! </para> <para> - <image id="small14"><imagedescription>cupsaddsmb flowchart.</imagedescription> + <image id="small14"> + <imagedescription>cupsaddsmb flowchart.</imagedescription> <imagefile>14small</imagefile></image> </para> </sect2> @@ -3791,7 +3814,7 @@ back. <para> <indexterm significance="preferred"><primary>point 'n' print</primary></indexterm> <screen> -&dosprompt;<userinput>rundll32 printui.dll,PrintUIEntry /in /n <quote>\\sambaserver\mysmbtstprn</quote></userinput> +&dosprompt;<userinput>rundll32 printui.dll,PrintUIEntry /in /n "\\sambaserver\mysmbtstprn"</userinput> </screen></para> <para> @@ -4831,9 +4854,9 @@ in. cupsomatic bypasses pstoraster, kidnaps the printfile from CUPS away and redirects it to go through Ghostscript. CUPS accepts this, because the associated cupsomatic/foomatic-PPD specifies: -<filterline> +<programlisting> *cupsFilter: "application/vnd.cups-postscript 0 cupsomatic" -</filterline> +</programlisting> This line persuades CUPS to hand the file to cupsomatic, once it has successfully converted it to the MIME type @@ -4848,10 +4871,10 @@ CUPS is widely configurable and flexible, even regarding its filtering mechanism. Another workaround in some situations would be to have in <filename>/etc/cups/mime.types</filename> entries as follows: -<filterline> +<programlisting> application/postscript application/vnd.cups-raw 0 - application/vnd.cups-postscript application/vnd.cups-raw 0 - -</filterline> +</programlisting> This would prevent all PostScript files from being filtered (rather, they will through the virtual <emphasis>nullfilter</emphasis> @@ -4859,9 +4882,9 @@ denoted with <quote>-</quote>). This could only be useful for PS printers. If yo want to print PS code on non-PS printers (provided they support ASCII text printing), an entry as follows could be useful: -<filterline> +<programlisting> */* application/vnd.cups-raw 0 - -</filterline> +</programlisting> and would effectively send <emphasis>all</emphasis> files to the backend without further processing. @@ -4870,10 +4893,10 @@ backend without further processing. <para> You could have the following entry: -<filterline> +<programlisting> application/vnd.cups-postscript application/vnd.cups-raw 0 \ my_PJL_stripping_filter -</filterline> +</programlisting> You will need to write a <parameter>my_PJL_stripping_filter</parameter> (which could be a shell script) that parses the PostScript and removes the @@ -5082,9 +5105,9 @@ for: You can include the required parameters as part of the </para> <itemizedlist> - <listitem><filename>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></listitem> - <listitem><filename>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></listitem> - <listitem><filename>smb://username:password@WINDOWSNETBIOSNAME/printersharename</filename></listitem> + <listitem><para><filename>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></para></listitem> + <listitem><para><filename>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></para></listitem> + <listitem><para><filename>smb://username:password@WINDOWSNETBIOSNAME/printersharename</filename></para></listitem> </itemizedlist> <para> @@ -5108,9 +5131,15 @@ feature of CUPS and you do not necessarily need to have smbd running. The following diagrams reveal how CUPS handles print jobs. </para> -<image id="cups1"><imagefile>cups1</imagefile><imagedescription>Filtering chain 1.</imagedescription></image> +<image id="cups1"> + <imagedescription>Filtering chain 1.</imagedescription> + <imagefile>cups1</imagefile> +</image> -<image id="cups2"><imagefile>cups2</imagefile><imagedescription>Filtering chain with cupsomatic</imagedescription></image> +<image id="cups2"> + <imagedescription>Filtering chain with cupsomatic</imagedescription> + <imagefile>cups2</imagefile> +</image> </sect1> @@ -5411,8 +5440,8 @@ the other way round: <filename>/var/spool/cups/</filename> is set as section). These <parameter>must</parameter> be different. Set <!--FIXME--> <parameter>RequestRoot /var/spool/cups/</parameter> in -<filename>cupsd.conf</filename> and <smbconfoption><name>path</name><value> -/var/spool/samba</value></smbconfoption> in the <smbconfsection>[printers]</smbconfsection> +<filename>cupsd.conf</filename> and <smbconfoption name="path"/> +/var/spool/samba</smbconfoption> in the <smbconfsection>[printers]</smbconfsection> section of &smb.conf;. Otherwise cupsd will sanitize permissions to its spool directory with each restart and printing will not work reliably.</para></sect2> @@ -5453,7 +5482,8 @@ files from the Adobe Web site.</para></sect2> <para>A complete overview of the CUPS printing processes can be found in <link linkend="a_small">the next flowchart</link>.</para> -<image id="a_small"><imagedescription>CUPS printing overview.</imagedescription> +<image id="a_small"> + <imagedescription>CUPS printing overview.</imagedescription> <imagefile>a_small</imagefile> </image> </sect1> diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml index 1523db98a9..0a28ac882d 100644 --- a/docs/Samba-HOWTO-Collection/DomainMember.xml +++ b/docs/Samba-HOWTO-Collection/DomainMember.xml @@ -465,12 +465,12 @@ Server, and so on. </emphasis> </para> -<para><note> +<note><para> When Samba is configured to use an LDAP, or other identity management and/or directory service, it is Samba that continues to perform user and machine authentication. It should be noted that the LDAP server does not perform authentication handling in place of what Samba is designed to do. -</note></para> +</para></note> <para> Please refer to <link linkend="samba-pdc">Domain Control</link>, for more information regarding @@ -945,9 +945,9 @@ be logged in with Kerberos without needing to know a password. If this fails the an encryption type of DES-CBC-MD5? </para> -<para><note> +<note><para> Samba can use both DES-CBC-MD5 encryption as well as ARCFOUR-HMAC-MD5 encoding. -</note></para> +</para></note> </sect2> diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml index 2c20292670..8b8aba656b 100644 --- a/docs/Samba-HOWTO-Collection/FastStart.xml +++ b/docs/Samba-HOWTO-Collection/FastStart.xml @@ -378,6 +378,7 @@ Added user jackb. </sect3> <sect3> + <title>Secure Read-Write File and Print Server</title> <para> @@ -563,13 +564,13 @@ smb: \> <userinput>q</userinput> </para></step> </procedure> - </sect3> + <para> + By now you should be getting the hang of configuration basics. Clearly, it is time to + explore slightly more complex examples. For the remainder of this chapter we will abbreviate + instructions since there are previous examples. + </para> - <para> - By now you should be getting the hang of configuration basics. Clearly, it is time to - explore slightly more complex examples. For the remainder of this chapter we will abbreviate - instructions since there are previous examples. - </para> + </sect3> </sect2> diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index 57b4398769..40d00aba05 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -278,10 +278,10 @@ Aliases, and RIDs are shown in <link linkend="WKURIDS">Well-Known User Default RIDs</link> table. </para> - <para><note> + <note><para> When the <parameter>passdb backend</parameter> uses LDAP (<constant>ldapsam</constant>) it is the administrators' responsibility to create the essential Domain Groups, and to assign each its default RID. - </note></para> + </para></note> <para> It is permissible to create any Domain Group that may be necessary, just make certain that the essential diff --git a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml index eade579a29..cfa808066e 100644 --- a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml +++ b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml @@ -171,7 +171,10 @@ Where a one-way trust has been established between two MS Windows NT4 domains (l DomA and DomB), the following facilities are created: </para> -<image id="trusts1"><imagefile>trusts1</imagefile><imagedescription>Trusts overview.</imagedescription></image> +<image id="trusts1"> + <imagedescription>Trusts overview.</imagedescription> + <imagefile>trusts1</imagefile> +</image> <itemizedlist> <listitem><para> @@ -421,10 +424,10 @@ Browsing from a machine in a trusted Windows 200x Domain to a Windows 200x membe a trusting samba domain, I get the following error: </para> -<formalpara><emphasis> +<screen> The system detected a possible attempt to compromise security. Please ensure that -you can contact the server that authenticated you.</emphasis> -</formalpara> +you can contact the server that authenticated you. +</screen> <para> The event logs on the box I'm trying to connect to have entries regarding group diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml index 59e90bd1b7..977ef2131e 100644 --- a/docs/Samba-HOWTO-Collection/IntroSMB.xml +++ b/docs/Samba-HOWTO-Collection/IntroSMB.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <preface id="IntroSMB"> <chapterinfo> &author.jht; diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml index 0eca02eb5f..8224a73c53 100644 --- a/docs/Samba-HOWTO-Collection/NT4Migration.xml +++ b/docs/Samba-HOWTO-Collection/NT4Migration.xml @@ -302,7 +302,7 @@ generally fit into three basic categories. <link linkend="majtypes">Following ta <table frame="all" id="majtypes"><title>The Three Major Site Types</title> <tgroup cols="2"> <colspec align="left"/> - <colspec align="justify" colspec="1*"/> + <colspec align="justify"/> <thead> <row><entry>Number of Users</entry><entry>Description</entry></row> </thead> diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml index 7f7aff8988..654d246300 100644 --- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml +++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml @@ -1423,7 +1423,10 @@ Samba is capable of cross-subnet browsing when configured correctly. Consider a network set up as in <link linkend="browsing1">Cross-Subnet Browsing Example</link>. </para> -<image id="browsing1" scale="40"><imagedescription>Cross-Subnet Browsing Example.</imagedescription><imagefile>browsing1</imagefile></image> +<image id="browsing1"> + <imagedescription>Cross-Subnet Browsing Example.</imagedescription> + <imagefile scale="40">browsing1</imagefile> +</image> <para> This consists of 3 subnets (1, 2, 3) connected by two routers diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml index 5d3e565f59..663dcc6fd0 100644 --- a/docs/Samba-HOWTO-Collection/Other-Clients.xml +++ b/docs/Samba-HOWTO-Collection/Other-Clients.xml @@ -50,9 +50,9 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) <para>Basically, you need three components:</para> <itemizedlist> - <listitem>The File and Print Client (IBM Peer)</listitem> - <listitem>TCP/IP (Internet support) </listitem> - <listitem>The <quote>NetBIOS over TCP/IP</quote> driver (TCPBEUI)</listitem> + <listitem><para>The File and Print Client (IBM Peer)</para></listitem> + <listitem><para>TCP/IP (Internet support) </para></listitem> + <listitem><para>The <quote>NetBIOS over TCP/IP</quote> driver (TCPBEUI)</para></listitem> </itemizedlist> <para>Installing the first two together with the base operating diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml index 944a4e3c22..29bd6d296e 100644 --- a/docs/Samba-HOWTO-Collection/Passdb.xml +++ b/docs/Samba-HOWTO-Collection/Passdb.xml @@ -94,6 +94,9 @@ as follows: </sect2> +<sect2> +<title>New Backends</title> + <para> Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>tdbsam</secondary></indexterm> @@ -102,9 +105,6 @@ Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>xmlsam</secondary></indexterm> </para> -<sect2> -<title>New Backends</title> - <variablelist> <varlistentry><term>tdbsam</term> <listitem> @@ -231,7 +231,10 @@ Samba-3 introduces a number of new password backend capabilities. </para> - <image scale="50" id="idmap-sid2uid"><imagedescription>IDMAP: Resolution of SIDs to UIDs.</imagedescription><imagefile>idmap-sid2uid</imagefile></image> + <image id="idmap-sid2uid"> + <imagedescription>IDMAP: Resolution of SIDs to UIDs.</imagedescription> + <imagefile scale="50">idmap-sid2uid</imagefile> + </image> <para> <indexterm><primary>SID</primary></indexterm> @@ -240,7 +243,10 @@ Samba-3 introduces a number of new password backend capabilities. <link linkend="idmap-uid2sid">resolution of UIDs to SIDs</link> diagrams. </para> - <image scale="50" id="idmap-uid2sid"><imagedescription>IDMAP: Resolution of UIDs to SIDs.</imagedescription><imagefile>idmap-uid2sid</imagefile></image> + <image id="idmap-uid2sid"> + <imagedescription>IDMAP: Resolution of UIDs to SIDs.</imagedescription> + <imagefile scale="50">idmap-uid2sid</imagefile> + </image> <sect2> <title>Important Notes About Security</title> @@ -416,10 +422,9 @@ Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>ldapsam</secondary></indexterm> <smbconfexample id="idmapbackendexample"> <title>Example configuration with the LDAP idmap backend</title> -<indexterm><primary>SAM backend</primary><secondary>xmlsam</secondary></indexterm> <smbconfsection>[global]</smbconfsection> <smbconfoption name="idmap backend">ldap:ldap://ldap-server.quenya.org:636</smbconfoption> -<smbcomment>Alternately, this could be specified as:</smbcomment> +<smbconfcomment>Alternately, this could be specified as:</smbconfcomment> <smbconfoption name="idmap backend">ldap:ldaps://ldap-server.quenya.org</smbconfoption> </smbconfexample> </para> @@ -1107,7 +1112,7 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz <smbconfcomment>define the DN to use when binding to the directory servers</smbconfcomment> <smbconfcomment>The password for this DN is not stored in smb.conf. Rather it</smbconfcomment> -<smbconfcomment>must be set by using 'smbpasswd -w <replaceable>secretpw</replaceable>' to store the</smbconfcomment> +<smbconfcomment>must be set by using 'smbpasswd -w secretpw' to store the</smbconfcomment> <smbconfcomment>passphrase in the secrets.tdb file. If the "ldap admin dn" values</smbconfcomment> <smbconfcomment>change, this password will need to be reset.</smbconfcomment> <smbconfoption name="ldap admin dn">"cn=Manager,dc=quenya,dc=org"</smbconfoption> @@ -1423,7 +1428,7 @@ access to attrs=SambaLMPassword,SambaNTPassword <para>The <smbconfoption name="ldap passwd sync"/> options can have the values shown in <link linkend="ldappwsync">the next table</link>.</para> - <table iframe="all" id="ldappwsync"> + <table frame="all" id="ldappwsync"> <title>Possible <emphasis>ldap passwd sync</emphasis> values</title> <tgroup cols="2"> <colspec align="left" colwidth="1*"/> diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml index 32c2226c72..8c12c92ede 100644 --- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml +++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml @@ -451,10 +451,10 @@ reboot and as part of the user logon: An ordered list of user GPOs is obtained. The list contents depends on what is configured in respect of: <itemizedlist> - <listitem>Is the user a Domain Member, thus subject to particular policies?</listitem> - <listitem>Loopback enablement, and the state of the loopback policy (Merge or Replace).</listitem> - <listitem>Location of the Active Directory itself.</listitem> - <listitem>Has the list of GPOs changed? No processing is needed if not changed.</listitem> + <listitem><para>Is the user a Domain Member, thus subject to particular policies?</para></listitem> + <listitem><para>Loopback enablement, and the state of the loopback policy (Merge or Replace).</para></listitem> + <listitem><para>Location of the Active Directory itself.</para></listitem> + <listitem><para>Has the list of GPOs changed? No processing is needed if not changed.</para></listitem> </itemizedlist> </para></listitem> diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml index 97ff8f6d0c..aa89b1e0ef 100644 --- a/docs/Samba-HOWTO-Collection/Printing.xml +++ b/docs/Samba-HOWTO-Collection/Printing.xml @@ -1216,8 +1216,7 @@ The following parameters are frequently needed in this share section: validated by the Domain Controller in order to logon to the Windows NT session), then guest access is not necessary. Of course, in a workgroup environment where you just want to print without worrying about silly accounts and security, then configure the share for - guest access. You should consider adding <smbconfoption><name>map to guest</name><value>Bad - User</value></smbconfoption> in the <smbconfsection>[global]</smbconfsection> section + guest access. You should consider adding <smbconfoption name="map to guest">Bad User</smbconfoption> in the <smbconfsection>[global]</smbconfsection> section as well. Make sure you understand what this parameter does before using it. </para></note> </listitem> @@ -2255,14 +2254,14 @@ dialogs look the same, but only one of them does what you intend. You need to be Administrator or Print Administrator to do this for all users. Here is how I reproduce it in an XP Professional: </para> -The following list needs periods after the letters and numbers::::::::: + <orderedlist numeration="upperalpha"> <listitem><para>The first <quote>wrong</quote> way: <orderedlist numeration="arabic"> <listitem><para>Open the <guiicon>Printers</guiicon> folder.</para></listitem> <listitem><para>Right-click on the printer (<emphasis>remoteprinter on cupshost</emphasis>) and - select in context menu <guimenu>Printing Preferences...</guimenu></para></listitem>. + select in context menu <guimenu>Printing Preferences...</guimenu>.</para></listitem> <listitem><para>Look at this dialog closely and remember what it looks like.</para></listitem> </orderedlist></para></listitem> @@ -2276,10 +2275,10 @@ The following list needs periods after the letters and numbers::::::::: <guimenuitem>Properties</guimenuitem></para></listitem> <listitem><para>Click on the <guilabel>General</guilabel> - tab</para></listitem>. + tab.</para></listitem> <listitem><para>Click on the <guibutton>Printing - Preferences...</guibutton></para></listitem> button. + Preferences...</guibutton> button.</para></listitem> <listitem><para>A new dialog opens. Keep this dialog open and go back to the parent dialog.</para></listitem> diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml index 441a5840b0..edd977b260 100644 --- a/docs/Samba-HOWTO-Collection/Problems.xml +++ b/docs/Samba-HOWTO-Collection/Problems.xml @@ -89,7 +89,7 @@ SMB support is quite good.</para> <para>For details on the use of <command>ethereal</command>, read the well-written Ethereal User Guide.</para> -<image id="ethereal1"><imagefile>ethereal1</imagefile><imagedescription>Starting a capture.</imagedescription></image> +<image id="ethereal1"><imagedescription>Starting a capture.</imagedescription><imagefile>ethereal1</imagefile></image> <para>Listen for data on ports 137, 138, 139, and 445. For example, use the filter <userinput>port 137, port 138, port 139, or port @@ -98,7 +98,7 @@ the filter <userinput>port 137, port 138, port 139, or port <para>A console version of ethereal is available as well and is called <command>tethereal</command>.</para> -<image id="ethereal2"><imagefile>ethereal2</imagefile><imagedescription>Main ethereal data window.</imagedescription></image> +<image id="ethereal2"><imagedescription>Main ethereal data window.</imagedescription><imagefile>ethereal2</imagefile></image> </sect2> @@ -265,7 +265,7 @@ If you do post a message to one of the lists, please observe the following guide <listitem><para>If you have a complete Netmon trace (from the opening of the pipe to the error), you can send the *.CAP file as well.</para></listitem> - ` + <listitem><para>Please think carefully before attaching a document to an email. Consider pasting the relevant parts into the body of the message. The Samba mailing lists go to a huge number of people. Do they all need a copy of your diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml index 4046b86ff8..028762dfc7 100644 --- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml +++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml @@ -999,9 +999,9 @@ per-user settings using the Domain User Manager (as with MS Windows NT4/ Win 200 <para> In any case, you can configure only one profile per user. That profile can be either: </para> <itemizedlist> - <listitem>A profile unique to that user.</listitem> - <listitem>A mandatory profile (one the user cannot change).</listitem> - <listitem>A group profile (really should be mandatory, that is unchangable).</listitem> + <listitem><para>A profile unique to that user.</para></listitem> + <listitem><para>A mandatory profile (one the user cannot change).</para></listitem> + <listitem><para>A group profile (really should be mandatory, that is unchangable).</para></listitem> </itemizedlist> </sect2> diff --git a/docs/Samba-HOWTO-Collection/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml index a56c6016bd..349312d61a 100644 --- a/docs/Samba-HOWTO-Collection/SWAT.xml +++ b/docs/Samba-HOWTO-Collection/SWAT.xml @@ -357,7 +357,7 @@ and the SSL connection is up. SWAT can be configured to display its messages to match the settings of the language configurations of your Web browser. It will be passed to SWAT in the Accept-Language header of the HTTP request. -<para> +</para> <para> To enable this feature: @@ -393,7 +393,7 @@ and so on. If you find a mistake or create a new <command>msg</command> file, pl to us so we will include this in the next release of Samba. The <command>msg</command> file should be encoded in UTF-8. </para> -</para> +<para> Note that if you enable this feature and the <smbconfoption name="display charset"/> is not matched to your browsers setting, the SWAT display may be corrupted. In a future version of Samba, SWAT will always display messages with UTF-8 encoding. You will then not need to set diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml index 7d6abc659c..cf29ef2b7a 100644 --- a/docs/Samba-HOWTO-Collection/Unicode.xml +++ b/docs/Samba-HOWTO-Collection/Unicode.xml @@ -116,7 +116,7 @@ Samba knows of three kinds of character sets: <listitem><para>This is the charset Samba uses when communicating with DOS and Windows 9x/Me clients. It will talk unicode to all newer clients. The default depends on the charsets you have installed on your system. - Run <command>testparm -v | grep <quote>dos charset</quote></command> to see + Run <command>testparm -v | grep "dos charset"</command> to see what the default is on your system. </para></listitem> </varlistentry> @@ -376,10 +376,11 @@ Setting up Japanese charsets is quite difficult. This is mainly because: <smbconfexample><title>VFS CAP</title> <smbconfsection>[global]</smbconfsection> -<smbconfoption name="dos charset">CP932<footnote><para>the locale name "CP932" may be different name</para></footnote></smbconfoption> +<smbconfcomment>the locale name "CP932" may be different</smbconfcomment> +<smbconfoption name="dos charset">CP932</smbconfoption> <smbconfoption name="unix charset">CP932</smbconfoption> -<member><para>...</para></member> +<member>...</member> <smbconfsection>[cap-share]</smbconfsection> <smbconfoption name="vfs option">cap</smbconfoption> diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml index 5ee603564f..73244b4c8f 100644 --- a/docs/Samba-HOWTO-Collection/VFS.xml +++ b/docs/Samba-HOWTO-Collection/VFS.xml @@ -154,8 +154,7 @@ This can be done using a configuration similar to the one shown in <link linkend <parameter>log file</parameter> settings.</para> <para>An example of detailed per-user and per-machine logging can be obtained by setting - <smbconfoption><name>log level</name> - <value>/var/log/samba/%U.%m.log</value></smbconfoption>. + <smbconfoption name="log level">/var/log/samba/%U.%m.log</smbconfoption>. </para></listitem> </itemizedlist> diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index 2edf8c6946..21ed578fa8 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -21,8 +21,8 @@ <author> <firstname>John</firstname><surname>Trostel</surname> <affiliation> - <address><email>jtrostel@snapserver.com</email></address> <orgname>SNAP</orgname> + <address><email>jtrostel@snapserver.com</email></address> </affiliation> </author> @@ -575,10 +575,11 @@ are described in more detail in the <citerefentry><refentrytitle>winbindd</refen linkend="winbindcfg">the next example</link>, was modified to include the necessary entries in the [global] section. </para> -<para><smbconfexample id="winbindcfg"> +<para> +<smbconfexample id="winbindcfg"> <title>smb.conf for Winbind set-up</title> <smbconfsection>[global]</smbconfsection> - <...> +<member><...></member> <smbconfcomment> separate domain and username with '\', like DOMAIN\username</smbconfcomment> <smbconfoption name="winbind separator">\</smbconfoption> <smbconfcomment> use uids from 10000 to 20000 for domain users</smbconfcomment> @@ -1237,10 +1238,12 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <para><quote> But the following command just fails: +</quote> <screen> &rootprompt;<userinput>chown maryo a_file</userinput> chown: `maryo': invalid user </screen> +<quote> This is driving me nuts! What can be wrong? </quote></para> diff --git a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml index 5d4b8fc40f..be080638f6 100644 --- a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml +++ b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml @@ -105,7 +105,10 @@ that are in common use today. These are: <para> The default setting is DHCP enabled operation. (i.e., <quote>Obtain an IP address automatically</quote>). See <link linkend="WXPP003"/>. - <image id="WXPP003"><imagefile>WXPP003</imagefile><imagedescription>Internet Protocol (TCP/IP) Properties.</imagedescription></image> + <image id="WXPP003"> + <imagedescription>Internet Protocol (TCP/IP) Properties.</imagedescription> + <imagefile>WXPP003</imagefile> + </image> </para> <para> @@ -125,7 +128,7 @@ that are in common use today. These are: The technical name for the additional addresses is <emphasis>IP Aliases</emphasis>, and additionally this panel permits the setting of more default gateways (routers). In most cases where DHCP is used, it will not be necessary to create additional settings. See <link linkend="WXPP005"></link> to see the appearance of this panel. - <image id="WXPP005"><imagefile>WXPP005</imagefile><imagedescription>Advanced Network Settings</imagedescription></image> + <image id="WXPP005"><imagedescription>Advanced Network Settings</imagedescription><imagefile>WXPP005</imagefile></image> </para> <para> @@ -136,7 +139,7 @@ that are in common use today. These are: Click the <guimenu>DNS</guimenu> tab to add DNS server settings. The example system uses manually configured DNS settings. When finished making changes, click the <guibutton>OK</guibutton> to commit the settings. See <link linkend="WXPP014"/>. - <image id="WXPP014"><imagefile>WXPP014</imagefile><imagedescription>DNS Configuration.</imagedescription></image> + <image id="WXPP014"><imagedescription>DNS Configuration.</imagedescription><imagefile>WXPP014</imagefile></image> </para></step> <step><para> @@ -144,7 +147,7 @@ that are in common use today. These are: This step demonstrates an example system that uses manually configured WINS settings. When finished making, changes click the <guibutton>OK</guibutton> to commit the settings. See <link linkend="WXPP009"></link>. - <image id="WXPP009"><imagefile>WXPP009</imagefile><imagedescription>WINS Configuration</imagedescription></image> + <image id="WXPP009"><imagedescription>WINS Configuration</imagedescription><imagefile>WXPP009</imagefile></image> </para></step> </procedure> @@ -174,7 +177,7 @@ that are in common use today. These are: <step><para> Right click on <guimenu>Local Area Connection</guimenu>, now click the <guimenuitem>Properties</guimenuitem>. See <link linkend="w2kp001"></link>. - <image id="w2kp001"><imagefile>w2kp001</imagefile><imagedescription>Local Area Connection Properties.</imagedescription></image> + <image id="w2kp001"><imagedescription>Local Area Connection Properties.</imagedescription><imagefile>w2kp001</imagefile></image> </para></step> <step><para> @@ -185,7 +188,7 @@ that are in common use today. These are: <step><para> The default setting is DHCP enabled operation. (i.e., <quote>Obtain an IP address automatically</quote>). See <link linkend="w2kp002"/>. - <image id="w2kp002"><imagefile>w2kp002</imagefile><imagedescription>Internet Protocol (TCP/IP) Properties.</imagedescription></image> + <image id="w2kp002"><imagedescription>Internet Protocol (TCP/IP) Properties.</imagedescription><imagefile>w2kp002</imagefile></image> </para> <para> @@ -203,7 +206,7 @@ that are in common use today. These are: <step><para> Click the <guimenu>Advanced</guimenu> button to proceed with TCP/IP configuration. Refer to <link linkend="w2kp003"></link>. - <image id="w2kp003"><imagefile>w2kp003</imagefile><imagedescription>Advanced Network Settings.</imagedescription></image> + <image id="w2kp003"><imagedescription>Advanced Network Settings.</imagedescription><imagefile>w2kp003</imagefile></image> </para> <para> @@ -214,7 +217,7 @@ that are in common use today. These are: Click the <guimenu>DNS</guimenu> tab to add DNS server settings. The example system uses manually configured DNS settings. When finished making changes, click on <guibutton>OK</guibutton> to commit the settings. See <link linkend="w2kp004"></link>. - <image id="w2kp004"><imagefile>w2kp004</imagefile><imagedescription>DNS Configuration.</imagedescription></image> + <image id="w2kp004"><imagedescription>DNS Configuration.</imagedescription><imagefile>w2kp004</imagefile></image> </para></step> <step><para> @@ -222,7 +225,7 @@ that are in common use today. These are: This step demonstrates an example system that uses manually configured WINS settings. When finished making changes, click on <guibutton>OK</guibutton> to commit the settings. See <link linkend="w2kp005"></link>. - <image id="w2kp005"><imagefile>w2kp005</imagefile><imagedescription>WINS Configuration.</imagedescription></image> + <image id="w2kp005"><imagedescription>WINS Configuration.</imagedescription><imagefile>w2kp005</imagefile></image> </para></step> </procedure> @@ -253,7 +256,7 @@ that are in common use today. These are: <step><para> In the box labeled <guimenuitem>The following network components are installed:</guimenuitem>, click on <guimenu>Internet Protocol TCP/IP</guimenu>, now click on the <guibutton>Properties</guibutton> button. See <link linkend="WME001"></link>. - <image id="WME001"><imagefile>WME001</imagefile><imagedescription>The Windows Me Network Configuration Panel.</imagedescription></image> + <image id="WME001"><imagedescription>The Windows Me Network Configuration Panel.</imagedescription><imagefile>WME001</imagefile></image> </para></step> <step><para> @@ -262,7 +265,7 @@ that are in common use today. These are: for Microsoft Windows client support see, <link linkend="DHCP"></link>. The default setting on Microsoft Windows Me workstations is for DHCP enabled operation, i.e., <guimenu>Obtain IP address automatically</guimenu> is enabled. See <link linkend="WME002"></link>. - <image id="WME002"><imagefile>WME002</imagefile><imagedescription>IP Address.</imagedescription></image> + <image id="WME002"><imagedescription>IP Address.</imagedescription><imagefile>WME002</imagefile></image> </para> <para> @@ -285,14 +288,14 @@ that are in common use today. These are: <step><para> The following example uses manually configured WINS settings. See <link linkend="WME005"></link>. When finished making changes, click on <guibutton>OK</guibutton> to commit the settings. - <image id="WME005"><imagefile>WME005</imagefile><imagedescription>DNS Configuration.</imagedescription></image> + <image id="WME005"><imagedescription>DNS Configuration.</imagedescription><imagefile>WME005</imagefile></image> </para> <para> This is an example of a system that uses manually configured WINS settings. One situation where this might apply is on a network that has a single DHCP server that provides settings for multiple Windows workgroups or domains. See <link linkend="WME003"></link>. - <image id="WME003"><imagefile>WME003</imagefile><imagedescription>WINS Configuration.</imagedescription></image> + <image id="WME003"><imagedescription>WINS Configuration.</imagedescription><imagefile>WME003</imagefile></image> </para></step> </procedure> @@ -323,7 +326,7 @@ that are in common use today. These are: <step><para> The opening panel is the same one that can be reached by clicking <guimenu>System</guimenu> on the Control Panel. See <link linkend="wxpp001"></link>. - <image id="wxpp001"><imagefile>wxpp001</imagefile><imagedescription>The General Panel.</imagedescription></image> + <image id="wxpp001"><imagedescription>The General Panel.</imagedescription><imagefile>wxpp001</imagefile></image> </para></step> <step><para> @@ -336,13 +339,13 @@ that are in common use today. These are: Clicking the <guimenu>Network ID</guimenu> button will launch the configuration wizard. Do not use this with Samba-3. If you wish to change the computer name, join or leave the domain, click the <guimenu>Change</guimenu> button. See <link linkend="wxpp004"></link>. - <image id="wxpp004"><imagefile>wxpp004</imagefile><imagedescription>The Computer Name Panel.</imagedescription></image> + <image id="wxpp004"><imagedescription>The Computer Name Panel.</imagedescription><imagefile>wxpp004</imagefile></image> </para></step> <step><para> Click on <guimenu>Change</guimenu>. This panel shows that our example machine (TEMPTATION) is in a workgroup called WORKGROUP. We will join the domain called MIDEARTH. See <link linkend="wxpp006"></link>. - <image id="wxpp006"><imagefile>wxpp006</imagefile><imagedescription>The Computer Name Changes Panel.</imagedescription></image> + <image id="wxpp006"><imagedescription>The Computer Name Changes Panel.</imagedescription><imagefile>wxpp006</imagefile></image> </para></step> <step><para> @@ -351,7 +354,7 @@ that are in common use today. These are: <para> This panel shows that our example machine (TEMPTATION) is set to join the domain called MIDEARTH. See <link linkend="wxpp007"></link>. - <image id="wxpp007"><imagefile>wxpp007</imagefile><imagedescription>The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.</imagedescription></image> + <image id="wxpp007"><imagedescription>The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.</imagedescription><imagefile>wxpp007</imagefile></image> </para></step> <step><para> @@ -361,7 +364,7 @@ that are in common use today. These are: <para> Enter the name <quote>root</quote> and the root password from your Samba-3 server. See <link linkend="wxpp008"></link>. - <image id="wxpp008"><imagefile>wxpp008</imagefile><imagedescription>Computer Name Changes &smbmdash; User name and Password Panel.</imagedescription></image> + <image id="wxpp008"><imagedescription>Computer Name Changes &smbmdash; User name and Password Panel.</imagedescription><imagefile>wxpp008</imagefile></image> </para></step> <step><para> @@ -397,7 +400,7 @@ that are in common use today. These are: <step><para> The Network Configuration Panel allows all common network settings to be changed. See <link linkend="WME009"></link>. - <image id="WME009"><imagefile>WME009</imagefile><imagedescription>The Network Panel.</imagedescription></image> + <image id="WME009"><imagedescription>The Network Panel.</imagedescription><imagefile>WME009</imagefile></image> </para> <para> @@ -409,7 +412,7 @@ that are in common use today. These are: <step><para> The Client for Microsoft Networks Properties panel is the correct location to configure network logon settings. See <link linkend="WME010"></link>. - <image id="WME010"><imagefile>WME010</imagefile><imagedescription>Client for Microsoft Networks Properties Panel.</imagedescription></image> + <image id="WME010"><imagedescription>Client for Microsoft Networks Properties Panel.</imagedescription><imagefile>WME010</imagefile></image> </para> <para> @@ -420,14 +423,14 @@ that are in common use today. These are: <step><para> Click on the <guimenu>Identification</guimenu> button. This is the location at which the workgroup (domain) name and the machine name (computer name) need to be set. See <link linkend="WME013"></link>. - <image id="WME013"><imagefile>WME013</imagefile><imagedescription>Identification Panel.</imagedescription></image> + <image id="WME013"><imagedescription>Identification Panel.</imagedescription><imagefile>WME013</imagefile></image> </para></step> <step><para> Now click the <guimenu>Access Control</guimenu> button. If you want to be able to assign share access permissions using domain user and group accounts, it is necessary to enable <guimenu>User-level access control</guimenu> as shown in this panel. See <link linkend="WME014"></link>. - <image id="WME014"><imagefile>WME014</imagefile><imagedescription>Identification Panel.</imagedescription></image> + <image id="WME014"><imagedescription>Identification Panel.</imagedescription><imagefile>WME014</imagefile></image> </para></step> </procedure> diff --git a/docs/Samba-HOWTO-Collection/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/foreword-tridge.xml index 760ef8e826..3237b291a1 100644 --- a/docs/Samba-HOWTO-Collection/foreword-tridge.xml +++ b/docs/Samba-HOWTO-Collection/foreword-tridge.xml @@ -1,5 +1,5 @@ <?xml version='1.0'?> -<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <preface> <title>Foreword</title> diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml index 94ed8df46e..05fffd0457 100644 --- a/docs/Samba-HOWTO-Collection/glossary.xml +++ b/docs/Samba-HOWTO-Collection/glossary.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE glossary PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <glossary> <title>Glossary</title> diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml index f6a729ccea..abf8747968 100644 --- a/docs/Samba-HOWTO-Collection/locking.xml +++ b/docs/Samba-HOWTO-Collection/locking.xml @@ -988,15 +988,17 @@ so far: <title>locking.tdb Error Messages</title> <para> - <quote> - We are seeing lots of errors in the Samba logs, like: + <quote> + We are seeing lots of errors in the Samba logs, like: + </quote> <programlisting> tdb(/usr/local/samba_2.2.7/var/locks/locking.tdb): rec_read bad magic 0x4d6f4b61 at offset=36116 </programlisting> - What do these mean? - </quote> + <quote> + What do these mean? + </quote> </para> <para> diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 39e9e0a16b..cd0b9a0daa 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -317,12 +317,6 @@ <xsl:template match="related"><xsl:apply-templates/></xsl:template> - <xsl:template match="filterline"> - <xsl:element name="programlisting"> - <xsl:apply-templates/> - </xsl:element> - </xsl:template> - <xsl:template match="//samba:parameterlist"> <xsl:apply-templates> <xsl:sort select="varlistentry/term/anchor"/> diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl index fed7325c9b..6a52902dca 100644 --- a/docs/xslt/generate-attributions.xsl +++ b/docs/xslt/generate-attributions.xsl @@ -6,7 +6,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.1"> - <xsl:output method="xml" doctype-public="-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" doctype-system="http://www.samba.org/samba/DTD/samba-doc" omit-xml-declaration="yes" indent="yes"/> + <xsl:output method="xml" doctype-public="-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" doctype-system="http://www.samba.org/samba/DTD/samba-doc" indent="yes"/> <!-- Remove all character data --> <xsl:template match="@*|node()"> |