[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  be07b8b tests: Add doc exception for spoolss: OSVERSION.
       via  416958c doc-xml: Add documentation for 'spoolss: os_[major|minor|build]' options.
      from  55c279f smbd: add missing newline to debug message in daemon_ready()

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


- Log -----------------------------------------------------------------
commit be07b8bc90df27adbfa2201e5645deec1434dbbe
Author: Andreas Schneider <asn at samba.org>
Date:   Thu May 22 11:42:29 2014 +0200

    tests: Add doc exception for spoolss: OSVERSION.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri May 23 20:10:49 CEST 2014 on sn-devel-104

commit 416958ca6281c5eaea848054444a678e219bc897
Author: Andreas Schneider <asn at samba.org>
Date:   Wed May 21 11:19:17 2014 +0200

    doc-xml: Add documentation for 'spoolss: os_[major|minor|build]' options.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 docs-xml/smbdotconf/printing/spoolssosversion.xml |   47 +++++++++++++++++++++
 python/samba/tests/docs.py                        |    3 +-
 2 files changed, 49 insertions(+), 1 deletions(-)
 create mode 100644 docs-xml/smbdotconf/printing/spoolssosversion.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/printing/spoolssosversion.xml b/docs-xml/smbdotconf/printing/spoolssosversion.xml
new file mode 100644
index 0000000..a63a4ce
--- /dev/null
+++ b/docs-xml/smbdotconf/printing/spoolssosversion.xml
@@ -0,0 +1,47 @@
+<samba:parameter name="spoolss: os_major"
+		 context="G"
+		 type="integer"
+		 advanced="1"
+		 developer="1"
+		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>Windows might require a new os version number. This option allows
+		to modify the build number. The complete default version number is:
+		5.0.2195 (Windows 2000). The example is 6.1.7601 (Windows 2008 R2).
+	</para>
+</description>
+<value type="default">5</value>
+<value type="example">6</value>
+</samba:parameter>
+
+<samba:parameter name="spoolss: os_minor"
+		 context="G"
+		 type="integer"
+		 advanced="1"
+		 developer="1"
+		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>Windows might require a new os version number. This option allows
+		to modify the build number. The complete default version number is:
+		5.0.2195 (Windows 2000). The example is 6.1.7601 (Windows 2008 R2).
+	</para>
+</description>
+<value type="default">0</value>
+<value type="example">1</value>
+</samba:parameter>
+
+<samba:parameter name="spoolss: os_build"
+		 context="G"
+		 type="integer"
+		 advanced="1"
+		 developer="1"
+		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>Windows might require a new os version number. This option allows
+		to modify the build number. The complete default version number is:
+		5.0.2195 (Windows 2000). The example is 6.1.7601 (Windows 2008 R2).
+	</para>
+</description>
+<value type="default">2195</value>
+<value type="example">7601</value>
+</samba:parameter>
diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index ab25b6c..927b374 100644
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -130,7 +130,8 @@ class SmbDotConfTests(TestCase):
                          'server string', 'netbios name', 'socket options', 'use mmap',
                          'ctdbd socket', 'printing', 'printcap name', 'queueresume command',
                          'queuepause command','lpresume command', 'lppause command',
-                         'lprm command', 'lpq command', 'print command', 'template homedir'])
+                         'lprm command', 'lpq command', 'print command', 'template homedir',
+                         'spoolss: os_major', 'spoolss: os_minor', 'spoolss: os_build'])
 
     def setUp(self):
         super(SmbDotConfTests, self).setUp()


-- 
Samba Shared Repository