summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-11-27 02:47:56 +0000
committerGerald Carter <jerry@samba.org>2002-11-27 02:47:56 +0000
commit2f86978f5329b4ec67bb673ed32ea7f4ea7b5a1b (patch)
treefbe1e15442169e1e7de7c2070d7d3b64c17109bf /docs/docbook
parente6f956f9b43179c9132fbfe6924700881a249e2b (diff)
downloadsamba-2f86978f5329b4ec67bb673ed32ea7f4ea7b5a1b.tar.gz
samba-2f86978f5329b4ec67bb673ed32ea7f4ea7b5a1b.tar.bz2
samba-2f86978f5329b4ec67bb673ed32ea7f4ea7b5a1b.zip
sync docs with SAMBA_3_0 and regenerate
(This used to be commit 20e6d8c036a4c4ecfa2afb1dd29342c81ce00f8b)
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/manpages/pdbedit.8.sgml3
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml19
-rw-r--r--docs/docbook/manpages/testparm.1.sgml1
3 files changed, 16 insertions, 7 deletions
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index ed49b9f540..1484bfec9a 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -278,7 +278,7 @@
<listitem><para>Display an account policy</para>
<para>Valid policies are: minimum password age, reset count minutes, disconnect time,
user must logon to change password, password history, lockout duration, min password length,
- maximum password age and bad lockout attempt.
+ maximum password age and bad lockout attempt.</para>
<para>Example: <command>pdbedit -P "bad lockout attempt"</command></para>
<para><programlisting>
@@ -293,6 +293,7 @@
<listitem><para>Sets an account policy to a specified value.
This option may only be used in conjunction
with the <parameter>-P</parameter> option.
+ </para>
<para>Example: <command>pdbedit -P "bad lockout attempt" -V 3</command></para>
<para><programlisting>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 6ed870ed3e..13fdb1c6cb 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -5377,10 +5377,11 @@
<listitem><para><command>ldapsam_nua</command> - The LDAP based passdb
backend, with non unix account support. Takes an LDAP URL as an optional argument (defaults to
<command>ldap://localhost</command>)</para>
- <para>Note: In this module, any account
- without a matching POSIX account is regarded
- as 'non unix'.
- <para>See also <link linkend="NONUNIXACCOUNTRANGE">
+
+ <para>Note: In this module, any account without a matching POSIX account is regarded
+ as 'non unix'. </para>
+
+ <para>See also <link linkend="NONUNIXACCOUNTRANGE">
<parameter>non unix account
range</parameter></link></para>
@@ -5650,6 +5651,12 @@
doing a query for the name <constant>WORKGROUP&lt;1C&gt;</constant>
and then contacting each server returned in the list of IP
addresses from the name resolution source. </para>
+
+ <para>If the list of servers contains both names and the '*'
+ character, the list is treated as a list of preferred
+ domain controllers, but an auto lookup of all remaining DC's
+ will be added to the list as well. Samba will not attempt to optimize
+ this list by locating the closest DC.</para>
<para>If the <parameter>security</parameter> parameter is
set to <constant>server</constant>, then there are different
@@ -5677,7 +5684,7 @@
<para>Default: <command>password server = &lt;empty string&gt;</command>
</para>
- <para>Example: <command>password server = NT-PDC, NT-BDC1, NT-BDC2
+ <para>Example: <command>password server = NT-PDC, NT-BDC1, NT-BDC2, *
</command></para>
<para>Example: <command>password server = *</command></para>
</listitem>
@@ -6547,7 +6554,7 @@
<listitem><para>This is a integer parameter, and
mirrors as much as possible the functinality the
<constant>RestrictAnonymous</constant>
- registry key does on NT/Win2k.
+ registry key does on NT/Win2k. </para>
<para>Default: <command>restrict anonymous = 0</command></para>
</listitem>
diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml
index 254ede7265..f34528a43d 100644
--- a/docs/docbook/manpages/testparm.1.sgml
+++ b/docs/docbook/manpages/testparm.1.sgml
@@ -92,6 +92,7 @@
<listitem><para>
Output data in specified encoding.
</para></listitem>
+ </varlistentry>
<varlistentry>
<term>configfilename</term>