From 54dbb030e2c6fed0abd0a3a89d08dad9b8a201a1 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Fri, 20 Feb 2009 09:20:16 +0100 Subject: s3/docs: Fix several typos. This fixes bug #6127. Thanks to Justin T Pryzby for the review! Karolin --- docs-xml/smbdotconf/security/clientlanmanauth.xml | 2 +- docs-xml/smbdotconf/security/clientsigning.xml | 3 +-- docs-xml/smbdotconf/security/lanmanauth.xml | 2 +- docs-xml/smbdotconf/security/passwordserver.xml | 2 +- docs-xml/smbdotconf/security/security.xml | 6 +++--- docs-xml/smbdotconf/security/serverschannel.xml | 2 +- docs-xml/smbdotconf/security/serversigning.xml | 3 +-- docs-xml/smbdotconf/security/smbencrypt.xml | 3 +-- docs-xml/smbdotconf/security/updateencrypted.xml | 4 ++-- 9 files changed, 12 insertions(+), 15 deletions(-) (limited to 'docs-xml/smbdotconf/security') diff --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml index 5266fef6a2..967eacf85b 100644 --- a/docs-xml/smbdotconf/security/clientlanmanauth.xml +++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml @@ -11,7 +11,7 @@ password hashes (e.g. Windows NT/2000, Samba, etc... but not Windows 95/98) will be able to be connected from the Samba client. - The LANMAN encrypted response is easily broken, due to it's + The LANMAN encrypted response is easily broken, due to its case-insensitive nature, and the choice of algorithm. Clients without Windows 95/98 servers are advised to disable this option. diff --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml index bf37cbb874..c657e05711 100644 --- a/docs-xml/smbdotconf/security/clientsigning.xml +++ b/docs-xml/smbdotconf/security/clientsigning.xml @@ -4,8 +4,7 @@ basic="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - This controls whether the client offers or requires - the server it talks to to use SMB signing. Possible values + This controls whether the client is allowed or required to use SMB signing. Possible values are auto, mandatory and disabled. diff --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml index 341952205f..4e68c5e03a 100644 --- a/docs-xml/smbdotconf/security/lanmanauth.xml +++ b/docs-xml/smbdotconf/security/lanmanauth.xml @@ -12,7 +12,7 @@ Windows 95/98 or the MS DOS network client) will be able to connect to the Samba host. - The LANMAN encrypted response is easily broken, due to it's + The LANMAN encrypted response is easily broken, due to its case-insensitive nature, and the choice of algorithm. Servers without Windows 95/98/ME or MS DOS clients are advised to disable this option. diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml index 0da247d27d..0e92af9eba 100644 --- a/docs-xml/smbdotconf/security/passwordserver.xml +++ b/docs-xml/smbdotconf/security/passwordserver.xml @@ -7,7 +7,7 @@ By specifying the name of another SMB server or Active Directory domain controller with this option, and using security = [ads|domain|server] - it is possible to get Samba to + it is possible to get Samba to do all its username/password validation using a specific remote server. This option sets the name or IP address of the password server to use. diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml index 3ad5175712..514ea54e0f 100644 --- a/docs-xml/smbdotconf/security/security.xml +++ b/docs-xml/smbdotconf/security/security.xml @@ -47,7 +47,7 @@ want to mainly setup shares without a password (guest shares). This is commonly used for a shared printer server. It is more difficult to setup guest shares with security = user, see - the parameter for details. + the parameter for details. It is possible to use smbd in a hybrid mode where it is offers both user and share @@ -58,7 +58,7 @@ SECURITY = SHARE - When clients connect to a share level security server they + When clients connect to a share level security server, they need not log onto the server with a valid username and password before attempting to connect to a shared resource (although modern clients such as Windows 95/98 and Windows NT will send a logon request with @@ -211,7 +211,7 @@ From the client's point of - view security = server is the + view, security = server is the same as security = user. It only affects how the server deals with the authentication, it does not in any way affect what the client sees. diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml index 6317448fb6..655463576f 100644 --- a/docs-xml/smbdotconf/security/serverschannel.xml +++ b/docs-xml/smbdotconf/security/serverschannel.xml @@ -13,7 +13,7 @@ - Please note that with this set to no you will have to apply the WindowsXP + Please note that with this set to no, you will have to apply the WindowsXP WinXP_SignOrSeal.reg registry patch found in the docs/registry subdirectory of the Samba distribution tarball. diff --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml index f2f5629586..ea21a2c6f6 100644 --- a/docs-xml/smbdotconf/security/serversigning.xml +++ b/docs-xml/smbdotconf/security/serversigning.xml @@ -5,8 +5,7 @@ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - This controls whether the server offers or requires - the client it talks to to use SMB signing. Possible values + This controls whether the client is allowed or required to use SMB signing. Possible values are auto, mandatory and disabled. diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml index eb91ce51fa..d556166953 100644 --- a/docs-xml/smbdotconf/security/smbencrypt.xml +++ b/docs-xml/smbdotconf/security/smbencrypt.xml @@ -16,8 +16,7 @@ and MacOS/X clients. Windows clients do not support this feature. - This controls whether the server offers or requires - the client it talks to to use SMB encryption. Possible values + This controls whether the remote client is allowed or required to use SMB encryption. Possible values are auto, mandatory and disabled. This may be set on a per-share basis, but clients may chose to encrypt the entire session, not diff --git a/docs-xml/smbdotconf/security/updateencrypted.xml b/docs-xml/smbdotconf/security/updateencrypted.xml index da493665cf..eb54ed9bab 100644 --- a/docs-xml/smbdotconf/security/updateencrypted.xml +++ b/docs-xml/smbdotconf/security/updateencrypted.xml @@ -9,7 +9,7 @@ This boolean parameter allows a user logging on with a plaintext password to have their encrypted (hashed) password in the smbpasswd file to be updated automatically as they log on. This option allows a site to migrate from plaintext password authentication (users authenticate with plaintext password over the - wire, and are checked against a UNIX account atabase) to encrypted password authentication (the SMB + wire, and are checked against a UNIX account database) to encrypted password authentication (the SMB challenge/response authentication mechanism) without forcing all users to re-enter their passwords via smbpasswd at the time the change is made. This is a convenience option to allow the change over to encrypted passwords to be made over a longer period. Once all users have encrypted representations of their passwords @@ -24,7 +24,7 @@ - Note that even when this parameter is set a user authenticating to smbd + Note that even when this parameter is set, a user authenticating to smbd must still enter a valid password in order to connect correctly, and to update their hashed (smbpasswd) passwords. -- cgit