diff options
author | bubulle <bubulle@alioth.debian.org> | 2010-04-04 16:44:16 +0000 |
---|---|---|
committer | bubulle <bubulle@alioth.debian.org> | 2010-04-04 16:44:16 +0000 |
commit | 9e2f5a6ab663f7a111832217c527508c75ddae8a (patch) | |
tree | 2e74616febbb3fb658ce2dcc5f9cff00ad4fdb4a /docs-xml/build | |
parent | b5556af8f75a4f74db404dd43ee7abafa2be6ca4 (diff) | |
download | samba-9e2f5a6ab663f7a111832217c527508c75ddae8a.tar.gz |
Merge 3.5.1 from experimental
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3414 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'docs-xml/build')
-rw-r--r-- | docs-xml/build/DTD/passdb | 46 | ||||
-rw-r--r-- | docs-xml/build/DTD/samba-doc | 4 | ||||
-rw-r--r-- | docs-xml/build/DTD/samba.entities | 30 |
3 files changed, 24 insertions, 56 deletions
diff --git a/docs-xml/build/DTD/passdb b/docs-xml/build/DTD/passdb deleted file mode 100644 index 318801adac..0000000000 --- a/docs-xml/build/DTD/passdb +++ /dev/null @@ -1,46 +0,0 @@ -<!ELEMENT samba:crypt (#PCDATA)* > -<!ATTLIST samba:crypt type CDATA #REQUIRED > - -<!ELEMENT samba:password (samba:crypt*) > -<!ATTLIST samba:password last_set CDATA #IMPLIED - must_change CDATA #IMPLIED - can_change CDATA #IMPLIED> - -<!ELEMENT samba:group (#PCDATA)* > -<!ATTLIST samba:group sid CDATA #REQUIRED - gid CDATA #IMPLIED > - -<!ELEMENT samba:domain (#PCDATA)* > -<!ELEMENT samba:fullname (#PCDATA)* > -<!ELEMENT samba:nt_username (#PCDATA)* > -<!ELEMENT samba:logon_script (#PCDATA)* > -<!ELEMENT samba:profile_path (#PCDATA)* > -<!ELEMENT samba:logon_time (#PCDATA)* > -<!ELEMENT samba:logoff_time (#PCDATA)* > -<!ELEMENT samba:kickoff_time (#PCDATA)* > -<!ELEMENT samba:logon_divs (#PCDATA)* > -<!ELEMENT samba:hours_len (#PCDATA)* > -<!ELEMENT samba:unknown_3 (#PCDATA)* > -<!ELEMENT samba:unknown_5 (#PCDATA)* > -<!ELEMENT samba:unknown_6 (#PCDATA)* > -<!ELEMENT samba:homedir (#PCDATA)* > -<!ELEMENT samba:unknown_str (#PCDATA)* > -<!ELEMENT samba:dir_drive (#PCDATA)* > -<!ELEMENT samba:munged_dial (#PCDATA)* > -<!ELEMENT samba:acct_desc (#PCDATA)* > -<!ELEMENT samba:acct_ctrl (#PCDATA)* > -<!ELEMENT samba:workstations (#PCDATA)* > - -<!ELEMENT samba:user ( samba:group?, samba:domain?, samba:nt_username?, samba:fullname?, samba:homedir?, samba:dir_drive?, samba:logon_script?, samba:profile_path?, samba:password?, samba:acct_ctrl?,samba:unknown_3?, samba:logon_divs?, samba:hours_len?, samba:logon_time?, samba:logoff_time?, samba:kickoff_time?, samba:unknown_5?, samba:unknown_6?, samba:unknown_str?, samba:munged_dial?, samba:acct_desc?, samba:workstations? ) > - -<!ATTLIST samba:user sid CDATA #REQUIRED - uid CDATA #IMPLIED - name CDATA #REQUIRED> - -<!ELEMENT samba:users (samba:user*) > - -<!ELEMENT samba (samba:users?) > - -<!ATTLIST samba - xmlns CDATA #FIXED 'http://www.samba.org/samba/DTD/passdb'> - diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc index 88bfec5e1d..8de97290cb 100644 --- a/docs-xml/build/DTD/samba-doc +++ b/docs-xml/build/DTD/samba-doc @@ -11,6 +11,8 @@ <!ENTITY % local.linespecific.class "|smbconfblock"> <!ENTITY % local.informal.class "|imagefile"> +<!-- Include the DocBook DTD, of which this DTD is an extension --> + <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> @@ -21,6 +23,8 @@ "samba.entities"> %samba.entities; +<!-- smb.conf options --> + <!ELEMENT smbconfblock ((smbconfoption|smbconfsection|smbconfcomment)*)> <!ELEMENT smbconfcomment (#PCDATA)> <!ELEMENT smbconfsection EMPTY> diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities index 2e924d46ba..d204156696 100644 --- a/docs-xml/build/DTD/samba.entities +++ b/docs-xml/build/DTD/samba.entities @@ -50,8 +50,8 @@ <!ENTITY person.gd ' <firstname>Guenther</firstname><surname>Deschner</surname> <affiliation> - <orgname>SuSE</orgname> - <address><email>gd@suse.de</email></address> + <orgname>Samba Team</orgname> + <address><email>gd@samba.org</email></address> </affiliation>'> <!ENTITY author.gd '<author>&person.gd;</author>'> @@ -214,7 +214,7 @@ in the &smb.conf; file.</para> <!ENTITY stdarg.configfile ' <varlistentry> -<term>-s <configuration file></term> +<term>-s|--configfile <configuration file></term> <listitem><para>The file specified contains the configuration details required by the server. The information in this file includes server-specific @@ -227,7 +227,7 @@ compile time.</para></listitem> <!ENTITY stdarg.version ' <varlistentry> -<term>-V</term> +<term>-V|--version</term> <listitem><para>Prints the program version number. </para></listitem> </varlistentry>'> @@ -249,7 +249,7 @@ log.smbd, etc...). The log file is never removed by the client. <!ENTITY stdarg.resolve.order ' <varlistentry> -<term>-R <name resolve order></term> +<term>-R|--name-resolve <name resolve order></term> <listitem><para>This option is used to determine what naming services and in what order to resolve host names to IP addresses. The option takes a space-separated @@ -307,7 +307,7 @@ resolution methods will be attempted in this order. </para></listitem> <!ENTITY stdarg.netbios.name ' <varlistentry> -<term>-n <primary NetBIOS name></term> +<term>-n|--netbiosname <primary NetBIOS name></term> <listitem><para>This option allows you to override the NetBIOS name that Samba uses for itself. This is identical to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file. @@ -318,7 +318,7 @@ line setting will take precedence over settings in <!ENTITY stdarg.scope ' <varlistentry> -<term>-i <scope></term> +<term>-i|--scope <scope></term> <listitem><para>This specifies a NetBIOS scope that <command>nmblookup</command> will use to communicate with when generating NetBIOS names. For details on the use of NetBIOS @@ -340,7 +340,7 @@ SAM (as opposed to the Domain SAM). </para></listitem> <!ENTITY stdarg.socket.options ' <varlistentry> -<term>-O socket options</term> +<term>-O|--socket-options socket options</term> <listitem><para>TCP socket options to set on the client socket. See the socket options parameter in the &smb.conf; manual page for the list of valid @@ -357,7 +357,7 @@ options. </para></listitem> <!ENTITY stdarg.nopass ' <varlistentry> -<term>-N</term> +<term>-N|--no-pass</term> <listitem><para>If specified, this parameter suppresses the normal password prompt from the client to the user. This is useful when accessing a service that does not require a password. </para> @@ -420,7 +420,7 @@ access from unwanted users. </para></listitem> <!ENTITY stdarg.kerberos ' <varlistentry> -<term>-k</term> +<term>-k|--kerberos</term> <listitem><para> Try to authenticate with kerberos. Only useful in an Active Directory environment. @@ -428,6 +428,15 @@ an Active Directory environment. </varlistentry> '> +<!ENTITY stdarg.useccache ' +<varlistentry> +<term>-C|--use-ccache</term> +<listitem><para> +Try to use the credentials cached by winbind. +</para></listitem> +</varlistentry> +'> + <!ENTITY stdarg.help ' <varlistentry> @@ -439,6 +448,7 @@ an Active Directory environment. <!ENTITY popt.common.credentials ' &stdarg.nopass; &stdarg.kerberos; +&stdarg.useccache; &stdarg.authfile; &stdarg.username; '> |