Author: gd Date: 2009-12-23 02:23:06 -0700 (Wed, 23 Dec 2009) New Revision: 1350
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1350 Log: DTD: bring public copy of samba.entities uptodate with the copy in docs-xml. Guenther Modified: trunk/DTD/samba.entities Changeset: Modified: trunk/DTD/samba.entities =================================================================== --- trunk/DTD/samba.entities 2009-12-15 23:28:55 UTC (rev 1349) +++ trunk/DTD/samba.entities 2009-12-23 09:23:06 UTC (rev 1350) @@ -50,8 +50,8 @@ <!ENTITY person.gd ' <firstname>Guenther</firstname><surname>Deschner</surname> <affiliation> - <orgname>SuSE</orgname> - <address><email>g...@suse.de</email></address> + <orgname>Samba Team</orgname> + <address><email>g...@samba.org</email></address> </affiliation>'> <!ENTITY author.gd '<author>&person.gd;</author>'> @@ -180,7 +180,7 @@ data, most of which is extremely cryptic.</para> <para>Note that specifying this parameter here will -override the <smbconfoption name="log level" /> parameter +override the <smbconfoption><name>log level</name></smbconfoption> parameter in the &smb.conf; file.</para> </listitem> </varlistentry>'> @@ -207,14 +207,14 @@ data, most of which is extremely cryptic.</para> <para>Note that specifying this parameter here will -override the <smbconfoption name="log level" /> parameter +override the <smbconfoption><name>log level</name></smbconfoption> parameter in the &smb.conf; file.</para> </listitem> </varlistentry>'> <!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 @@ <!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 @@ <!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 @@ -297,20 +297,20 @@ <para>If this parameter is not set then the name resolve order defined in the &smb.conf; file parameter -(<smbconfoption name="name resolve order" />) will be used. +(<smbconfoption><name>name resolve order</name></smbconfoption>) will be used. </para> <para>The default order is lmhosts, host, wins, bcast. Without -this parameter or any entry in the <smbconfoption name="name resolve order" /> parameter of the &smb.conf; file, the name +this parameter or any entry in the <smbconfoption><name>name resolve order</name></smbconfoption> parameter of the &smb.conf; file, the name resolution methods will be attempted in this order. </para></listitem> </varlistentry>'> <!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"/> parameter in the &smb.conf; file. +to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file. However, a command line setting will take precedence over settings in &smb.conf;.</para></listitem> @@ -318,7 +318,7 @@ <!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 @@ <!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 @@ <!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 @@ <!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.