docs-xml: Update documentation for removal of NIS support

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

10 files changed, 11 insertions, 98 deletions

diff --git a/docs-xml/smbdotconf/misc/homedirmap.xml b/docs-xml/smbdotconf/misc/homedirmap.xml
deleted file mode 100644
index ba70730860a..00000000000
--- a/docs-xml/smbdotconf/misc/homedirmap.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<samba:parameter name="homedir map"
-                 context="G"
-                 type="string"
-                 substitution="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
- <description>
-	<para>
-	If <smbconfoption name="nis homedir"/> is <constant>yes</constant>, and <citerefentry><refentrytitle>smbd</refentrytitle>
-	<manvolnum>8</manvolnum></citerefentry> is also acting 	as a Win95/98 <parameter moreinfo="none">logon server</parameter> 
-	then this parameter specifies the NIS (or YP) map from which the server for the user's 	home directory should be extracted.  
-	At present, only the Sun auto.home map format is understood. The form of the map is:
-<programlisting>
-<command moreinfo="none">username server:/some/file/system</command>
-</programlisting>
-	and the program will extract the servername from before the first ':'.  There should probably be a better parsing system 
-	that copes with different map formats and also Amd (another automounter) maps.
-	</para>
-		
-	<note><para>
-	A working NIS client is required on the system for this option to work.
-	</para></note>
-</description>
-<related>nis homedir</related>
-<related>domain logons</related>
-
-<value type="default"></value>
-<value type="example">amd.homedir</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/nishomedir.xml b/docs-xml/smbdotconf/misc/nishomedir.xml
deleted file mode 100644
index ace84759fb2..00000000000
--- a/docs-xml/smbdotconf/misc/nishomedir.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<samba:parameter name="NIS homedir"
-                 context="G"
-                 type="boolean"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>Get the home share server from a NIS map. For 
-	UNIX systems that use an automounter, the user's home directory 
-	will often be mounted on a workstation on demand from a remote 
-	server. </para>
-
-	<para>When the Samba logon server is not the actual home directory 
-	server, but is mounting the home directories via NFS then two 
-	network hops would be required to access the users home directory 
-	if the logon server told the client to use itself as the SMB server 
-	for home directories (one over SMB and one over NFS). This can 
-	be very slow.</para>
-
-	<para>This option allows Samba to return the home share as 
-	being on a different server to the logon server and as 
-	long as a Samba daemon is running on the home directory server, 
-	it will be mounted on the Samba client directly from the directory 
-	server. When Samba is returning the home share to the client, it 
-	will consult the NIS map specified in
-	<smbconfoption name="homedir map"/> and return the server 
-	listed there.</para>
-
-	<para>Note that for this option to work there must be a working 
-	NIS system and the Samba server with this option must also 
-	be a logon server.</para>
-</description>
-<value type="default">no</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/nameresolveorder.xml b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
index e29eabb87df..b85d060e7ce 100644
--- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
@@ -26,7 +26,7 @@
 	<listitem>
 	    <para>
 		<constant>host</constant> : Do a standard host name to IP address resolution, using the system
-		<filename moreinfo="none">/etc/hosts </filename>, NIS, or DNS lookups. This method of name resolution is
+		<filename moreinfo="none">/etc/hosts </filename> or DNS lookups. This method of name resolution is
 		operating system depended for instance on IRIX or Solaris this may be controlled by the <filename
 		moreinfo="none">/etc/nsswitch.conf</filename> file.  Note that this method is used only if the NetBIOS name
 		type being queried is the 0x20 (server) name type or 0x1c (domain controllers).  The latter case is only
diff --git a/docs-xml/smbdotconf/security/hostsallow.xml b/docs-xml/smbdotconf/security/hostsallow.xml
index 8b4b62268a3..a052e7f79cd 100644
--- a/docs-xml/smbdotconf/security/hostsallow.xml
+++ b/docs-xml/smbdotconf/security/hostsallow.xml
@@ -41,13 +41,6 @@
 
     <para><command moreinfo="none">hosts allow = lapland, arvidsjaur</command></para>
 
-    <para>Example 4: allow only hosts in NIS netgroup &quot;foonet&quot;, but 
-    deny access from one particular host</para>
-
-    <para><command moreinfo="none">hosts allow = @foonet</command></para>
-
-    <para><command moreinfo="none">hosts deny = pirate</command></para>
-
     <note><para>Note that access still requires suitable user-level passwords.</para></note>
 
     <para>See <citerefentry><refentrytitle>testparm</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/invalidusers.xml b/docs-xml/smbdotconf/security/invalidusers.xml
index b2fb2b9d293..268cdfad560 100644
--- a/docs-xml/smbdotconf/security/invalidusers.xml
+++ b/docs-xml/smbdotconf/security/invalidusers.xml
@@ -7,21 +7,8 @@
     to login to this service. This is really a <emphasis>paranoid</emphasis> 
     check to absolutely ensure an improper setting does not breach 
     your security.</para>
-		
-    <para>A name starting with a '@' is interpreted as an NIS 
-    netgroup first (if your system supports NIS), and then as a UNIX 
-    group if the name was not found in the NIS netgroup database.</para>
 
-    <para>A name starting with '+' is interpreted only 
-    by looking in the UNIX group database via the NSS getgrnam() interface. A name starting with 
-    '&amp;' is interpreted only by looking in the NIS netgroup database 
-    (this requires NIS to be working on your system). The characters 
-    '+' and '&amp;' may be used at the start of the name in either order 
-    so the value <parameter moreinfo="none">+&amp;group</parameter> means check the 
-    UNIX group database, followed by the NIS netgroup database, and 
-    the value <parameter moreinfo="none">&amp;+group</parameter> means check the NIS
-    netgroup database, followed by the UNIX group database (the 
-    same as the '@' prefix).</para>
+    <para>A name starting with a '@' is interpreted UNIX group.</para>
 
     <para>The current servicename is substituted for <parameter moreinfo="none">%S</parameter>. 
 		This is useful in the [homes] section.</para>
diff --git a/docs-xml/smbdotconf/security/passwdchat.xml b/docs-xml/smbdotconf/security/passwdchat.xml
index 23f8e6e1570..a04fc62fdf6 100644
--- a/docs-xml/smbdotconf/security/passwdchat.xml
+++ b/docs-xml/smbdotconf/security/passwdchat.xml
@@ -14,17 +14,14 @@
     received then the password is not changed.</para>
 
     <para>This chat sequence is often quite site specific, depending 
-    on what local methods are used for password control (such as NIS 
-    etc).</para>
+    on what local methods are used for password control.</para>
 
     <para>Note that this parameter only is used if the <smbconfoption
     name="unix password sync"/> parameter is set  to <constant>yes</constant>. This sequence is 
     then called <emphasis>AS ROOT</emphasis> when the SMB password  in the 
     smbpasswd file is being changed, without access to the old password
     cleartext. This means that root must be able to reset the user's password without
-    knowing the text of the previous password. In the presence of
-    NIS/YP,  this means that the <smbconfoption name="passwd program"/> must
-    be executed on the NIS master.
+    knowing the text of the previous password.
     </para>
 
     <para>The string can contain the macro <parameter
diff --git a/docs-xml/smbdotconf/security/usernamemap.xml b/docs-xml/smbdotconf/security/usernamemap.xml
index 809a54c1e2f..eab72bb8672 100644
--- a/docs-xml/smbdotconf/security/usernamemap.xml
+++ b/docs-xml/smbdotconf/security/usernamemap.xml
@@ -59,11 +59,6 @@
 
 
     <para>
-	If your system supports the NIS NETGROUP option then the netgroup database is checked before the <filename
-	moreinfo="none">/etc/group </filename> database for matching groups.
-	</para>
-
-    <para>
 	You can map Windows usernames that have spaces in them by using double quotes around the name. For example:
 <programlisting>
 <command moreinfo="none">tridge = &quot;Andrew Tridgell&quot;</command>
diff --git a/docs-xml/smbdotconf/security/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml
index 86118f305bc..7b797cbae1c 100644
--- a/docs-xml/smbdotconf/security/usernamemapscript.xml
+++ b/docs-xml/smbdotconf/security/usernamemapscript.xml
@@ -10,7 +10,7 @@
 	command line option (the username transmitted in the authentication
 	request) and return a line on standard output (the name to which
 	the account should mapped).  In this way, it is possible to store
-	username map tables in an LDAP or NIS directory services.
+	username map tables in an LDAP directory services.
 	</para>
 </description>
 
diff --git a/docs-xml/smbdotconf/security/validusers.xml b/docs-xml/smbdotconf/security/validusers.xml
index 0b681a1fef5..6b0bacfd78a 100644
--- a/docs-xml/smbdotconf/security/validusers.xml
+++ b/docs-xml/smbdotconf/security/validusers.xml
@@ -4,9 +4,10 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
-    This is a list of users that should be allowed to login to this service. Names starting with 
-    '@', '+' and  '&amp;' are interpreted using the same rules as described in the 
-    <parameter moreinfo="none">invalid users</parameter> parameter.
+        This is a list of users that should be allowed to login to this service.
+        Names starting with an '@' are interpreted using the same rules as
+        described in the
+        <parameter moreinfo="none">invalid users</parameter> parameter.
     </para>
 
     <para>
diff --git a/docs-xml/smbdotconf/winbind/winbindseparator.xml b/docs-xml/smbdotconf/winbind/winbindseparator.xml
index eda14f4e03a..9be46109cd6 100644
--- a/docs-xml/smbdotconf/winbind/winbindseparator.xml
+++ b/docs-xml/smbdotconf/winbind/winbindseparator.xml
@@ -10,9 +10,9 @@
 	and <filename moreinfo="none">nss_winbind.so</filename> modules for UNIX services.
 	</para>
 
-	<para>Please note that setting this parameter to + causes problems
+	<para>Please note that setting this parameter to + can cause problems
 	with group membership at least on glibc systems, as the character +
-	is used as a special character for NIS in /etc/group.</para>
+	was used as a special character for NIS in /etc/group.</para>
 </description>
 
 <value type="default">\</value>