From e42e87d5449f68d249aa3b96bf73e4bae20c2772 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Tue, 8 May 2012 12:01:28 +0200 Subject: [PATCH] s3-docs: Fix several typos. Part of a fix for bug #7938. Based on a patch provided by John Bradshaw . Karolin Autobuild-User: Karolin Seeger Autobuild-Date: Tue May 8 13:56:32 CEST 2012 on sn-devel-104 --- docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml | 2 +- docs-xml/Samba3-Developers-Guide/unix-smb.xml | 2 +- docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml | 2 +- docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml | 2 +- docs-xml/manpages-3/idmap_nss.8.xml | 2 +- docs-xml/manpages-3/ldbsearch.1.xml | 2 +- docs-xml/manpages-3/libsmbclient.7.xml | 2 +- docs-xml/manpages-3/net.8.xml | 2 +- docs-xml/manpages-3/ntlm_auth.1.xml | 12 ++++++------ docs-xml/manpages-3/pdbedit.8.xml | 20 ++++++++++---------- docs-xml/manpages-3/rpcclient.1.xml | 2 +- docs-xml/manpages-3/smbclient.1.xml | 6 +++--- docs-xml/manpages-3/smbcontrol.1.xml | 2 +- docs-xml/manpages-3/smbcquotas.1.xml | 2 +- docs-xml/manpages-3/smbd.8.xml | 8 ++++---- docs-xml/manpages-3/tdbbackup.8.xml | 4 ++-- docs-xml/manpages-3/testparm.1.xml | 2 +- docs-xml/manpages-3/vfs_readonly.8.xml | 2 +- docs-xml/manpages-3/vfs_shadow_copy2.8.xml | 2 +- docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 6 +++--- docs-xml/smbdotconf/filename/maxstatcachesize.xml | 2 +- docs-xml/using_samba/ch07.xml | 2 +- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml index 9ea500403b3..3cacc714ab9 100644 --- a/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml +++ b/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml @@ -3881,7 +3881,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\ Note: If MS Outlook has been configured to use an IMAP account configuration there may be problems following these instructions. Feedback from users suggests that where IMAP is used the PST file is used to store rules and filters. When the PST store is relocated it appears to break - MS Outlook's Send/Receive button. If anyone has sucessfully relocated PST files where IMAP is + MS Outlook's Send/Receive button. If anyone has successfully relocated PST files where IMAP is used please email jht@samba.org with useful tips and suggestions so that this warning can be removed or modified. diff --git a/docs-xml/Samba3-Developers-Guide/unix-smb.xml b/docs-xml/Samba3-Developers-Guide/unix-smb.xml index b700dfc9dc4..ae6bdcdb0db 100644 --- a/docs-xml/Samba3-Developers-Guide/unix-smb.xml +++ b/docs-xml/Samba3-Developers-Guide/unix-smb.xml @@ -299,7 +299,7 @@ doesn't support them all. Samba currently supports up to the "NT LM 0.12" protocol, which is the one preferred by Win95 and WinNT3.5. Luckily this protocol level has a "capabilities" field which specifies which super-duper new-fangled -options the server suports. This helps to make the implementation of +options the server supports. This helps to make the implementation of this protocol level much easier. diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml index 2a4bfb9bf55..9bda64d275b 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml @@ -24,7 +24,7 @@ tdb -currupted +corrupted backup restore Those who package Samba for commercial distribution with operating systems and appliances would do well to take diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml index 91e9712cb57..933efb512e1 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml @@ -916,7 +916,7 @@ max lru files entries = 100 lru file entry lifetime = 5 ; exclude files from being scanned based on the MIME-type! Semi-colon -; seperated list (default: empty list). Use this with care! +; separated list (default: empty list). Use this with care! exclude file types = ; socket name of clamd (default: /var/run/clamd). Setting will be ignored if diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages-3/idmap_nss.8.xml index 576eef666a9..565019cd3df 100644 --- a/docs-xml/manpages-3/idmap_nss.8.xml +++ b/docs-xml/manpages-3/idmap_nss.8.xml @@ -20,7 +20,7 @@ DESCRIPTION The idmap_nss plugin provides a means to map Unix users and groups - to Windows accounts and obseletes the "winbind trusted domains only" + to Windows accounts and obsoletes the "winbind trusted domains only" smb.conf option. This provides a simple means of ensuring that the SID for a Unix user named jsmith is reported as the one assigned to DOMAIN\jsmith which is necessary for reporting ACLs on files and printers diff --git a/docs-xml/manpages-3/ldbsearch.1.xml b/docs-xml/manpages-3/ldbsearch.1.xml index 826c5248855..6882c56bfe4 100644 --- a/docs-xml/manpages-3/ldbsearch.1.xml +++ b/docs-xml/manpages-3/ldbsearch.1.xml @@ -22,7 +22,7 @@ -h -s base|one|sub -b basedn - -i + -i -H LDB-URL expression attributes diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml index 2e54aa0bc00..277caf36184 100644 --- a/docs-xml/manpages-3/libsmbclient.7.xml +++ b/docs-xml/manpages-3/libsmbclient.7.xml @@ -71,7 +71,7 @@ responsibility of the application that calls this library to set this to a sensible value. This is a compile-time option. This value determines the maximum number of local master browsers to query for the list of workgroups. In order to ensure that the list is complete for those present - on the network, all master browsers must be querried. If there are a large number of workgroups + on the network, all master browsers must be queried. If there are a large number of workgroups on the network, the time spent querying will be significant. For small networks (just a few workgroups), it is suggested to set this value to 0, instructing libsmbclient to query all local master browsers. In an environment that has many workgroups a more reasonable setting may be around 3. diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml index 355e3f782db..7f2b4a7e8dd 100644 --- a/docs-xml/manpages-3/net.8.xml +++ b/docs-xml/manpages-3/net.8.xml @@ -2173,7 +2173,7 @@ Joins a computer into a domain. This command supports the following additional p DOMAIN can be a NetBIOS domain name (also known as short domain name) or a DNS domain name for Active Directory Domains. As in Windows, it is also possible to control which Domain Controller to use. This can be achieved by appending the DC name using the \ separator character. Example: MYDOM\MYDC. The DOMAIN parameter cannot be NULL. -OU can be set to a RFC 1779 LDAP DN, like ou=mymachines,cn=Users,dc=example,dc=com in order to create the machine account in a non-default LDAP containter. This optional parameter is only supported when joining Active Directory Domains. +OU can be set to a RFC 1779 LDAP DN, like ou=mymachines,cn=Users,dc=example,dc=com in order to create the machine account in a non-default LDAP container. This optional parameter is only supported when joining Active Directory Domains. ACCOUNT defines a domain account that will be used to join the machine to the domain. This domain account needs to have sufficient privileges to join machines. diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml index 69264d7ec64..dcf9b425031 100644 --- a/docs-xml/manpages-3/ntlm_auth.1.xml +++ b/docs-xml/manpages-3/ntlm_auth.1.xml @@ -199,7 +199,7 @@ MSCHAPv2) generated in some way by both the server and the client. - LANMAN-Challege: 0102030405060708 + LANMAN-Challenge: 0102030405060708 @@ -239,7 +239,7 @@ Request-User-Session-Key - Apon sucessful authenticaiton, return + Upon successful authenticaiton, return the user session key associated with the login. Request-User-Session-Key: Yes @@ -248,14 +248,14 @@ Request-LanMan-Session-Key - Apon sucessful authenticaiton, return + Upon successful authenticaiton, return the LANMAN session key associated with the login. Request-LanMan-Session-Key: Yes - Implementors should take care to base64 encode + Implementers should take care to base64 encode any data (such as usernames/passwords) that may contain malicous user data, such as a newline. They may also need to decode strings from the helper, which likewise may have been base64 encoded. @@ -319,7 +319,7 @@ --request-lm-key - Retreive LM session key + Retrieve LM session key @@ -380,7 +380,7 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m TROUBLESHOOTING If you're experiencing problems with authenticating Internet Explorer running - under MS Windows 9X or Millenium Edition against ntlm_auth's NTLMSSP authentication + under MS Windows 9X or Millennium Edition against ntlm_auth's NTLMSSP authentication helper (--helper-protocol=squid-2.5-ntlmssp), then please read the Microsoft Knowledge Base article #239869 and follow instructions described there. diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml index fa8cabcdde5..1d0752e2347 100644 --- a/docs-xml/manpages-3/pdbedit.8.xml +++ b/docs-xml/manpages-3/pdbedit.8.xml @@ -72,7 +72,7 @@ without changing the tool). There are five main ways to use pdbedit: adding a user account, - removing a user account, modifing a user account, listing user + removing a user account, modifying a user account, listing user accounts, importing users accounts. @@ -162,7 +162,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: -f|--fullname fullname This option can be used while adding or - modifing a user account. It will specify the user's full + modifying a user account. It will specify the user's full name. Example: -f "Simo Sorce" @@ -172,7 +172,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: -h|--homedir homedir This option can be used while adding or - modifing a user account. It will specify the user's home + modifying a user account. It will specify the user's home directory network path. Example: -h "\\\\BERSERKER\\sorce" @@ -183,7 +183,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: -D|--drive drive This option can be used while adding or - modifing a user account. It will specify the windows drive + modifying a user account. It will specify the windows drive letter to be used to map the home directory. Example: -D "H:" @@ -195,7 +195,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: -S|--script script This option can be used while adding or - modifing a user account. It will specify the user's logon + modifying a user account. It will specify the user's logon script path. Example: -S "\\\\BERSERKER\\netlogon\\sorce.bat" @@ -207,7 +207,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: -p|--profile profile This option can be used while adding or - modifing a user account. It will specify the user's profile + modifying a user account. It will specify the user's profile directory. Example: -p "\\\\BERSERKER\\netlogon" @@ -447,7 +447,7 @@ account policy value for bad lockout attempt is now 3 -N|--account-desc description This option can be used while adding or - modifing a user account. It will specify the user's description + modifying a user account. It will specify the user's description field. Example: -N "test description" @@ -458,7 +458,7 @@ account policy value for bad lockout attempt is now 3 -Z|--logon-hours-reset This option can be used while adding or - modifing a user account. It will reset the user's allowed logon + modifying a user account. It will reset the user's allowed logon hours. A user may login at any time afterwards. Example: -Z @@ -469,7 +469,7 @@ account policy value for bad lockout attempt is now 3 -z|--bad-password-count-reset This option can be used while adding or - modifing a user account. It will reset the stored bad login + modifying a user account. It will reset the stored bad login counter from a specified user. Example: -z @@ -490,7 +490,7 @@ account policy value for bad lockout attempt is now 3 -I|--domain This option can be used while adding or - modifing a user account. It will specify the user's domain field. + modifying a user account. It will specify the user's domain field. Example: -I "MYDOMAIN" diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml index 46d56ee5602..275acf90c1e 100644 --- a/docs-xml/manpages-3/rpcclient.1.xml +++ b/docs-xml/manpages-3/rpcclient.1.xml @@ -277,7 +277,7 @@ Comma Separated list of Files Delete the specified printer driver and optionally files associated with the driver. You can limit this action to a specific architecture and a specific version. - If no architecure is given, all driver files of that driver will be deleted. + If no architecture is given, all driver files of that driver will be deleted. flags correspond to numeric DPD_* values, i.e. a value of 3 requests (DPD_DELETE_UNUSED_FILES | DPD_DELETE_SPECIFIC_VERSION). diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml index c79d9dfbf87..d815dcd6da7 100644 --- a/docs-xml/manpages-3/smbclient.1.xml +++ b/docs-xml/manpages-3/smbclient.1.xml @@ -322,7 +322,7 @@ server support the UNIX extensions. Request that the connection be encrypted. This is new for Samba 3.2 and will only work with Samba 3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses - the given credentials for the encryption negotiaion (either kerberos + the given credentials for the encryption negotiation (either kerberos or NTLMv1/v2 if given domain/username/password triple. Fails the connection if encryption cannot be negotiated. @@ -428,7 +428,7 @@ Restore from tar file backup.tar into myshare on mypc (no password on share). - smbclient //mypc/yshare "" -N -Tx backup.tar + smbclient //mypc/myshare "" -N -Tx backup.tar Restore everything except users/docs @@ -645,7 +645,7 @@ du <filename> - Does a directory listing and then prints out the current disk useage and free space on a share. + Does a directory listing and then prints out the current disk usage and free space on a share. diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml index f76424667e7..fbed772039b 100644 --- a/docs-xml/manpages-3/smbcontrol.1.xml +++ b/docs-xml/manpages-3/smbcontrol.1.xml @@ -214,7 +214,7 @@ Note that this message only sends notification that an - event has occured. It doesn't actually cause the + event has occurred. It doesn't actually cause the event to happen. diff --git a/docs-xml/manpages-3/smbcquotas.1.xml b/docs-xml/manpages-3/smbcquotas.1.xml index a94ceac37d3..de43878ca70 100644 --- a/docs-xml/manpages-3/smbcquotas.1.xml +++ b/docs-xml/manpages-3/smbcquotas.1.xml @@ -118,7 +118,7 @@ - QUOTA_SET_COMAND + QUOTA_SET_COMMAND The format of an the QUOTA_SET_COMMAND is an operation name followed by a set of parameters specific to that operation. diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages-3/smbd.8.xml index 3d41d74f22c..618ff821f40 100644 --- a/docs-xml/manpages-3/smbd.8.xml +++ b/docs-xml/manpages-3/smbd.8.xml @@ -239,19 +239,19 @@ password), for account checking (is this account disabled?) and for session management. The degree too which samba supports PAM is restricted by the limitations of the SMB protocol and the smb.conf - 5 paramater. When this is set, the following restrictions apply: + 5 parameter. When this is set, the following restrictions apply: Account Validation: All accesses to a samba server are checked - against PAM to see if the account is vaild, not disabled and is permitted to + against PAM to see if the account is valid, not disabled and is permitted to login at this time. This also applies to encrypted logins. Session Management: When not using share - level secuirty, users must pass PAM's session checks before access - is granted. Note however, that this is bypassed in share level secuirty. + level security, users must pass PAM's session checks before access + is granted. Note however, that this is bypassed in share level security. Note also that some older pam configuration files may need a line added for session support. diff --git a/docs-xml/manpages-3/tdbbackup.8.xml b/docs-xml/manpages-3/tdbbackup.8.xml index 78fe32eb8ec..93f773feb86 100644 --- a/docs-xml/manpages-3/tdbbackup.8.xml +++ b/docs-xml/manpages-3/tdbbackup.8.xml @@ -54,7 +54,7 @@ -s suffix - The -s option allows the adminisistrator to specify a file + The -s option allows the administrator to specify a file backup extension. This way it is possible to keep a history of tdb backup files by using a new suffix for each backup. @@ -63,7 +63,7 @@ -v - The -v will check the database for damages (currupt data) + The -v will check the database for damages (corrupt data) which if detected causes the backup to be restored. diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages-3/testparm.1.xml index 4cc4e270bbf..8d7cc222041 100644 --- a/docs-xml/manpages-3/testparm.1.xml +++ b/docs-xml/manpages-3/testparm.1.xml @@ -93,7 +93,7 @@ Dumps the named parameter. If no section-name is set the view is limited by default to the global section. - It is also possible to dump a parametrical option. Therfore + It is also possible to dump a parametrical option. Therefore the option has to be separated by a colon from the parametername. diff --git a/docs-xml/manpages-3/vfs_readonly.8.xml b/docs-xml/manpages-3/vfs_readonly.8.xml index 06e5f23ea8e..fee947b53e6 100644 --- a/docs-xml/manpages-3/vfs_readonly.8.xml +++ b/docs-xml/manpages-3/vfs_readonly.8.xml @@ -32,7 +32,7 @@ The vfs_readonly VFS module marks a share as read only for all clients connecting within the configured time period. Clients connecting during this time will be denied - write access to all files in the share, irrespective of ther + write access to all files in the share, irrespective of their actual access privileges. This module is stackable. diff --git a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml index 9f4ae2bffae..e5171bbaa4e 100644 --- a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml +++ b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml @@ -167,7 +167,7 @@ shadow_copy2 - /data/snaphots + /data/snapshots /data/home desc diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index 8df9751aa4d..86ae3f3b7c8 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -63,7 +63,7 @@ vfs_smb_traffic_analyzer sends the following data - in a fixed format seperated by a comma through either an internet or a + in a fixed format separated by a comma through either an internet or a unix domain socket: BYTES|USER|DOMAIN|READ/WRITE|SHARE|FILENAME|TIMESTAMP @@ -76,9 +76,9 @@ USER - the user who initiated the operation DOMAIN - the domain of the user READ/WRITE - either "W" for a write operation or "R" for read - SHARE - the name of the share on which the VFS operation occured + SHARE - the name of the share on which the VFS operation occurred FILENAME - the name of the file that was used by the VFS operation - TIMESTAMP - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured + TIMESTAMP - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occurred IP - The IP Address (v4 or v6) of the client machine that initiated the VFS operation. diff --git a/docs-xml/smbdotconf/filename/maxstatcachesize.xml b/docs-xml/smbdotconf/filename/maxstatcachesize.xml index 590b21615d9..d341beb4f85 100644 --- a/docs-xml/smbdotconf/filename/maxstatcachesize.xml +++ b/docs-xml/smbdotconf/filename/maxstatcachesize.xml @@ -9,7 +9,7 @@ to speed up case insensitive name mappings. It represents the number of kilobyte (1024) units the stat cache can use. A value of zero, meaning unlimited, is not advisable due to - increased memory useage. You should not need to change this + increased memory usage. You should not need to change this parameter. diff --git a/docs-xml/using_samba/ch07.xml b/docs-xml/using_samba/ch07.xml index 9ecdae70495..307cab720df 100644 --- a/docs-xml/using_samba/ch07.xml +++ b/docs-xml/using_samba/ch07.xml @@ -339,7 +339,7 @@ Printer name lp is valid. A common problem with Samba printer configuration is forgetting to use the full pathnamesprinter configuration and -printingpathnames used in comands forpathnames for commands; simple commands often don't work because the guest account's PATH doesn't include them. Another frequent problem is not having the correct permissionsfor printing +printingpathnames used in commands forpathnames for commands; simple commands often don't work because the guest account's PATH doesn't include them. Another frequent problem is not having the correct permissionsfor printing printingpermissions forpermissions on the spooling directory. -- 2.11.4.GIT