summaryrefslogtreecommitdiff
path: root/docs/docbook/manpages
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook/manpages')
-rw-r--r--docs/docbook/manpages/nmbd.8.sgml3
-rw-r--r--docs/docbook/manpages/pdbedit.8.sgml20
-rw-r--r--docs/docbook/manpages/rpcclient.1.sgml23
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml32
-rw-r--r--docs/docbook/manpages/smbclient.1.sgml2
-rw-r--r--docs/docbook/manpages/testparm.1.sgml12
-rw-r--r--docs/docbook/manpages/vfstest.1.sgml21
-rw-r--r--docs/docbook/manpages/wbinfo.1.sgml14
8 files changed, 69 insertions, 58 deletions
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index b8986110a6..bd8bf964f1 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -1,3 +1,4 @@
+2Q
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<refentry id="nmbd">
@@ -317,7 +318,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of
+ <para>This man page is correct for version 2.2 of
the Samba suite.</para>
</refsect1>
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index ed49b9f540..fd8ce375e5 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -1,6 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<refentry id="pdbedit">
<refmeta>
@@ -23,8 +21,8 @@
<arg choice="opt">-u username</arg>
<arg choice="opt">-f fullname</arg>
<arg choice="opt">-h homedir</arg>
- <arg choice="opt">-D drive</arg>
- <arg choice="opt">-S script</arg>
+ <arg choice="opt">-d drive</arg>
+ <arg choice="opt">-s script</arg>
<arg choice="opt">-p profile</arg>
<arg choice="opt">-a</arg>
<arg choice="opt">-m</arg>
@@ -32,8 +30,7 @@
<arg choice="opt">-i passdb-backend</arg>
<arg choice="opt">-e passdb-backend</arg>
<arg choice="opt">-b passdb-backend</arg>
- <arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-s configfile</arg>
+ <arg choice="opt">-D debuglevel</arg>
<arg choice="opt">-P account-policy</arg>
<arg choice="opt">-V value</arg>
</cmdsynopsis>
@@ -163,8 +160,9 @@
</varlistentry>
+
<varlistentry>
- <term>-D drive</term>
+ <term>-d drive</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the windows drive
letter to be used to map the home directory.</para>
@@ -176,7 +174,7 @@
<varlistentry>
- <term>-S script</term>
+ <term>-s script</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the user's logon
script path.</para>
@@ -301,10 +299,6 @@
</programlisting></para>
</listitem>
</varlistentry>
-
- &stdarg.debuglevel;
- &stdarg.help;
- &stdarg.configfile;
</variablelist>
</refsect1>
diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index 10e0ff438d..7a7a19c837 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -1,6 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<refentry id="rpcclient">
<refmeta>
@@ -89,8 +87,23 @@
- &stdarg.debuglevel;
- &stdarg.help;
+ <varlistentry>
+ <term>-d|--debug=debuglevel</term>
+ <listitem><para>set the debuglevel. Debug level 0 is the lowest
+ and 100 being the highest. This should be set to 100 if you are
+ planning on submitting a bug report to the Samba team (see <filename>BUGS.txt</filename>).
+ </para></listitem>
+ </varlistentry>
+
+
+
+
+ <varlistentry>
+ <term>-h|--help</term>
+ <listitem><para>Print a summary of command line options.
+ </para></listitem>
+ </varlistentry>
+
<varlistentry>
<term>-I IP-address</term>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index ca4de18cfd..621b764a11 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -1269,10 +1269,10 @@
<term><anchor id="ANNOUNCEVERSION">announce version (G)</term>
<listitem><para>This specifies the major and minor version numbers
that nmbd will use when announcing itself as a server. The default
- is 4.9. Do not change this parameter unless you have a specific
+ is 4.2. Do not change this parameter unless you have a specific
need to set a Samba server to be a downlevel server.</para>
- <para>Default: <command>announce version = 4.9</command></para>
+ <para>Default: <command>announce version = 4.5</command></para>
<para>Example: <command>announce version = 2.0</command></para>
</listitem>
@@ -2300,7 +2300,7 @@
<term><anchor id="DOMAINLOGONS">domain logons (G)</term>
<listitem><para>If set to <constant>yes</constant>, the Samba server will serve
Windows 95/98 Domain logons for the <link linkend="WORKGROUP">
- <parameter>workgroup</parameter></link> it is in. Samba 2.2
+ <parameter>workgroup</parameter></link> it is in. Samba 2.2 also
has limited capability to act as a domain controller for Windows
NT 4 Domains. For more details on setting up this feature see
the Samba-PDC-HOWTO included in the <filename>htmldocs/</filename>
@@ -2862,7 +2862,7 @@
system print command such as <command>lpr(1)</command> or <command>
lp(1)</command>.</para>
- <para>This parameter does not accept % macros, because
+ <para>This paramater 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"><parameter>passdb backend</parameter></link></para></listitem>
+ to configure. See <link linkend="PASSDBBACKEND"><paramater>passdb backend</parameter></link></para></listitem>
</itemizedlist>
<para>Default : <command>ldap ssl = start_tls</command></para>
@@ -3791,7 +3791,7 @@
<listitem><para>The value of the parameter (a astring) allows
the debug level (logging level) to be specified in the
<filename>smb.conf</filename> file. This parameter has been
- extended since the 2.2.x series, now it allow to specify the debug
+ extended since 2.2.x series, now it allow to specify the debug
level for multiple debug classes. This is to give greater
flexibility in the configuration of the system.</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></link>) or by
- specifying <parameter>ldaps://</parameter> in
+ <parameter>ldap ssl</parameter>) or by
+ specifying <paramater>ldaps://</paramater> in
the URL argument.
</para></listitem>
@@ -7499,8 +7499,7 @@
<varlistentry>
<term><anchor id="UNICODE">unicode (G)</term>
<listitem><para>Specifies whether Samba should try
- to use unicode on the wire by default. Note: This does NOT
- mean that samba will assume that the unix machine uses unicode!
+ to use unicode on the wire by default.
</para>
<para>Default: <command>unicode = yes</command></para>
@@ -7516,7 +7515,6 @@
</para>
<para>Default: <command>unix charset = ASCII</command></para>
- <para>Example: <command>unix charset = UTF8</command></para>
</listitem>
</varlistentry>
@@ -8055,10 +8053,11 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
<term><anchor id="VFSOBJECT">vfs object (S)</term>
- <listitem><para>This parameter specifies a shared object files that
- are used for Samba VFS I/O operations. By default, normal
+ <listitem><para>This parameter specifies a shared object file that
+ is used for Samba VFS I/O operations. By default, normal
disk I/O operations are used but these can be overloaded
- with one or more VFS objects. </para>
+ with a VFS object. The Samba VFS layer is new to Samba 2.2 and
+ must be enabled at compile time with --with-vfs.</para>
<para>Default : <emphasis>no value</emphasis></para>
</listitem>
@@ -8070,8 +8069,9 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
<term><anchor id="VFSOPTIONS">vfs options (S)</term>
<listitem><para>This parameter allows parameters to be passed
- to the vfs layer at initialization time.
- See also <link linkend="VFSOBJECT"><parameter>
+ to the vfs layer at initialization time. The Samba VFS layer
+ is new to Samba 2.2 and must be enabled at compile time
+ with --with-vfs. See also <link linkend="VFSOBJECT"><parameter>
vfs object</parameter></link>.</para>
<para>Default : <emphasis>no value</emphasis></para>
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index 43994a4529..31031dafc4 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -30,7 +30,7 @@
<arg choice="opt">-l logfile</arg>
<arg choice="opt">-L &lt;netbios name&gt;</arg>
<arg choice="opt">-I destinationIP</arg>
- <arg choice="opt">-E</arg>
+ <arg choice="opt">-E &lt;terminal code&gt;</arg>
<arg choice="opt">-c &lt;command string&gt;</arg>
<arg choice="opt">-i scope</arg>
<arg choice="opt">-O &lt;socket options&gt;</arg>
diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml
index 254ede7265..350683eb57 100644
--- a/docs/docbook/manpages/testparm.1.sgml
+++ b/docs/docbook/manpages/testparm.1.sgml
@@ -20,9 +20,8 @@
<arg choice="opt">-h</arg>
<arg choice="opt">-v</arg>
<arg choice="opt">-L &lt;servername&gt;</arg>
- <arg choice="opt">-t &lt;encoding&gt;</arg>
<arg choice="req">config filename</arg>
- <arg choice="opt">hostname hostIP</arg>
+ <arg choice="opt">hostname hostIP</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -88,12 +87,6 @@
</varlistentry>
<varlistentry>
- <term>-t encoding</term>
- <listitem><para>
- Output data in specified encoding.
- </para></listitem>
-
- <varlistentry>
<term>configfilename</term>
<listitem><para>This is the name of the configuration file
to check. If this parameter is not present then the
@@ -151,7 +144,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of
+ <para>This man page is correct for version 2.2 of
the Samba suite.</para>
</refsect1>
@@ -180,3 +173,4 @@
</refsect1>
</refentry>
+
diff --git a/docs/docbook/manpages/vfstest.1.sgml b/docs/docbook/manpages/vfstest.1.sgml
index f8fa7298b8..9a7eff1939 100644
--- a/docs/docbook/manpages/vfstest.1.sgml
+++ b/docs/docbook/manpages/vfstest.1.sgml
@@ -1,7 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<refentry id="vfstest">
<refmeta>
@@ -51,8 +48,20 @@
</para> </listitem>
</varlistentry>
- &stdarg.debuglevel;
- &stdarg.help;
+ <varlistentry>
+ <term>-d|--debug=debuglevel</term>
+ <listitem><para>set the debuglevel. Debug level 0 is the lowest
+ and 100 being the highest. This should be set to 100 if you are
+ planning on submitting a bug report to the Samba team (see
+ <filename>BUGS.txt</filename>).
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-h|--help</term>
+ <listitem><para>Print a summary of command line options.
+ </para></listitem>
+ </varlistentry>
<varlistentry>
<term>-l|--logfile=logbasename</term>
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index a6ca244243..f1461b07b9 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,8 +17,8 @@
<command>wbinfo</command>
<arg choice="opt">-u</arg>
<arg choice="opt">-g</arg>
+ <arg choice="opt">-h name</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>
<arg choice="opt">-U uid</arg>
@@ -30,7 +30,6 @@
<arg choice="opt">-r user</arg>
<arg choice="opt">-a user%password</arg>
<arg choice="opt">-A user%password</arg>
- <arg choice="opt">-p</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -73,9 +72,10 @@
<command>winbindd(8)</command>. </para></listitem>
</varlistentry>
+
<varlistentry>
- <term>-N name</term>
- <listitem><para>The <parameter>-N</parameter> option
+ <term>-h name</term>
+ <listitem><para>The <parameter>-h</parameter> option
queries <command>winbindd(8)</command> to query the WINS
server for the IP address associated with the NetBIOS name
specified by the <parameter>name</parameter> parameter.
@@ -84,8 +84,8 @@
<varlistentry>
- <term>-I ip</term>
- <listitem><para>The <parameter>-I</parameter> option
+ <term>-i ip</term>
+ <listitem><para>The <parameter>-i</parameter> option
queries <command>winbindd(8)</command> to send a node status
request to get the NetBIOS name associated with the IP address
specified by the <parameter>ip</parameter> parameter.
@@ -210,7 +210,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of
+ <para>This man page is correct for version 2.2 of
the Samba suite.</para>
</refsect1>
generated by cgit (git 2.34.1) at 2024-10-18 04:31:35 +0000