[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  c4cb4c4 docs: Remove duplicate synonym min protocol.
       via  5aabd6c smb.conf(5): Add basic documentation for 'server min protocol'.
       via  bb82ac2 html docs: Remove link to Using Samba.
      from  42d2af9 Fix net rpc share allowedusers to work with 2008r2

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit c4cb4c411573682fe203f2f654878fbca2bb98e7
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Oct 4 10:00:44 2012 +0200

    docs: Remove duplicate synonym min protocol.
    
    Karolin
    (cherry picked from commit c627ba145e18c3fb91ca6da730541dd1f119c4d0)
    
    The last 2 patches address bug #9243 - Duplicate synonym 'min protocol'.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Thu Oct  4 16:42:57 CEST 2012 on sn-devel-104

commit 5aabd6cf88d799ebbd4fc3a56686e34833083fae
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 26 15:55:04 2012 -0700

    smb.conf(5): Add basic documentation for 'server min protocol'.
    
    Conflicts:
    	docs-xml/smbdotconf/protocol/serverminprotocol.xml
    (cherry picked from commit b97c257f3af942d0767226793fa705940caad8dd)

commit bb82ac2d4cccc6d0cc0a833fef68cbb6bd02c976
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Oct 4 11:43:20 2012 +0200

    html docs: Remove link to Using Samba.
    
    Thanks to Christian Perrier <bubulle at debian.org> for reporting!
    
    Fix bug #7826 - HTML docs index file still points to Using Samba.
    
    Karolin
    
    Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(master): Thu Oct  4 13:48:00 CEST 2012 on sn-devel-104
    (cherry picked from commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3)

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

Summary of changes:
 docs-xml/htmldocs.html                             |    4 ----
 docs-xml/smbdotconf/protocol/serverminprotocol.xml |   16 +++-------------
 2 files changed, 3 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index 44fcc0f..6fb9e73 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -23,10 +23,6 @@
  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
 </tr>
 <tr>
- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
- <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
-</tr>
-<tr>
  <td valign="top"><a href="manpages/index.html">Man pages</a></td>
  <td valign="top">The Samba man pages in HTML.</td>
 </tr>
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index d313908..40566ce 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -3,22 +3,12 @@
 				 type="string"
                  developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>min protocol</synonym>
 <description>
-    <para>The value of the parameter (a string) is the 
-    lowest SMB protocol dialect than Samba will support.  Please refer
-    to the <smbconfoption name="server max protocol"/>
-    parameter for a list of valid protocol names and a brief description
-    of each.  You may also wish to refer to the C source code in
-    <filename moreinfo="none">source/smbd/negprot.c</filename> for a listing of known protocol
-    dialects supported by clients.</para>
-		
-    <para>If you are viewing this parameter as a security measure, you should
-    also refer to the <smbconfoption name="lanman auth"/> parameter.  Otherwise, you should never need 
-    to change this parameter.</para>
+	<para>This setting controls the minimum protocol version that the server will allow the client to use.</para>
 </description>
 
-<related>server min protocol</related>
-<synonym>min protocol</synonym>
+<related>server max protocol</related>
 
 <value type="default">LANMAN1</value>
 <value type="example">NT1</value>


-- 
Samba Shared Repository