diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /docs-xml/smbdotconf/protocol | |
parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'docs-xml/smbdotconf/protocol')
-rw-r--r-- | docs-xml/smbdotconf/protocol/announceas.xml | 21 | ||||
-rw-r--r-- | docs-xml/smbdotconf/protocol/announceversion.xml | 14 | ||||
-rw-r--r-- | docs-xml/smbdotconf/protocol/eventloglist.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/protocol/usespnego.xml | 2 |
4 files changed, 2 insertions, 37 deletions
diff --git a/docs-xml/smbdotconf/protocol/announceas.xml b/docs-xml/smbdotconf/protocol/announceas.xml deleted file mode 100644 index 8891496194..0000000000 --- a/docs-xml/smbdotconf/protocol/announceas.xml +++ /dev/null @@ -1,21 +0,0 @@ -<samba:parameter name="announce as" - context="G" - type="string" - developer="1" - xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> -<description> - <para>This specifies what type of server <citerefentry><refentrytitle>nmbd</refentrytitle> - <manvolnum>8</manvolnum></citerefentry> will announce itself as, to a network neighborhood browse - list. By default this is set to Windows NT. The valid options - are : "NT Server" (which can also be written as "NT"), - "NT Workstation", "Win95" or "WfW" meaning Windows NT Server, - Windows NT Workstation, Windows 95 and Windows for Workgroups - respectively. Do not change this parameter unless you have a - specific need to stop Samba appearing as an NT server as this - may prevent Samba servers from participating as browser servers - correctly.</para> -</description> - -<value type="default">NT Server</value> -<value type="example">Win95</value> -</samba:parameter> diff --git a/docs-xml/smbdotconf/protocol/announceversion.xml b/docs-xml/smbdotconf/protocol/announceversion.xml deleted file mode 100644 index ecdcd4c734..0000000000 --- a/docs-xml/smbdotconf/protocol/announceversion.xml +++ /dev/null @@ -1,14 +0,0 @@ -<samba:parameter name="announce version" - context="G" - developer="1" - type="string" - xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> -<description> - <para>This specifies the major and minor version numbers - that nmbd will use when announcing itself as a server. The default - is 4.9. Do not change this parameter unless you have a specific - need to set a Samba server to be a downlevel server.</para> -</description> -<value type="default">4.9</value> -<value type="example">2.0</value> -</samba:parameter> diff --git a/docs-xml/smbdotconf/protocol/eventloglist.xml b/docs-xml/smbdotconf/protocol/eventloglist.xml index e98559bc17..101821ad12 100644 --- a/docs-xml/smbdotconf/protocol/eventloglist.xml +++ b/docs-xml/smbdotconf/protocol/eventloglist.xml @@ -6,7 +6,7 @@ <para>This option defines a list of log names that Samba will report to the Microsoft EventViewer utility. The listed eventlogs will be associated with tdb file on disk in the - <filename>$(lockdir)/eventlog</filename>. + <filename>$(statedir)/eventlog</filename>. </para> <para> diff --git a/docs-xml/smbdotconf/protocol/usespnego.xml b/docs-xml/smbdotconf/protocol/usespnego.xml index 8fb559c177..e16c7ce2be 100644 --- a/docs-xml/smbdotconf/protocol/usespnego.xml +++ b/docs-xml/smbdotconf/protocol/usespnego.xml @@ -4,7 +4,7 @@ developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This variable controls controls whether samba will try + <para>This deprecated variable controls controls whether samba will try to use Simple and Protected NEGOciation (as specified by rfc2478) with WindowsXP and Windows2000 clients to agree upon an authentication mechanism. </para> |