diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/docbook/projdoc/Integrating-with-Windows.xml | 26 | ||||
| -rw-r--r-- | docs/docbook/projdoc/ServerType.xml | 18 | ||||
| -rw-r--r-- | docs/docbook/projdoc/locking.xml | 4 |
3 files changed, 24 insertions, 24 deletions
diff --git a/docs/docbook/projdoc/Integrating-with-Windows.xml b/docs/docbook/projdoc/Integrating-with-Windows.xml index e2d654e785..8d07b8a3fd 100644 --- a/docs/docbook/projdoc/Integrating-with-Windows.xml +++ b/docs/docbook/projdoc/Integrating-with-Windows.xml @@ -88,7 +88,7 @@ The key configuration files covered in this section are: <title><filename>/etc/hosts</filename></title> <para> -Contains a static list of IP Addresses and names. +Contains a static list of IP addresses and names. eg: </para> <para><screen> @@ -106,7 +106,7 @@ IP addresses. <para> Network packets that are sent over the physical network transport layer communicate not via IP addresses but rather using the Media -Access Control address, or MAC address. IP Addresses are currently +Access Control address, or MAC address. IP addresses are currently 32 bits in length and are typically presented as four (4) decimal numbers that are separated by a dot (or period). eg: 168.192.1.1. </para> @@ -265,12 +265,12 @@ Starting with version 2.2.0 samba has Linux support for extensions to the name service switch infrastructure so that linux clients will be able to obtain resolution of MS Windows NetBIOS names to IP Addresses. To gain this functionality Samba needs to be compiled -with appropriate arguments to the make command (ie: <userinput>make +with appropriate arguments to the make command (i.e.: <userinput>make nsswitch/libnss_wins.so</userinput>). The resulting library should then be installed in the <filename>/lib</filename> directory and the "wins" parameter needs to be added to the "hosts:" line in the <filename>/etc/nsswitch.conf</filename> file. At this point it -will be possible to ping any MS Windows machine by it's NetBIOS +will be possible to ping any MS Windows machine by its NetBIOS machine name, so long as that machine is within the workgroup to which both the samba machine and the MS Windows machine belong. </para> @@ -286,10 +286,10 @@ which both the samba machine and the MS Windows machine belong. MS Windows networking is predicated about the name each machine is given. This name is known variously (and inconsistently) as the "computer name", "machine name", "networking name", "netbios name", -"SMB name". All terms mean the same thing with the exception of +or "SMB name". All terms mean the same thing with the exception of "netbios name" which can apply also to the name of the workgroup or the domain name. The terms "workgroup" and "domain" are really just a -simply name with which the machine is associated. All NetBIOS names +simple name with which the machine is associated. All NetBIOS names are exactly 16 characters in length. The 16th character is reserved. It is used to store a one byte value that indicates service level information for the NetBIOS name that is registered. A NetBIOS machine @@ -332,8 +332,8 @@ wants to locate a domain logon server. It finds this service and the IP address of a server that provides it by performing a lookup (via a NetBIOS broadcast) for enumeration of all machines that have registered the name type *<1c>. A logon request is then sent to each -IP address that is returned in the enumerated list of IP addresses. Which -ever machine first replies then ends up providing the logon services. +IP address that is returned in the enumerated list of IP addresses. +Whichever machine first replies then ends up providing the logon services. </para> <para> @@ -513,10 +513,10 @@ every way the equivalent of the Unix/Linux <filename>/etc/hosts</filename> file. <para> This capability is configured in the TCP/IP setup area in the network -configuration facility. If enabled an elaborate name resolution sequence -is followed the precise nature of which is dependant on what the NetBIOS -Node Type parameter is configured to. A Node Type of 0 means use -NetBIOS broadcast (over UDP broadcast) is first used if the name +configuration facility. If enabled, an elaborate name resolution sequence +is followed the precise nature of which is dependant on how the NetBIOS +Node Type parameter is configured. A Node Type of 0 means that +NetBIOS broadcast (over UDP broadcast) is used if the name that is the subject of a name lookup is not found in the NetBIOS name cache. If that fails then DNS, HOSTS and LMHOSTS are checked. If set to Node Type 8, then a NetBIOS Unicast (over UDP Unicast) is sent to the @@ -664,7 +664,7 @@ carelessness. Of course, no one is every deliberately careless! <para> In the above example, FRODO is the Samba server and SLACK is the MS Windows NT4 Workstation. - The first listing shows the contents of the Local Name Table (ie: Identity information on + The first listing shows the contents of the Local Name Table (i.e.: Identity information on the MS Windows workstation), the second shows the NetBIOS name in the NetBIOS name cache. The name cache contains the remote machines known to this workstation. </para> diff --git a/docs/docbook/projdoc/ServerType.xml b/docs/docbook/projdoc/ServerType.xml index 6711f58db9..c740fbefb1 100644 --- a/docs/docbook/projdoc/ServerType.xml +++ b/docs/docbook/projdoc/ServerType.xml @@ -314,9 +314,9 @@ figures this out from the &smb.conf; file settings. <para> Use of this mode of authentication does require there to be a standard Unix account -for each user in order to assign a uid once the account has been authenticated by +for each user in order to assign a UID once the account has been authenticated by the remote Windows DC. This account can be blocked to prevent logons by clients other than -MS Windows through things such as setting an invalid shell in the +MS Windows through means such as setting an invalid shell in the <filename>/etc/passwd</filename> entry. </para> @@ -451,8 +451,8 @@ This method involves the additions of the following parameters in the &smb.conf; <para> -There are two ways of identifying whether or not a username and password pair was valid -or not. One uses the reply information provided as part of the authentication messaging +There are two ways of identifying whether or not a username and password pair was valid. +One uses the reply information provided as part of the authentication messaging process, the other uses just an error code. </para> @@ -540,16 +540,16 @@ when using clear text authentication. <para> By default Samba will lower case the username before attempting to lookup the user in the database of local system accounts. Because UNIX usernames conventionally -only contain lower case character, the <parameter>username level</parameter> parameter +only contain lower-case characters, the <parameter>username level</parameter> parameter is rarely needed. </para> <para> -However, passwords on UNIX systems often make use of mixed case characters. +However, passwords on UNIX systems often make use of mixed-case characters. This means that in order for a user on a Windows 9x client to connect to a Samba server using clear text authentication, the <parameter>password level</parameter> -must be set to the maximum number of upper case letter which <emphasis>could</emphasis> -appear is a password. Note that the server OS uses the traditional DES version +must be set to the maximum number of upper case letters which <emphasis>could</emphasis> +appear in a password. Note that the server OS uses the traditional DES version of crypt(), a <parameter>password level</parameter> of 8 will result in case insensitive passwords as seen from Windows users. This will also result in longer login times as Samba has to compute the permutations of the password string and @@ -557,7 +557,7 @@ try them one by one until a match is located (or all combinations fail). </para> <para> -The best option to adopt is to enable support for encrypted passwords where ever +The best option to adopt is to enable support for encrypted passwords wherever Samba is used. Most attempts to apply the registry change to re-enable plain text passwords will eventually lead to user complaints and unhappiness. </para> diff --git a/docs/docbook/projdoc/locking.xml b/docs/docbook/projdoc/locking.xml index 002894affe..0e508f682a 100644 --- a/docs/docbook/projdoc/locking.xml +++ b/docs/docbook/projdoc/locking.xml @@ -62,7 +62,7 @@ that are specified when a file is open. </para> <para> -Record locking semantics under Unix is very different from record locking under +Record locking semantics under Unix are very different from record locking under Windows. Versions of Samba before 2.2 have tried to use the native fcntl() unix system call to implement proper record locking between different Samba clients. This can not be fully correct due to several reasons. The simplest is the fact @@ -90,7 +90,7 @@ will make lock checking calls on every read and write. </para> <para> -You can also disable by range locking completely using <parameter>locking = no</parameter>. +You can also disable byte range locking completely using <parameter>locking = no</parameter>. This is useful for those shares that don't support locking or don't need it (such as cdroms). In this case Samba fakes the return codes of locking calls to tell clients that everything is OK. |