Fix small syntax errors

(This used to be commit 7f9b0dbf5bddf6b49fdb8788ab6745ed46cb9cca)

diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index a3fd7be7b4ed4a67d6a34dddd01ae989b201b3b9..ed49b9f540cd38a41c47e5a0447b8ee54aaed5fb 100644 (file)
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -1,4 +1,6 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+]>
 <refentry id="pdbedit">
 
 <refmeta>

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 07b04efd96eb78396823f4eecd6c8e5f22f1cf82..0cdf2bbcd60a0c6016c91f548d47f6f14ae7d365 100644 (file)
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -2862,7 +2862,7 @@
                system print command such as <command>lpr(1)</command> or <command>
                lp(1)</command>.</para>
 
-               <para>This paramater does not accept % macros, because
+               <para>This parameter does not accept % macros, because
                many parts of the system require this value to be
                constant for correct operation.</para>
                
@@ -3475,7 +3475,7 @@
                        <parameter>ldap server</parameter>.  Only
                        available when the backwards-compatiblity <command>
                        --with-ldapsam</command> option is specified
-                       to configure.  See <link linkend="PASSDBBACKEND"><paramater>passdb backend</parameter></link></para></listitem>
+                       to configure.  See <link linkend="PASSDBBACKEND"><parameter>passdb backend</parameter></link></para></listitem>
                </itemizedlist>         
                
                <para>Default : <command>ldap ssl = start_tls</command></para>
@@ -5387,8 +5387,8 @@
                        <para>LDAP connections should be secured where
                         possible.  This may be done using either
                         Start-TLS (see <link linkend="LDAPSSL">
-                        <parameter>ldap ssl</parameter>) or by
-                        specifying <paramater>ldaps://</paramater> in
+                        <parameter>ldap ssl</parameter></link>) or by
+                        specifying <parameter>ldaps://</parameter> in
                         the URL argument.  
                         </para></listitem>
                        
@@ -7499,7 +7499,8 @@
                <varlistentry>
                <term><anchor id="UNICODE">unicode (G)</term>
                <listitem><para>Specifies whether Samba should try 
-               to use unicode on the wire by default. 
+               to use unicode on the wire by default. Note: This does NOT
+               mean that samba will assume that the unix machine uses unicode!
                </para>
 
                <para>Default: <command>unicode = yes</command></para>
@@ -7515,6 +7516,7 @@
                </para>
 
                <para>Default: <command>unix charset = ASCII</command></para>
+               <para>Example: <command>unix charset = UTF8</command></para>
                </listitem>
                </varlistentry>
 

diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 59cab3fc97cec3c18790d9377898dc25c7948665..a6ca24424370fd804905b67466611a653256878e 100644 (file)
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,7 +17,7 @@
                <command>wbinfo</command>
                <arg choice="opt">-u</arg>
                <arg choice="opt">-g</arg>
-!              <arg choice="opt">-i ip</arg>
+               <arg choice="opt">-i ip</arg>
                <arg choice="opt">-N netbios-name</arg>
                <arg choice="opt">-n name</arg>
                <arg choice="opt">-s sid</arg>

diff --git a/docs/docbook/projdoc/msdfs_setup.sgml b/docs/docbook/projdoc/msdfs_setup.sgml
index 35c9d40840a1a9a8f6e5baccbe27926f130c41e4..6e1609460fc6f6c56cbaef11a54731bd8f888c63 100644 (file)
--- a/docs/docbook/projdoc/msdfs_setup.sgml
+++ b/docs/docbook/projdoc/msdfs_setup.sgml
@@ -11,8 +11,7 @@
                </affiliation>
        </author>
        
-               
-       <pubdate>12 Jul 200</pubdate>
+       <pubdate>12 Jul 2000</pubdate>
 </chapterinfo>
 
 

diff --git a/docs/docbook/projdoc/pdb_xml.sgml b/docs/docbook/projdoc/pdb_xml.sgml
index 9e1c509e76cbe8f10b52219c8ba880c542b5c896..87afb7b4014f920fe7a4ebdae3b8407a8da57728 100644 (file)
--- a/docs/docbook/projdoc/pdb_xml.sgml
+++ b/docs/docbook/projdoc/pdb_xml.sgml
@@ -36,7 +36,7 @@ the directory <filename>source/</filename>. </para>
 To import data, use:
 <command>pdbedit -i plugin:/usr/lib/samba/pdb_xml.so:filename -e current-pdb</command>
 
-Where filename is the name to read the data from and <current-pdb> to put it in.
+Where filename is the name to read the data from and current-pdb to put it in.
 </para>
 </sect1>
 </chapter>