[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  1bf209d html docs: Remove link to Using Samba.
       via  c627ba1 docs: Remove duplicate synonym min protocol.
      from  50de2c9 s3fs-smbd: Make sure the registry is set up before we init printing.

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


- Log -----------------------------------------------------------------
commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3
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

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

    docs: Remove duplicate synonym min protocol.
    
    Karolin

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

Summary of changes:
 docs-xml/htmldocs.html                             |    4 ----
 docs-xml/smbdotconf/protocol/serverminprotocol.xml |    1 -
 2 files changed, 0 insertions(+), 5 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 ba08665..58323b5 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -9,7 +9,6 @@
 </description>
 
 <related>server max protocol</related>
-<synonym>min protocol</synonym>
 
 <value type="default">CORE</value>
 <value type="example">NT1</value>


-- 
Samba Shared Repository