summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-11-05 21:35:22 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-11-05 21:35:22 +0000
commit87124fc4039877714b0f7a31a1d03a14bf7708e1 (patch)
tree1c799b47787cc841359744b8e765be469b566691
parentd7eac6c356879d31823750de3a3d8611c622340d (diff)
downloadsamba-87124fc4039877714b0f7a31a1d03a14bf7708e1.tar.gz
samba-87124fc4039877714b0f7a31a1d03a14bf7708e1.tar.bz2
samba-87124fc4039877714b0f7a31a1d03a14bf7708e1.zip
Fix small syntax errors
(This used to be commit 7f9b0dbf5bddf6b49fdb8788ab6745ed46cb9cca)
-rw-r--r--docs/docbook/manpages/pdbedit.8.sgml4
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml12
-rw-r--r--docs/docbook/manpages/wbinfo.1.sgml2
-rw-r--r--docs/docbook/projdoc/msdfs_setup.sgml3
-rw-r--r--docs/docbook/projdoc/pdb_xml.sgml2
5 files changed, 13 insertions, 10 deletions
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index a3fd7be7b4..ed49b9f540 100644
--- 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 07b04efd96..0cdf2bbcd6 100644
--- 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 59cab3fc97..a6ca244243 100644
--- 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 35c9d40840..6e1609460f 100644
--- 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 9e1c509e76..87afb7b401 100644
--- 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>