[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Wed Dec 13 23:41:03 UTC 2017


The branch, master has been updated
       via  e8b801d WHATSNEW: document the removal of 'auth methods', 'map untrusted to domain' and 'profile acls'
       via  19ba1b7 docs-xml: remove deprecated 'profile acls' option
       via  5dd3079 s3:smbd: remove deprecated handling of "profile acls = yes"
       via  df1a060 tests/posixacl.py: remove useless 'profile acls' based test
       via  ec64608 s3:auth: is_trusted_domain() is now only useful (and used as DC)
       via  e2a052b docs-xml: remove unused "auth methods" option
       via  6fb5704 s4:auth_winbind: remove unused 'winbind_wbclient' backend
       via  0b72d0b s4:auth_winbind: remove unused 'winbind_rodc' backend
       via  b681810 s4:auth_sam: remove unused 'sam_failtrusts' backend
       via  a382e05 s4:auth/ntlm: remove lpcfg_auth_methods() handling
       via  584ef26 s3:auth: remove lp_auth_methods() handling
       via  2c720b2 s4:selftest: remove samba.blackbox.pdbtest.s4winbind test
       via  4e99b91 s4:selftest: remove samba.blackbox.pdbtest.s4winbind_wbclient test
       via  24ed4ad pdbtest: also verify the authentication path for local users via winbindd
       via  443984b docs-xml: remove unused "map untrusted to domain" option
       via  e7bc23e s3:auth: remove "map untrusted to domain" handling
       via  16316e1 examples/scripts: remove unused shares directory
       via  7bbec4d s4: remove ipv6:enabled parameteric option
       via  f3a7c76 doc: update and tidy up the main samba(7) man page
       via  823f5c9 doc: remove section on ancient history of the docs
       via  fc5bdac doc: move wins related man page to wins subdir
      from  fcaeffd docs-xml/manpages: Use new doc.version XML entity.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e8b801da60eb24ecd2cd4e232c9e0e3bc2f65bec
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 7 17:32:09 2017 +0200

    WHATSNEW: document the removal of 'auth methods', 'map untrusted to domain' and 'profile acls'
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Dec 14 00:40:31 CET 2017 on sn-devel-144

commit 19ba1b7503b9d554b63f613b3c78bdc3b21e189f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 7 17:31:13 2017 +0200

    docs-xml: remove deprecated 'profile acls' option
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 5dd307928a1e20b3fb7fcf550546de70a9149e4c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 7 17:24:19 2017 +0200

    s3:smbd: remove deprecated handling of "profile acls = yes"
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit df1a06074e775ae265b96d7b1290de269c99a9e9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 7 17:29:41 2017 +0200

    tests/posixacl.py: remove useless 'profile acls' based test
    
    test_setntacl_smbd_dont_invalidate_getntacl_smbd() is basically
    the same as test_setntacl_smbd_getntacl_smbd()
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit ec646089f28338a505295aa56c2ebabaf30995b1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 19 10:43:25 2017 +0200

    s3:auth: is_trusted_domain() is now only useful (and used as DC)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e2a052b3bb8569df97aede7bcea08f69839fe7fa
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 19 10:56:38 2017 +0200

    docs-xml: remove unused "auth methods" option
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 6fb5704c119c399ffa0cc80a9902cb074ed82de2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 27 13:48:34 2017 +0100

    s4:auth_winbind: remove unused 'winbind_wbclient' backend
    
    This is no longer useful as it doesn't support async requests.
    
    It could be readded using pthreadpool_tevent_job_send()
    and wbcCtxAuthenticateUserEx() if required.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0b72d0b7e57e8094bd8fe0d2c25bba85c372223d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 27 13:48:34 2017 +0100

    s4:auth_winbind: remove unused 'winbind_rodc' backend
    
    This is no longer useful as the 'winbind' backend also
    handles the rodc case now.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b681810d3ce43f660c7b1e8a9a117fa89866a9c8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 28 07:40:09 2017 +0100

    s4:auth_sam: remove unused 'sam_failtrusts' backend
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit a382e05a16986a434ef420677ba8acba64388231
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 19 10:56:00 2017 +0200

    s4:auth/ntlm: remove lpcfg_auth_methods() handling
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 584ef261c9cefbef35caae58b978bfd9e31d7e1b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 19 10:55:35 2017 +0200

    s3:auth: remove lp_auth_methods() handling
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2c720b20ab4657741501a3f5ff35f62d1bab3617
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 6 13:28:27 2017 +0100

    s4:selftest: remove samba.blackbox.pdbtest.s4winbind test
    
    This is marked as knownfail for quite some time.
    
    I don't think such a test is a reason to the 'auth methods' option.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 4e99b91b62fc8408b8dde2da5647f1ebd26fbe5c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 6 13:25:19 2017 +0100

    s4:selftest: remove samba.blackbox.pdbtest.s4winbind_wbclient test
    
    The "winbind_wbclient" backend is unused and will be removed soon.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 24ed4adff0ef1c0ef9a535e391ff1ce0cdb0f648
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 7 13:03:55 2017 +0100

    pdbtest: also verify the authentication path for local users via winbindd
    
    This basically inlines the logic from the 'winbind_wbclient' backend,
    which will be removed shortly.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 443984b8292e08f64c9af7794883d6434f8cf5db
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 19 10:48:49 2017 +0200

    docs-xml: remove unused "map untrusted to domain" option
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e7bc23e44c014645964539aaf19892a8a187c4a4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 12 15:35:41 2017 +0200

    s3:auth: remove "map untrusted to domain" handling
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 16316e157ba74db4201a36877721a288590c98e6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 7 13:34:36 2017 +0100

    examples/scripts: remove unused shares directory
    
    These scripts are not that useful anymore, as they rely
    on parameters to be defined in loadparm.c
    
    It's confusing to get 'git grep' matches for parameters there...
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7bbec4d8714849a64b62e56e8fec390f4613e00d
Author: Björn Jacke <bjacke at samba.org>
Date:   Tue Dec 12 22:32:09 2017 +0100

    s4: remove ipv6:enabled parameteric option
    
    this was never disabling ipv6, only v6-only interfaces. This can be achieved
    with the interfaces parameter also if wanted.
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit f3a7c7678afe71ef0770839ed92054f82e2301bb
Author: Bjoern Jacke <bjacke at samba.org>
Date:   Fri Dec 8 21:06:56 2017 +0100

    doc: update and tidy up the main samba(7) man page
    
    my favourite one here was "If you have access to a WWW viewer..." :)
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 823f5c9a748960ed95529f54e10736ea949806d8
Author: Bjoern Jacke <bjacke at samba.org>
Date:   Fri Dec 8 19:57:06 2017 +0100

    doc: remove section on ancient history of the docs
    
    This is quite historically, we should drop this.
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fc5bdac501b725c64b9342e4054717f040077e3a
Author: Bjoern Jacke <bjacke at samba.org>
Date:   Fri Dec 8 13:48:43 2017 +0100

    doc: move wins related man page to wins subdir
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt                                       |   8 +-
 docs-xml/manpages/findsmb.1.xml                    |   8 -
 docs-xml/manpages/lmhosts.5.xml                    |   9 -
 docs-xml/manpages/nmbd.8.xml                       |   8 -
 docs-xml/manpages/nmblookup.1.xml                  |   8 -
 docs-xml/manpages/samba.7.xml                      |  88 +++--
 docs-xml/manpages/smb.conf.5.xml                   |   8 -
 docs-xml/manpages/smbclient.1.xml                  |   8 -
 docs-xml/manpages/smbcontrol.1.xml                 |   8 -
 docs-xml/manpages/smbd.8.xml                       |   8 -
 docs-xml/manpages/smbpasswd.5.xml                  |   8 -
 docs-xml/manpages/smbpasswd.8.xml                  |   8 -
 docs-xml/manpages/smbspool.8.xml                   |   8 -
 docs-xml/manpages/smbstatus.1.xml                  |   8 -
 docs-xml/manpages/testparm.1.xml                   |   8 -
 docs-xml/smbdotconf/protocol/profileacls.xml       |  62 ----
 docs-xml/smbdotconf/security/authmethods.xml       |  34 --
 .../smbdotconf/security/mapuntrustedtodomain.xml   |  55 ----
 .../smbdotconf/{protocol => wins}/maxwinsttl.xml   |   0
 .../smbdotconf/{protocol => wins}/minwinsttl.xml   |   0
 .../scripts/shares/perl/modify_samba_config.pl     | 168 ----------
 examples/scripts/shares/python/SambaConfig.py      | 314 ------------------
 examples/scripts/shares/python/SambaParm.py        |  83 -----
 .../scripts/shares/python/generate_parm_table.py   | 222 -------------
 .../scripts/shares/python/modify_samba_config.py   |  77 -----
 examples/scripts/shares/python/smbparm.py          | 364 ---------------------
 lib/param/loadparm.c                               |   2 -
 python/samba/tests/posixacl.py                     |  17 -
 selftest/knownfail                                 |   4 -
 source3/auth/auth.c                                |  31 +-
 source3/auth/auth_util.c                           |  96 +-----
 source3/param/loadparm.c                           |   2 -
 source3/smbd/posix_acls.c                          |  83 +----
 source3/torture/pdbtest.c                          |  73 +++++
 source4/auth/ntlm/auth.c                           |  40 +--
 source4/auth/ntlm/auth_sam.c                       |  96 ------
 source4/auth/ntlm/auth_winbind.c                   | 163 ---------
 source4/lib/socket/interface.c                     |  24 +-
 source4/selftest/tests.py                          |   3 -
 39 files changed, 149 insertions(+), 2065 deletions(-)
 delete mode 100644 docs-xml/smbdotconf/protocol/profileacls.xml
 delete mode 100644 docs-xml/smbdotconf/security/authmethods.xml
 delete mode 100644 docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
 rename docs-xml/smbdotconf/{protocol => wins}/maxwinsttl.xml (100%)
 rename docs-xml/smbdotconf/{protocol => wins}/minwinsttl.xml (100%)
 delete mode 100755 examples/scripts/shares/perl/modify_samba_config.pl
 delete mode 100644 examples/scripts/shares/python/SambaConfig.py
 delete mode 100644 examples/scripts/shares/python/SambaParm.py
 delete mode 100755 examples/scripts/shares/python/generate_parm_table.py
 delete mode 100755 examples/scripts/shares/python/modify_samba_config.py
 delete mode 100644 examples/scripts/shares/python/smbparm.py


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 007e5d9..257e087 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -57,12 +57,16 @@ smb.conf changes
 
   Parameter Name                     Description             Default
   --------------                     -----------             -------
-  binddns dir			     New
-  gpo update command		     New
+  auth methods                       Removed
+  binddns dir                        New
+  gpo update command                 New
+  map untrusted to domain            Removed
   oplock contention limit            Removed
   prefork children		     New		     1
   mdns name                          Added                   netbios
   fruit:time machine                 Added                   false
+  profile acls                       Removed
+
 
 NT4-style replication based net commands removed
 ================================================
diff --git a/docs-xml/manpages/findsmb.1.xml b/docs-xml/manpages/findsmb.1.xml
index 23278c5..aa8e572 100644
--- a/docs-xml/manpages/findsmb.1.xml
+++ b/docs-xml/manpages/findsmb.1.xml
@@ -140,14 +140,6 @@ IP ADDR         NETBIOS NAME   WORKGROUP/OS/VERSION
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink 
-	url="ftp://ftp.icce.rug.nl/pub/unix/">ftp://ftp.icce.rug.nl/pub/unix/</ulink>) 
-	and updated for the Samba 2.0 release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook
-	XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/lmhosts.5.xml b/docs-xml/manpages/lmhosts.5.xml
index 257d001..a332706 100644
--- a/docs-xml/manpages/lmhosts.5.xml
+++ b/docs-xml/manpages/lmhosts.5.xml
@@ -113,15 +113,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at
-	<ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook
-	XML 4.2 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index 79170d2..7fe7f9f 100644
--- a/docs-xml/manpages/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
@@ -284,14 +284,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook
-	XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml
index e56f05a..55a4cc6 100644
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -209,14 +209,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook
-	XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index 612bfd3..df1d5a5 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -26,9 +26,9 @@
 	<para>The Samba software suite is a collection of programs
 	that implements the Server Message Block (commonly abbreviated
 	as SMB) protocol for UNIX systems and provides Active Directory
-	services. This protocol is sometimes also referred to as the
-	Common Internet File System (CIFS). For a more thorough description,
-	see <ulink url="http://www.ubiqx.org/cifs/">
+	services. The first version of the SMB protcol is sometimes also
+	referred to as the Common Internet File System (CIFS). For a more
+	thorough description, see <ulink url="http://www.ubiqx.org/cifs/">
 	http://www.ubiqx.org/cifs/</ulink>. Samba also implements the NetBIOS
 	protocol in nmbd.</para>
 
@@ -48,8 +48,7 @@
 		<term><citerefentry><refentrytitle>smbd</refentrytitle>
 		<manvolnum>8</manvolnum></citerefentry></term>
 		<listitem><para>The <command>smbd</command> daemon provides the file and print services to
-		SMB clients, such as Windows 95/98, Windows NT, Windows
-		for Workgroups or LanManager. The configuration file
+		SMB clients. The configuration file
 		for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
 		<manvolnum>5</manvolnum></citerefentry>.
 		</para></listitem>
@@ -80,9 +79,9 @@
 		<listitem><para>The <command>smbclient</command>
 		program implements a simple ftp-like client. This
 		is useful for accessing SMB shares on other compatible
-		servers (such as Windows NT), and can also be used
+		SMB servers, and can also be used
 		to allow a UNIX box to print to a printer attached to
-		any SMB server (such as a PC running Windows NT).</para>
+		any SMB server.</para>
 		</listitem>
 		</varlistentry>
 
@@ -100,7 +99,9 @@
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para>The <command>testparm</command>
 		utility is a simple syntax checker for Samba's <citerefentry><refentrytitle>smb.conf</refentrytitle>
-		<manvolnum>5</manvolnum></citerefentry> configuration file.</para>
+		<manvolnum>5</manvolnum></citerefentry> configuration file.
+		In AD server mode <command>samba-tool testparm</command>
+		should be used though.</para>
 		</listitem>
 		</varlistentry>
 
@@ -117,8 +118,7 @@
 		<term><citerefentry><refentrytitle>nmblookup</refentrytitle>
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para>The <command>nmblookup</command>
-		tools allows NetBIOS name queries to be made
-		from a UNIX host.</para>
+		tool allows NetBIOS name queries to be made.</para>
 		</listitem>
 		</varlistentry>
 
@@ -126,8 +126,8 @@
 		<term><citerefentry><refentrytitle>smbpasswd</refentrytitle>
 		<manvolnum>8</manvolnum></citerefentry></term>
 		<listitem><para>The <command>smbpasswd</command>
-		command is a tool for changing LanMan and Windows NT
-		password hashes on Samba and Windows NT servers.</para>
+		command is a tool for setting passwords on local Samba but
+		also on	remote SMB servers.</para>
 		</listitem>
 		</varlistentry>
 
@@ -135,7 +135,7 @@
 		<term><citerefentry><refentrytitle>smbcacls</refentrytitle>
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para>The <command>smbcacls</command> command is
-		a tool to set ACL's on remote CIFS servers. </para>
+		a tool to set ACL's on remote SMB servers.</para>
 		</listitem>
 		</varlistentry>
 
@@ -150,7 +150,7 @@
 		<term><citerefentry><refentrytitle>smbtar</refentrytitle>
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para>The <command>smbtar</command> can make
-		backups of data on CIFS/SMB servers.</para></listitem>
+		backups of data directly from SMB servers.</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
@@ -158,7 +158,7 @@
 		<manvolnum>8</manvolnum></citerefentry></term>
 		<listitem><para><command>smbspool</command> is a
 		helper utility for printing on printers connected
-		to CIFS servers. </para></listitem>
+		to SMB servers. </para></listitem>
 		</varlistentry>
 
 		<varlistentry>
@@ -176,7 +176,7 @@
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para><command>rpcclient</command> is a utility
 		that can be used to execute RPC commands on remote
-		CIFS servers.</para></listitem>
+		SMB servers.</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
@@ -184,7 +184,7 @@
 		<manvolnum>8</manvolnum></citerefentry></term>
 		<listitem><para>The <command>pdbedit</command> command
 		can be used to maintain the local user database on
-		a samba server.</para></listitem></varlistentry>
+		a Samba server.</para></listitem></varlistentry>
 
 		<varlistentry>
 		<term><citerefentry><refentrytitle>findsmb</refentrytitle>
@@ -197,8 +197,8 @@
 		<term><citerefentry><refentrytitle>net</refentrytitle>
 		<manvolnum>8</manvolnum></citerefentry></term>
 		<listitem><para>The <command>net</command> command
-		is supposed to work similar to the DOS/Windows
-		NET.EXE command.</para></listitem>
+		is the main administration tool for Samba member and
+		standalone servers.</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
@@ -243,8 +243,8 @@
 		<varlistentry>
 		<term><citerefentry><refentrytitle>smbcquotas</refentrytitle>
 		<manvolnum>1</manvolnum></citerefentry></term>
-		<listitem><para><command>smbcquotas</command> is a tool that
-		can set remote QUOTA's on server with NTFS 5. </para>
+		<listitem><para><command>smbcquotas</command> is a tool to
+		manage quotas on remote SMB servers. </para>
 		</listitem>
 		</varlistentry>
 	</variablelist>
@@ -258,11 +258,11 @@
 	recommended that you read the documentation that comes with Samba
 	and the manual pages of those components that you use. If the
 	manual pages and documents aren't clear enough then please visit
-	<ulink url="http://devel.samba.org/">http://devel.samba.org</ulink>
+	<ulink url="https://devel.samba.org/">https://devel.samba.org</ulink>
 	for information on how to file a bug report or submit a patch.</para>
 
 	<para>If you require help, visit the Samba webpage at
-	<ulink url="https://www.samba.org/">http://www.samba.org/</ulink> and
+	<ulink url="https://www.samba.org/">https://www.samba.org/</ulink> and
 	explore the many option available to you.
 	</para>
 </refsect1>
@@ -277,20 +277,18 @@
 	please obey the terms of this license.</para>
 
 	<para>The latest version of the Samba suite can be
-	obtained via anonymous ftp from samba.org in the
-	directory pub/samba/. It is also available on several
-	mirror sites worldwide.</para>
-
-	<para>You may also find useful information about Samba
-	on the newsgroup <ulink url="news:comp.protocols.smb">
-	comp.protocol.smb</ulink> and the Samba mailing
-	list. Details on how to join the mailing list are given in
-	the README file that comes with Samba.</para>
-
-	<para>If you have access to a WWW viewer (such as Mozilla
-	or Konqueror) then you will also find lots of useful information,
-	including back issues of the Samba mailing list, at
-	<ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.</para>
+	obtained from <ulink url="https://download.samba.org/pub/samba/">
+	https://download.samba.org/pub/samba/</ulink>.
+	</para>
+
+	<para>The Samba Wiki at
+	<ulink url="https://wiki.samba.org/">https://wiki.samba.org</ulink>
+	has also a lot of useful information.
+	On the Samba mailing list at
+	<ulink url="https://lists.samba.org/">https://lists.samba.org</ulink>
+	you can	find a lot of information in the archives and you can
+	subscribe to the samba list and ask for help or discuss things.
+	</para>
 </refsect1>
 
 <refsect1>
@@ -305,11 +303,11 @@
 
 	<para>If you wish to contribute to the Samba project,
 	then I suggest you join the Samba mailing list at
-	<ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.
+	<ulink url="https://lists.samba.org/">https://lists.samba.org</ulink>.
 	</para>
 
 	<para>If you have patches to submit, visit
-	<ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>
+	<ulink url="https://devel.samba.org/">https://devel.samba.org/</ulink>
 	for information on how to do it properly. We prefer patches
 	in <command>git format-patch</command> format.</para>
 </refsect1>
@@ -322,8 +320,8 @@
 	users. To see a full list, look at the
 	<filename>change-log</filename> in the source package
 	for the pre-CVS changes and at <ulink
-	url="http://git.samba.org/">
-	http://git.samba.org/</ulink>
+	url="https://git.samba.org/">
+	https://git.samba.org/</ulink>
 	for the contributors to Samba post-GIT. GIT is the Open Source
 	source code control system used by the Samba Team to develop
 	Samba. The project would have been unmanageable without it.</para>
@@ -336,14 +334,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar
 	to the way the Linux kernel is developed.</para>
-
-	<para>The original Samba man pages were written by Karl Auer.
-	The man page sources were converted to YODL format (another
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
-	release by Jeremy Allison.  The conversion to DocBook for
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML
-	4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 7b891ad..976f988 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -881,14 +881,6 @@ chmod 1770 /usr/local/samba/lib/usershares
 	The original Samba software and related utilities were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar to the way the Linux kernel is developed.
 	</para>
-	
-	<para>
-	The original Samba man pages were written by Karl Auer. The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink noescape="1" url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 release by Jeremy Allison.  The conversion
-	to DocBook for Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0 was done by
-	Alexander Bokovoy.
-	</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index cfb155d..a5d4808 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -1271,14 +1271,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar
 	to the way the Linux kernel is developed.</para>
-
-	<para>The original Samba man pages were written by Karl Auer.
-	The man page sources were converted to YODL format (another
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
-	release by Jeremy Allison.	The conversion to DocBook for
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
-	was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml
index f8a00d6..e931ebd 100644
--- a/docs-xml/manpages/smbcontrol.1.xml
+++ b/docs-xml/manpages/smbcontrol.1.xml
@@ -341,14 +341,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
-	Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
index 8e979aa..b378cb8 100644
--- a/docs-xml/manpages/smbd.8.xml
+++ b/docs-xml/manpages/smbd.8.xml
@@ -440,14 +440,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
-	Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbpasswd.5.xml b/docs-xml/manpages/smbpasswd.5.xml
index 223b80c..adb24df 100644
--- a/docs-xml/manpages/smbpasswd.5.xml
+++ b/docs-xml/manpages/smbpasswd.5.xml
@@ -198,14 +198,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink noescape="1" url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
-	for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbpasswd.8.xml b/docs-xml/manpages/smbpasswd.8.xml
index d704211..f3e3bc2 100644
--- a/docs-xml/manpages/smbpasswd.8.xml
+++ b/docs-xml/manpages/smbpasswd.8.xml
@@ -418,14 +418,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
-	for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbspool.8.xml b/docs-xml/manpages/smbspool.8.xml
index bded47a..f555270 100644
--- a/docs-xml/manpages/smbspool.8.xml
+++ b/docs-xml/manpages/smbspool.8.xml
@@ -120,14 +120,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
-	for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/smbstatus.1.xml b/docs-xml/manpages/smbstatus.1.xml
index 78a8172..a510572 100644
--- a/docs-xml/manpages/smbstatus.1.xml
+++ b/docs-xml/manpages/smbstatus.1.xml
@@ -161,14 +161,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
-	for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/manpages/testparm.1.xml b/docs-xml/manpages/testparm.1.xml
index 056aca6..b3e3624 100644
--- a/docs-xml/manpages/testparm.1.xml
+++ b/docs-xml/manpages/testparm.1.xml
@@ -197,14 +197,6 @@
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink noescape="1" url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
-	for Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs-xml/smbdotconf/protocol/profileacls.xml b/docs-xml/smbdotconf/protocol/profileacls.xml
deleted file mode 100644
index a660c52..0000000
--- a/docs-xml/smbdotconf/protocol/profileacls.xml


-- 
Samba Shared Repository



More information about the samba-cvs mailing list