Changeset 988 for vendor/current/docs-xml/build

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/docs-xml/build

Files:

• DTD/samba-doc (modified) (1 diff)
• DTD/samba.entities (modified) (4 diffs)
• catalog.xml.in (modified) (1 diff)

vendor/current/docs-xml/build/DTD/samba-doc

@@ -43 +43 @@
         type CDATA #REQUIRED
         context CDATA #REQUIRED
-        advanced CDATA #IMPLIED
-        developer CDATA #IMPLIED
-        wizard CDATA #IMPLIED
-        basic CDATA #IMPLIED
-        print CDATA #IMPLIED
+        synonym CDATA #IMPLIED
+        handler CDATA #IMPLIED
+        deprecated CDATA #IMPLIED
+        enumlist CDATA #IMPLIED
 >
 <!ELEMENT description ANY>

vendor/current/docs-xml/build/DTD/samba.entities

@@ -215 +215 @@
 <!ENTITY stdarg.configfile '
 <varlistentry>
-<term>-s|--configfile &lt;configuration file&gt;</term>
+<term>-s|--configfile=&lt;configuration file&gt;</term>
 <listitem><para>The file specified contains the 
 configuration details required by the server.  The 
@@ -242 +242 @@
 </varlistentry>'>
 
+<!ENTITY stdarg.option '
+<varlistentry>
+<term>--option=&lt;name&gt;=&lt;value&gt;</term>
+<listitem><para>Set the
+<citerefentry><refentrytitle>smb.conf</refentrytitle>
+<manvolnum>5</manvolnum></citerefentry>
+option "&lt;name&gt;" to value "&lt;value&gt;" from the command line.
+This overrides compiled-in defaults and options read from the configuration
+file.
+</para></listitem>
+</varlistentry>'>
+
 <!ENTITY popt.common.samba '
 &stdarg.version;
 &stdarg.configfile;
 &stdarg.log-basename;
-'>
+&stdarg.option;
+'>
+
+<!ENTITY popt.common.samba.client '
+&stdarg.client.debug;
+&popt.common.samba;
+'>
+
+<!ENTITY popt.common.samba.server '
+&stdarg.server.debug;
+&popt.common.samba;
+'>
+
 
 <!ENTITY stdarg.resolve.order '
@@ -441 +465 @@
 '>
 
-
-<!ENTITY stdarg.help '
-<varlistentry>
-<term>-?|--help</term>
-<listitem><para>Print a summary of command line options.
-</para></listitem>
-</varlistentry>'>
+<!ENTITY stdarg.signing '
+<varlistentry>
+<term>-S|--signing on|off|required</term>
+<listitem><para>Set the client signing state.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.machinepass '
+<varlistentry>
+<term>-P|--machine-pass</term>
+<listitem><para>Use stored machine account password.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.encrypt '
+<varlistentry>
+<term>-e|--encrypt</term>
+<listitem><para>
+This command line parameter requires the remote
+server support the UNIX extensions or that the SMB3 protocol has been selected.
+Requests that the connection be encrypted. Negotiates SMB encryption using either
+SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+the encryption negotiation (either kerberos or NTLMv1/v2 if given
+domain/username/password triple. Fails the connection if encryption
+cannot be negotiated.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.pwnthash '
+<varlistentry>
+<term>--pw-nt-hash</term>
+<listitem><para>The supplied password is the NT hash.
+</para></listitem>
+</varlistentry>
+'>
 
 <!ENTITY popt.common.credentials '
@@ -455 +510 @@
 &stdarg.authfile;
 &stdarg.username;
+&stdarg.signing;
+&stdarg.machinepass;
+&stdarg.encrypt;
+&stdarg.pwnthash;
+'>
+
+<!ENTITY stdarg.help '
+<varlistentry>
+<term>-?|--help</term>
+<listitem><para>Print a summary of command line options.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.usage '
+<varlistentry>
+<term>--usage</term>
+<listitem><para>Display brief usage message.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY popt.autohelp '
+&stdarg.help;
+&stdarg.usage;
 '>
 

vendor/current/docs-xml/build/catalog.xml.in

@@ -7 +7 @@
     <rewriteURI
                         uriStartString="http://www.samba.org/samba/DTD/"
-                        rewritePrefix="file://@abs_top_builddir@/build/DTD/"/>
+                        rewritePrefix="file://@abs_top_srcdir@/build/DTD/"/>
 
     <rewriteURI
                         uriStartString="http://www.gnu.org/licenses/"
-                        rewritePrefix="file://@abs_top_builddir@/Samba3-ByExample/"/>
+                        rewritePrefix="file://@abs_top_srcdir@/Samba3-ByExample/"/>
+    <rewriteURI
+                        uriStartString="http://www.samba.org/samba/smbdotconf/"
+                        rewritePrefix="file://@abs_top_builddir@/smbdotconf/"/>
 </catalog>