summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/devdoc/unix-smb.sgml7
-rw-r--r--docs/docbook/manpages/smbclient.1.sgml2
-rw-r--r--docs/docbook/projdoc/Bugs.sgml5
-rw-r--r--docs/docbook/projdoc/Integrating-with-Windows.sgml2
-rw-r--r--docs/docbook/projdoc/security_level.sgml2
-rw-r--r--docs/docbook/projdoc/winbind.sgml2
6 files changed, 6 insertions, 14 deletions
diff --git a/docs/docbook/devdoc/unix-smb.sgml b/docs/docbook/devdoc/unix-smb.sgml
index 73da12758d..be79698857 100644
--- a/docs/docbook/devdoc/unix-smb.sgml
+++ b/docs/docbook/devdoc/unix-smb.sgml
@@ -144,13 +144,6 @@ details.
<sect1>
<title>Locking</title>
<para>
-<note>
-Since samba 2.2, samba supports other types of locking as well. This
-section is outdated.
-</note>
-</para>
-
-<para>
The locking calls available under a DOS/Windows environment are much
richer than those available in unix. This means a unix server (like
Samba) choosing to use the standard fcntl() based unix locking calls
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/projdoc/Bugs.sgml b/docs/docbook/projdoc/Bugs.sgml
index a9493b07d4..5a24458e08 100644
--- a/docs/docbook/projdoc/Bugs.sgml
+++ b/docs/docbook/projdoc/Bugs.sgml
@@ -15,8 +15,7 @@
<title>Introduction</title>
<para>
-The email address for bug reports for stable releases is <ulink url="samba@samba.org">samba@samba.org</ulink>.
-Bug reports for alpha releases should go to <ulink url="mailto:samba-technical@samba.org">samba-technical@samba.org</ulink>.
+The email address for bug reports is samba@samba.org
</para>
<para>
@@ -45,7 +44,7 @@ that list that may be able to help you.
<para>
You may also like to look though the recent mailing list archives,
which are conveniently accessible on the Samba web pages
-at <ulink url="http://samba.org/samba/">http://samba.org/samba/</ulink>.
+at http://samba.org/samba/
</para>
</sect1>
diff --git a/docs/docbook/projdoc/Integrating-with-Windows.sgml b/docs/docbook/projdoc/Integrating-with-Windows.sgml
index 3b0faf81af..701e48678c 100644
--- a/docs/docbook/projdoc/Integrating-with-Windows.sgml
+++ b/docs/docbook/projdoc/Integrating-with-Windows.sgml
@@ -253,7 +253,7 @@ principal of speaking only when necessary.
</para>
<para>
-Starting with version 2.2.0 samba has Linux support for extensions to
+Samba version 2.2.0 will add Linux support for extensions to
the name service switch infrastructure so that linux clients will
be able to obtain resolution of MS Windows NetBIOS names to IP
Addresses. To gain this functionality Samba needs to be compiled
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index 2f9a92d872..efe2b6eaf3 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -20,7 +20,7 @@ Samba supports the following options to the global smb.conf parameter
<para><programlisting>
[global]
-<ulink url="smb.conf.5.html#SECURITY"><parameter>security</parameter></ulink> = [share|user(default)|server|domain|ads]
+<ulink url="smb.conf.5.html#SECURITY"><parameter>security</parameter></ulink> = [share|user(default)|domain|ads]
</programlisting></para>
<para>
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml
index d2bfb8ab67..b045a26db6 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.sgml
@@ -412,7 +412,7 @@ you get frustrated with the way things are going. ;-)
</para>
<para>
-The latest version of SAMBA (version 3.0 as of this writing), now
+The latest version of SAMBA (version 2.2.2 as of this writing), now
includes a functioning winbindd daemon. Please refer to the
<ulink url="http://samba.org/">main SAMBA web page</ulink> or,
better yet, your closest SAMBA mirror site for instructions on