summaryrefslogtreecommitdiff
path: root/docs/docbook/projdoc
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-05-08 15:37:14 +0000
committerGerald Carter <jerry@samba.org>2002-05-08 15:37:14 +0000
commit7a959e81d42bdff1269589b7d17a12ab0b3243be (patch)
tree9f52c2978d314ec7c722d3e2c755a3f8016bfe42 /docs/docbook/projdoc
parent5e723ce3c089f118e66f55ef78832421531265f8 (diff)
downloadsamba-7a959e81d42bdff1269589b7d17a12ab0b3243be.tar.gz
samba-7a959e81d42bdff1269589b7d17a12ab0b3243be.tar.bz2
samba-7a959e81d42bdff1269589b7d17a12ab0b3243be.zip
merging some changes from SAMBA_2_2
(This used to be commit e8ede079b5af4187573f1b8ed0d94b6f03cbbd22)
Diffstat (limited to 'docs/docbook/projdoc')
-rw-r--r--docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml7
-rw-r--r--docs/docbook/projdoc/winbind.sgml8
2 files changed, 11 insertions, 4 deletions
diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
index 21d2c55ec7..c6c04ccab8 100644
--- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
@@ -13,8 +13,8 @@
<address><email>olem@IDEALX.org</email></address>
</affiliation>
</author>
-
-
+
+
<pubdate> (13 Jan 2002) </pubdate>
</chapterinfo>
@@ -98,7 +98,7 @@ Identified (RID).
As a result of these defeciencies, a more robust means of storing user attributes
used by smbd was developed. The API which defines access to user accounts
is commonly referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
+API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
for a samdb backend (e.g. <parameter>--with-ldapsam</parameter> or
<parameter>--with-tdbsam</parameter>) requires compile time support.
</para>
@@ -515,7 +515,6 @@ something other than the default (e.g. \\MOBY\becky).
-
<sect1>
<title>Example LDIF Entries for a sambaAccount</title>
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml
index fc8d8d52a1..62e065914b 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.sgml
@@ -324,6 +324,14 @@ to control access and authenticate users on your Linux box using
the winbind services which come with SAMBA 2.2.2.
</para>
+<para>
+There is also some Solaris specific information in
+<filename>docs/textdocs/Solaris-Winbind-HOWTO.txt</filename>.
+Future revisions of this document will incorporate that
+information.
+</para>
+
+
<sect2>
<title>Introduction</title>