summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-04-01 15:19:05 +0000
committerGerald Carter <jerry@samba.org>2002-04-01 15:19:05 +0000
commitace98925bef8213d900ae0c7820df1045eba0ee6 (patch)
treee03467f898e164e8ba3f3c51ec102d54559e5355 /docs/docbook
parent9dc5b31936e5ddfd45e1679ed771b0c89bb36d2e (diff)
downloadsamba-ace98925bef8213d900ae0c7820df1045eba0ee6.tar.gz
samba-ace98925bef8213d900ae0c7820df1045eba0ee6.tar.bz2
samba-ace98925bef8213d900ae0c7820df1045eba0ee6.zip
* merges from SAMBA_2_2
* addedd "private dir" to smb.conf.5.sgml * regenerated man pages, HOWTOs, etc... (This used to be commit 3b29006e35a991d20cda1c92d535ef016099d0d4)
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml16
-rw-r--r--docs/docbook/projdoc/Samba-BDC-HOWTO.sgml4
-rw-r--r--docs/docbook/projdoc/printer_driver2.sgml6
-rw-r--r--docs/docbook/projdoc/samba-doc.sgml9
4 files changed, 30 insertions, 5 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index a49ee7cd35..1567087d9e 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -702,6 +702,7 @@
<listitem><para><link linkend="PRINTCAP"><parameter>printcap</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTCAPNAME"><parameter>printcap name</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTERDRIVERFILE"><parameter>printer driver file</parameter></link></para></listitem>
+ <listitem><para><link linkend="PRIVATEDIR"><parameter>private dir</parameter></link></para></listitem>
<listitem><para><link linkend="PROTOCOL"><parameter>protocol</parameter></link></para></listitem>
<listitem><para><link linkend="READBMPX"><parameter>read bmpx</parameter></link></para></listitem>
<listitem><para><link linkend="READRAW"><parameter>read raw</parameter></link></para></listitem>
@@ -5116,6 +5117,7 @@
</listitem>
</itemizedlist>
+ </para>
<para>Default: <command>passdb backend = smbpasswd</command></para>
<para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb</command></para>
@@ -5908,10 +5910,24 @@
[printers]</link> section.</para>
</listitem>
</varlistentry>
+
+
+
+ <varlistentry>
+ <term><anchor id="PRIVATEDIR">private dir (G)</term>
+ <listitem><para>This parameters defines the directory
+ smbd will use for storing such files as <filename>smbpasswd</filename>
+ and <filename>secrets.tdb</filename>.
+ </para>
+ <para>Default :<command>private dir = ${prefix}/private</command></para>
+ </listitem>
+ </varlistentry>
+
+
<varlistentry>
<term><anchor id="PROTOCOL">protocol (G)</term>
<listitem><para>Synonym for <link linkend="MAXPROTOCOL">
diff --git a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
index 0dae399654..53a0959c39 100644
--- a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
@@ -13,7 +13,7 @@
</chapterinfo>
<title>
-How to a Purely Samba Controlled Domain
+How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain
</title>
<sect1>
@@ -230,4 +230,4 @@ password.
</sect2>
</sect1>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.sgml
index 4377303ffb..84a24bcdef 100644
--- a/docs/docbook/projdoc/printer_driver2.sgml
+++ b/docs/docbook/projdoc/printer_driver2.sgml
@@ -230,8 +230,10 @@ that all file shares are set to 'read only' by default.
Once you have created the required [print$] service and
associated subdirectories, simply log onto the Samba server using
a root (or <parameter>printer admin</parameter>) account
-from a Windows NT 4.0 client. Navigate to the "Printers" folder
-on the Samba server. You should see an initial listing of printers
+from a Windows NT 4.0/2k client. Open "Network Neighbourhood" or
+"My Network Places" and browse for the Samba host. Once you have located
+the server, navigate to the "Printers..." folder.
+You should see an initial listing of printers
that matches the printer shares defined on your Samba host.
</para>
</sect2>
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index e2fc5a1eb1..28baa7f609 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -31,7 +31,7 @@
<title>Abstract</title>
<para>
-<emphasis>Last Update</emphasis> : Tue Jul 31 15:58:03 CDT 2001
+<emphasis>Last Update</emphasis> : Mon Apr 1 08:47:26 CST 2002
</para>
<para>
@@ -44,6 +44,13 @@ url="mailto:jerry@samba.org">jerry@samba.org</ulink>.
</para>
<para>
+This documentation is distributed under the GNU General Public License (GPL)
+version 2. A copy of the license is included with the Samba source
+distribution. A copy can be found on-line at <ulink
+url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
+</para>
+
+<para>
Cheers, jerry
</para>