[SCM] Samba Shared Repository - branch master updated

Garming Sam garming at samba.org
Wed Feb 22 11:22:03 UTC 2017


The branch, master has been updated
       via  b5226ac fix spelling of 'unchangeable'
       via  5089e03 Correct "Openened" typos.
       via  4342136 Correct "allready" typos.
       via  8de5c2e Correct "heirarchy" typos.
       via  7e20f1e Correct "incluing" typos.
       via  094e987 Correct "initialze" typos.
       via  98453b0 Correct "succeded" typos.
       via  875f45b Correct "hexidecimal" typos.
       via  fccdf34 Correct "updateing" typos.
       via  5c20790 Correct "unavaible" typos.
       via  8fcc49e Correct "allignment" typos.
       via  e0366ea Correct "paramaters" typos.
       via  45b14b1 Correct "explicity" typos.
       via  6e2869a Correct "encyption" typos.
       via  a4e8f8a Correct "relase" typos.
       via  a2fbe8b Correct "intialise" typos.
       via  1134f4f Correct "cleint" typos.
       via  06df7ae Correct "somthing" typos.
       via  bca0d8e Correct "defered" typos.
       via  db3dd6f Correct "specifiy" typos.
       via  563c1c36 Correct "notifiying" typos.
       via  1e0bca1 Correct "seperate" typos.
       via  4ff2923 Correct "follwing" typos.
       via  5482e54 Correct "existence" typos.
       via  9f03cf9 Correct "formated" typos.
       via  809aa6f Correct "descriptior" typos.
       via  093003e Correct "perfom" typos.
       via  fa6eb44 Correct "coult" typo.
       via  1429428 Correct "errror" typos.
       via  39f2579 Correct "successfuly" typos.
       via  ebe2f08 Correct "enought" typo.
       via  afa9bb4 Correct "extention" typos.
       via  edcf565 Correct "Controler" typos.
       via  6e4744d Correct "acheive" typos.
       via  3bf0fc7 Correct "paramter" typos.
       via  897375e Correct "overriden" typos.
       via  a4ab7c7 Correct "occured" typos.
       via  f7dc9f1 Correct "supressed" typo.
       via  7d1c3fc Correct "recived" typo.
       via  e1effc7 Correct "progess" typo.
       via  fed795f Correct "emty" typo.
       via  c4feed0 Correct "doesnt" typos.
      from  021189e vfs_streams_xattr: use fsp, not base_fsp

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b5226ac50264c395d3fcdfabb12052b52e59cf94
Author: Edward Betts <edward at 4angle.com>
Date:   Thu Jan 26 21:41:12 2017 +0000

    fix spelling of 'unchangeable'
    
    Signed-off-by: Edward Betts <edward at 4angle.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Wed Feb 22 12:21:51 CET 2017 on sn-devel-144

commit 5089e03b1e973a3ee279e8d9f6609fa987562f2f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:02:23 2017 +1300

    Correct "Openened" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 43421364ac980763402f0275daab80866df51ec2
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:02:09 2017 +1300

    Correct "allready" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 8de5c2e9675c48ba9de868c571c191a29a2fd5e6
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:01:58 2017 +1300

    Correct "heirarchy" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 7e20f1e2003f6d966a01cecff39417e428d75180
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:01:50 2017 +1300

    Correct "incluing" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 094e987b87c98359dac7a338a55da470901c8f61
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:01:22 2017 +1300

    Correct "initialze" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 98453b0dbb93351bba22104bd218a75139b3542e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:01:10 2017 +1300

    Correct "succeded" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 875f45b3f137c82b0edba26f18cd4d536cf018cc
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:52 2017 +1300

    Correct "hexidecimal" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit fccdf34a0f7ebe510769743a99b9ef2da2a20045
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:39 2017 +1300

    Correct "updateing" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 5c20790272456e547afb0ad72fb9284e2f14de30
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:31 2017 +1300

    Correct "unavaible" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 8fcc49ecd44e69d7f9ada212c63896e0dcf488a4
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:26 2017 +1300

    Correct "allignment" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit e0366ea49d5daa8fbf8b2ca22b1d3c77cc2daf9a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:21 2017 +1300

    Correct "paramaters" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 45b14b18fe3f01ae8ea22afcd112205b8a4cf9bc
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:16 2017 +1300

    Correct "explicity" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 6e2869ab1003f9411bc6fe20f6756d36c05a22f9
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:10 2017 +1300

    Correct "encyption" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit a4e8f8aa444e2a28ac457be15a40dbef1d755299
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 09:00:05 2017 +1300

    Correct "relase" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit a2fbe8b915043abcd0a726b06fee3a265d2ad6e6
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:59:59 2017 +1300

    Correct "intialise" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 1134f4f177efa807d45b96502ef6d7d34428bdb4
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:59:54 2017 +1300

    Correct "cleint" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 06df7ae92731b59e71a20cd32411cbf4a6c28f47
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:59:42 2017 +1300

    Correct "somthing" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit bca0d8ee673b86d374840591002229783c06128d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:59:36 2017 +1300

    Correct "defered" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit db3dd6fb5fd4869beedc2bb65570ef36e93f4ad9
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:59:19 2017 +1300

    Correct "specifiy" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 563c1c3623b6f4702f3ff8125b05753e9d21985b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:59:08 2017 +1300

    Correct "notifiying" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 1e0bca1e6c37ca879b6e280ff3d8faeeea96010f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:57:55 2017 +1300

    Correct "seperate" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 4ff2923d1c6996781462d5c65bd5f4a2715daed1
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:56:47 2017 +1300

    Correct "follwing" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 5482e5426e09667d26e04dd0c6e0107e46e1028f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:56:18 2017 +1300

    Correct "existence" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 9f03cf91235641d017e31abc3856df994e6d1cf2
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:54:58 2017 +1300

    Correct "formated" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 809aa6f99332d0307e1dddd068f90fce1dc0dcbd
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:54:26 2017 +1300

    Correct "descriptior" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 093003e06190b1c16a1a3b43220829c6f7056239
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:53:39 2017 +1300

    Correct "perfom" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit fa6eb442fb5a59bc322c4fbb15493d7d0d1e9834
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:52:38 2017 +1300

    Correct "coult" typo.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 1429428caa5c2e81f2ac71c42c124a0f5c64cae7
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:52:09 2017 +1300

    Correct "errror" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 39f2579a545c2249441ab593ebc3bfa3d01a739d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:51:29 2017 +1300

    Correct "successfuly" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit ebe2f08b669c045ab5200053ba1ec3703e7e4692
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:50:45 2017 +1300

    Correct "enought" typo.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit afa9bb4ac55d616fe7816e3830bab5e3a51aed7a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:50:20 2017 +1300

    Correct "extention" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit edcf56522cdf2a1df1295e73e891bac555296396
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:49:06 2017 +1300

    Correct "Controler" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 6e4744df8327d8c389e7c44a602329b400254959
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:48:31 2017 +1300

    Correct "acheive" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 3bf0fc7d76c266447c1b1505e7437b1eca33c491
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:47:55 2017 +1300

    Correct "paramter" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 897375e67588b48a622bb7db885d15224ee53ec9
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:47:12 2017 +1300

    Correct "overriden" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit a4ab7c73bda018147ca4e8645352503c2382fb74
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Feb 18 08:46:28 2017 +1300

    Correct "occured" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit f7dc9f1e12b2413d0be290e21986e22f57ab8b08
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Feb 17 22:51:52 2017 +1300

    Correct "supressed" typo.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 7d1c3fce6521bc6d723c9c2c7b5738aa1e7bd8a9
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Feb 17 22:50:54 2017 +1300

    Correct "recived" typo.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit e1effc7e40724552a7ce7f80300845d4e086f9e7
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Feb 17 22:50:24 2017 +1300

    Correct "progess" typo.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit fed795fe1d5115cee78cf53301dbc38ef8deb8b9
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Feb 17 22:49:57 2017 +1300

    Correct "emty" typo.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit c4feed0b8cb6df71e14a30c07e4b5560368f54cc
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Feb 17 22:49:29 2017 +1300

    Correct "doesnt" typos.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 auth/gensec/gensec.c                               |  2 +-
 auth/ntlmssp/ntlmssp_sign.c                        |  2 +-
 ctdb/client/ctdb_client.c                          |  2 +-
 ctdb/common/ctdb_ltdb.c                            |  2 +-
 ctdb/common/rb_tree.c                              |  2 +-
 ctdb/doc/ctdb-tunables.7.xml                       |  2 +-
 ctdb/doc/ctdb.1.xml                                |  2 +-
 ctdb/doc/ctdb.7.xml                                |  2 +-
 ctdb/doc/ctdbd.conf.5.xml                          |  2 +-
 ctdb/doc/recovery-process.txt                      |  6 +--
 ctdb/server/ctdb_recoverd.c                        |  2 +-
 ctdb/server/ctdb_takeover.c                        |  6 +--
 docs-xml/Samba3-ByExample/SBE-HighAvailability.xml |  2 +-
 docs-xml/Samba3-Developers-Guide/cifsntdomain.xml  |  2 +-
 docs-xml/Samba3-Developers-Guide/vfs.xml           |  2 +-
 docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml      |  2 +-
 docs-xml/manpages/vfs_btrfs.8.xml                  |  2 +-
 docs-xml/manpages/vfs_glusterfs.8.xml              |  2 +-
 docs-xml/smbdotconf/filename/hideunreadable.xml    |  2 +-
 .../smbdotconf/filename/hideunwriteablefiles.xml   |  2 +-
 docs-xml/smbdotconf/misc/rpcdaemon.xml             |  2 +-
 docs-xml/smbdotconf/misc/spotlight.xml             |  2 +-
 .../security/kerberosencryptiontypes.xml           |  2 +-
 docs-xml/using_samba/ch01.xml                      |  2 +-
 docs-xml/using_samba/ch04.xml                      |  4 +-
 docs-xml/using_samba/ch06.xml                      |  4 +-
 docs-xml/using_samba/ch08.xml                      |  6 +--
 docs-xml/xslt/latex/sambadoc.cls                   |  2 +-
 examples/libsmbclient/testutime.c                  |  2 +-
 examples/misc/adssearch.pl                         |  4 +-
 lib/krb5_wrap/krb5_samba.c                         | 10 ++---
 lib/replace/snprintf.c                             |  2 +-
 lib/replace/wscript                                |  2 +-
 lib/smbconf/smbconf.h                              | 44 +++++++++++-----------
 lib/util/modules.c                                 |  2 +-
 libcli/smb/smb_signing.c                           |  2 +-
 nsswitch/pam_winbind.c                             |  2 +-
 python/samba/netcmd/__init__.py                    |  2 +-
 python/samba/netcmd/user.py                        | 10 ++---
 python/samba/tests/dcerpc/dnsserver.py             |  2 +-
 python/samba/tests/kcc/__init__.py                 |  2 +-
 python/samba/tests/samba_tool/base.py              |  2 +-
 source3/auth/auth_unix.c                           |  2 +-
 source3/auth/user_krb5.c                           |  2 +-
 source3/change-log                                 |  4 +-
 source3/groupdb/mapping_tdb.c                      |  2 +-
 source3/include/MacExtensions.h                    |  2 +-
 source3/lib/gencache.c                             |  4 +-
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |  4 +-
 source3/lib/smbldap.c                              |  2 +-
 source3/libads/ldap.c                              |  2 +-
 source3/libsmb/clifile.c                           |  2 +-
 source3/locale/net/de.po                           |  4 +-
 source3/locale/pam_winbind/ar.po                   |  2 +-
 source3/locale/pam_winbind/cs.po                   |  2 +-
 source3/locale/pam_winbind/da.po                   |  2 +-
 source3/locale/pam_winbind/de.po                   |  2 +-
 source3/locale/pam_winbind/es.po                   |  2 +-
 source3/locale/pam_winbind/fi.po                   |  2 +-
 source3/locale/pam_winbind/fr.po                   |  2 +-
 source3/locale/pam_winbind/hu.po                   |  2 +-
 source3/locale/pam_winbind/it.po                   |  2 +-
 source3/locale/pam_winbind/ja.po                   |  2 +-
 source3/locale/pam_winbind/ko.po                   |  2 +-
 source3/locale/pam_winbind/nb.po                   |  2 +-
 source3/locale/pam_winbind/nl.po                   |  2 +-
 source3/locale/pam_winbind/pl.po                   |  2 +-
 source3/locale/pam_winbind/pt_BR.po                |  2 +-
 source3/locale/pam_winbind/ru.po                   |  2 +-
 source3/locale/pam_winbind/sv.po                   |  2 +-
 source3/locale/pam_winbind/zh_CN.po                |  2 +-
 source3/locale/pam_winbind/zh_TW.po                |  2 +-
 source3/modules/vfs_fruit.c                        |  4 +-
 source3/nmbd/nmbd_winsserver.c                     |  2 +-
 source3/passdb/passdb.c                            |  2 +-
 source3/printing/nt_printing.c                     |  2 +-
 source3/printing/print_cups.c                      |  2 +-
 source3/registry/reg_api.c                         |  2 +-
 source3/registry/reg_objects.c                     |  4 +-
 source3/rpc_client/cli_lsarpc.c                    |  4 +-
 source3/rpc_server/fss/srv_fss_state.c             |  8 ++--
 source3/rpc_server/mdssvc/mdssvc.c                 |  2 +-
 source3/rpc_server/rpc_ncacn_np.c                  |  6 +--
 source3/rpc_server/rpc_server.c                    |  6 +--
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |  2 +-
 source3/rpc_server/svcctl/srv_svcctl_reg.c         |  2 +-
 source3/script/findsmb.in                          |  2 +-
 source3/smbd/ntquotas.c                            |  6 +--
 source3/smbd/open.c                                |  2 +-
 source3/smbd/reply.c                               |  2 +-
 source3/smbd/smb2_create.c                         |  2 +-
 source3/torture/scanner.c                          |  8 ++--
 source3/utils/net_ads.c                            |  2 +-
 source3/utils/net_rpc.c                            |  2 +-
 source3/utils/net_rpc_registry.c                   |  2 +-
 source3/winbindd/wb_group_members.c                |  2 +-
 source4/auth/gensec/gensec_krb5.c                  |  2 +-
 source4/auth/kerberos/kerberos-notes.txt           |  2 +-
 .../kerberos/kerberos-porting-to-mit-notes.txt     |  2 +-
 source4/dsdb/common/dsdb_dn.c                      |  2 +-
 source4/dsdb/repl/drepl_notify.c                   |  2 +-
 source4/dsdb/repl/drepl_service.c                  |  2 +-
 source4/dsdb/samdb/ldb_modules/dns_notify.c        |  2 +-
 source4/dsdb/samdb/ldb_modules/password_hash.c     |  2 +-
 source4/dsdb/schema/schema_syntax.c                |  2 +-
 source4/heimdal/base/heimbase.c                    |  2 +-
 source4/heimdal/lib/asn1/rfc2459.asn1              |  4 +-
 source4/heimdal/lib/gssapi/gssapi/gssapi_oid.h     |  2 +-
 source4/heimdal/lib/hx509/cert.c                   |  6 +--
 source4/heimdal/lib/hx509/cms.c                    |  2 +-
 source4/heimdal/lib/hx509/hx509_err.et             |  4 +-
 source4/heimdal/lib/hx509/keyset.c                 |  2 +-
 source4/heimdal/lib/krb5/creds.c                   |  2 +-
 source4/heimdal/lib/krb5/init_creds_pw.c           |  2 +-
 source4/heimdal/lib/krb5/krb5_err.et               |  2 +-
 source4/heimdal/lib/krb5/pac.c                     |  2 +-
 source4/rpc_server/dcerpc_server.c                 |  4 +-
 source4/rpc_server/samr/samr_password.c            |  4 +-
 source4/scripting/bin/minschema                    |  2 +-
 source4/scripting/bin/samba_upgradeprovision       |  2 +-
 source4/selftest/win/wintest_setup.exp             |  4 +-
 source4/smbd/process_standard.c                    |  2 +-
 source4/torture/basic/misc.c                       |  2 +-
 source4/torture/basic/scanner.c                    |  6 +--
 source4/torture/local/fsrvp_state.c                |  4 +-
 third_party/dnspython/dns/rdata.py                 |  2 +-
 third_party/waf/wafadmin/Tools/msvc.py             |  2 +-
 127 files changed, 194 insertions(+), 194 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c
index 373af5c..d623613 100644
--- a/auth/gensec/gensec.c
+++ b/auth/gensec/gensec.c
@@ -610,7 +610,7 @@ _PUBLIC_ NTSTATUS gensec_set_target_hostname(struct gensec_security *gensec_secu
 
 _PUBLIC_ const char *gensec_get_target_hostname(struct gensec_security *gensec_security)
 {
-	/* We allow the target hostname to be overriden for testing purposes */
+	/* We allow the target hostname to be overridden for testing purposes */
 	if (gensec_security->settings->target_hostname) {
 		return gensec_security->settings->target_hostname;
 	}
diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c
index a975725..ad0f9e9 100644
--- a/auth/ntlmssp/ntlmssp_sign.c
+++ b/auth/ntlmssp/ntlmssp_sign.c
@@ -685,7 +685,7 @@ NTSTATUS ntlmssp_sign_reset(struct ntlmssp_state *ntlmssp_state,
 NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
 {
 	if (ntlmssp_state->session_key.length < 8) {
-		DEBUG(3, ("NO session key, cannot intialise signing\n"));
+		DEBUG(3, ("NO session key, cannot initialise signing\n"));
 		return NT_STATUS_NO_USER_SESSION_KEY;
 	}
 
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index a7427cc..6ffa0f4 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4050,7 +4050,7 @@ static int ctdb_fetch_db_seqnum(struct ctdb_db_context *ctdb_db, uint64_t *seqnu
 	}
 
 	if (data.dsize != sizeof(*seqnum)) {
-		DEBUG(DEBUG_ERR, (__location__ " Invalid data recived len=%zi\n",
+		DEBUG(DEBUG_ERR, (__location__ " Invalid data received len=%zi\n",
 				  data.dsize));
 		talloc_free(data.dptr);
 		return -1;
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index d776a79..fe8b41a 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -255,7 +255,7 @@ int ctdb_ltdb_unlock(struct ctdb_db_context *ctdb_db, TDB_DATA key)
 int ctdb_ltdb_delete(struct ctdb_db_context *ctdb_db, TDB_DATA key)
 {
 	if (ctdb_db->persistent != 0) {
-		DEBUG(DEBUG_ERR,("Trying to delete emty record in persistent database\n"));
+		DEBUG(DEBUG_ERR,("Trying to delete empty record in persistent database\n"));
 		return 0;
 	}
 	if (tdb_delete(ctdb_db->ltdb->tdb, key) != 0) {
diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 990ec61..bacdea6 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -543,7 +543,7 @@ delete_node(trbt_node_t *node, bool from_destructor)
 	   This is simple since this dummy node originally had no children
 	   and we are guaranteed that it will also not have any children 
 	   after the node has been deleted and any possible rotations 
-	   have occured.
+	   have occurred.
 
 	   The only special case is if this was the last node of the tree
 	   in which case we have to reset the root to NULL as well.
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index 8a789a5..e3d8180 100644
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -636,7 +636,7 @@
       <title>TDBMutexEnabled</title>
       <para>Default: 0</para>
       <para>
-	This paramter enables TDB_MUTEX_LOCKING feature on volatile
+	This parameter enables TDB_MUTEX_LOCKING feature on volatile
 	databases if the robust mutexes are supported. This optimizes the
 	record locking using robust mutexes and is much more efficient
 	that using posix locks.
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index f24f8dd..6a0e6ea 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -1590,7 +1590,7 @@ RUNNING
       </para>
       <para>
 	TCP tickles are useful to "tickle" clients after a IP failover has
-	occured since this will make the client immediately recognize the
+	occurred since this will make the client immediately recognize the
 	TCP connection has been disrupted and that the client will need
 	to reestablish. This greatly speeds up the time it takes for a client
 	to detect and reestablish after an IP failover in the ctdb cluster.
diff --git a/ctdb/doc/ctdb.7.xml b/ctdb/doc/ctdb.7.xml
index c8b124d..db0a627 100644
--- a/ctdb/doc/ctdb.7.xml
+++ b/ctdb/doc/ctdb.7.xml
@@ -543,7 +543,7 @@ Node 3:/usr/local/etc/ctdb/public_addresses
       requests are going through the LVSMASTER bottleneck and the
       majority of the traffic volume (the data in the read replies)
       goes straight from the processing node back to the clients. For
-      read-intensive i/o patterns you can acheive very high throughput
+      read-intensive i/o patterns you can achieve very high throughput
       rates in this mode.
     </para>
 
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index fc58c31..4c013f0 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -165,7 +165,7 @@
 	    OPTIONS is a comma-separated list of any permissible
 	    options to the tmpfs filesystem.  The only pre-specified
 	    default is <option>mode=700</option>, which can
-	    overriden by specifying <option>mode</option> in
+	    overridden by specifying <option>mode</option> in
 	    OPTIONS.  It probably makes sense to specify a maximum
 	    <option>size</option>.
 	  </para>
diff --git a/ctdb/doc/recovery-process.txt b/ctdb/doc/recovery-process.txt
index 333eeb2..3f7d7d3 100644
--- a/ctdb/doc/recovery-process.txt
+++ b/ctdb/doc/recovery-process.txt
@@ -221,7 +221,7 @@ Make sure to find which node is the recovery master and check the log for that n
 
 Example log entries that start in column 1 are expected to be present in the
 log. Example log entries that are indented 3 columns are optional and might
-only be present if an error occured.
+only be present if an error occurred.
 
 
 1, Log that recovery has been initiated.
@@ -365,7 +365,7 @@ only be present if an error occured.
     initiated. The cluster will not allow a new recovery to be performed until this timeout
     has expired.
 
-"New recoveries supressed for the rerecovery timeout"
+"New recoveries suppressed for the rerecovery timeout"
 "Rerecovery timeout elapsed. Recovery reactivated."
 
 
@@ -424,7 +424,7 @@ Example : RECOVERY LOG ON RECMASTER
 2008/12/01 09:57:29.545404 [ 4933]: Recovery has finished
 2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1551 Recovery - finished the recovered event
 2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1557 Recovery complete
-2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1565 New recoveries supressed for the rerecovery timeout
+2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1565 New recoveries suppressed for the rerecovery timeout
 2008/12/01 09:57:39.815648 [ 4935]: server/ctdb_recoverd.c:1567 Rerecovery timeout elapsed. Recovery reactivated.
 
 
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 9ea0f61..751a08e 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1424,7 +1424,7 @@ static int do_recovery(struct ctdb_recoverd *rec,
 	   We now wait for rerecovery_timeout before we allow
 	   another recovery to take place.
 	*/
-	DEBUG(DEBUG_NOTICE, ("Just finished a recovery. New recoveries will now be supressed for the rerecovery timeout (%d seconds)\n", ctdb->tunable.rerecovery_timeout));
+	DEBUG(DEBUG_NOTICE, ("Just finished a recovery. New recoveries will now be suppressed for the rerecovery timeout (%d seconds)\n", ctdb->tunable.rerecovery_timeout));
 	ctdb_op_disable(rec->recovery, ctdb->ev,
 			ctdb->tunable.rerecovery_timeout);
 	return 0;
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 513da63..c359d66 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1424,7 +1424,7 @@ static void ctdb_remove_connection(struct ctdb_vnn *vnn, struct ctdb_connection
 	   and we don't need to do anything
 	 */
 	if (vnn->tcp_array == NULL) {
-		DEBUG(DEBUG_INFO,("Trying to remove tickle that doesnt exist (array is empty) %s:%u\n",
+		DEBUG(DEBUG_INFO,("Trying to remove tickle that doesn't exist (array is empty) %s:%u\n",
 			ctdb_addr_to_str(&conn->dst),
 			ntohs(conn->dst.ip.sin_port)));
 		return;
@@ -1436,7 +1436,7 @@ static void ctdb_remove_connection(struct ctdb_vnn *vnn, struct ctdb_connection
 	 */
 	tcpp = ctdb_tcp_find(vnn->tcp_array, conn);
 	if (tcpp == NULL) {
-		DEBUG(DEBUG_INFO,("Trying to remove tickle that doesnt exist %s:%u\n",
+		DEBUG(DEBUG_INFO,("Trying to remove tickle that doesn't exist %s:%u\n",
 			ctdb_addr_to_str(&conn->dst),
 			ntohs(conn->dst.ip.sin_port)));
 		return;
@@ -1578,7 +1578,7 @@ void ctdb_release_all_ips(struct ctdb_context *ctdb)
 		if (vnn->update_in_flight) {
 			DEBUG(DEBUG_WARNING,
 			      (__location__
-			       " Not releasing IP %s/%u on interface %s, an update is already in progess\n",
+			       " Not releasing IP %s/%u on interface %s, an update is already in progress\n",
 				    ctdb_addr_to_str(&vnn->public_address),
 				    vnn->public_netmask_bits,
 				    ctdb_vnn_iface_string(vnn)));
diff --git a/docs-xml/Samba3-ByExample/SBE-HighAvailability.xml b/docs-xml/Samba3-ByExample/SBE-HighAvailability.xml
index 128923b..9f61b7a 100644
--- a/docs-xml/Samba3-ByExample/SBE-HighAvailability.xml
+++ b/docs-xml/Samba3-ByExample/SBE-HighAvailability.xml
@@ -640,7 +640,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.
 	</para>
 
 	<para>
-	Samba-3.0.12 and later, includes new code that radically improves Samba perfomance. The secret to this is
+	Samba-3.0.12 and later, includes new code that radically improves Samba performance. The secret to this is
 	really in the <smbconfoption name="case sensitive">True</smbconfoption> line. This tells smbd never to scan
 	for case-insensitive versions of names. So if an application asks for a file called <filename>FOO</filename>,
 	and it can not be found by a simple stat call, then smbd will return "file not found" immediately without
diff --git a/docs-xml/Samba3-Developers-Guide/cifsntdomain.xml b/docs-xml/Samba3-Developers-Guide/cifsntdomain.xml
index ec727ef..8467a6f 100644
--- a/docs-xml/Samba3-Developers-Guide/cifsntdomain.xml
+++ b/docs-xml/Samba3-Developers-Guide/cifsntdomain.xml
@@ -443,7 +443,7 @@ appears a third time after the last sub-structure.
 <listitem><para>0 - attributes (undocumented)</para></listitem></varlistentry>
 <varlistentry>
 	<term>VOID*</term>
-<listitem><para>0 - security descriptior (pointer)</para></listitem></varlistentry>
+<listitem><para>0 - security descriptor (pointer)</para></listitem></varlistentry>
 <varlistentry>
 	<term>UINT32</term>
 	<listitem><para>0 - security quality of service</para></listitem>
diff --git a/docs-xml/Samba3-Developers-Guide/vfs.xml b/docs-xml/Samba3-Developers-Guide/vfs.xml
index f70fc96..70e2c65 100644
--- a/docs-xml/Samba3-Developers-Guide/vfs.xml
+++ b/docs-xml/Samba3-Developers-Guide/vfs.xml
@@ -107,7 +107,7 @@ and how those functions would co-operate with the rest of VFS
 subsystem. Each operation could perform in a following ways:
 <itemizedlist>
 	<listitem><para><emphasis>transparent</emphasis>, meaning that while
-  operation is overriden, the module will still call a previous
+  operation is overridden, the module will still call a previous
   implementation, before or after its own action. This mode is
   indicated by the constant
   <literal>SMB_VFS_LAYER_TRANSPARENT</literal>;</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index ff762ad..405188b 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
@@ -1182,7 +1182,7 @@ per-user settings using the Domain User Manager (as with MS Windows NT4/200x). <
 <itemizedlist>
 	<listitem><para>A profile unique to that user.</para></listitem>
 	<listitem><para>A mandatory profile (one the user cannot change).</para></listitem>
-	<listitem><para>A group profile (really should be mandatory &smbmdash; that is, unchangable).</para></listitem>
+	<listitem><para>A group profile (really should be mandatory &smbmdash; that is, unchangeable).</para></listitem>
 </itemizedlist>
 
 </sect2>
diff --git a/docs-xml/manpages/vfs_btrfs.8.xml b/docs-xml/manpages/vfs_btrfs.8.xml
index c2589c4..85603bc 100644
--- a/docs-xml/manpages/vfs_btrfs.8.xml
+++ b/docs-xml/manpages/vfs_btrfs.8.xml
@@ -96,7 +96,7 @@
 	</programlisting>
 	<para>
 		To use the experimental snapshot manipulation functionality
-		provided by this module, it must be explicity enabled, and
+		provided by this module, it must be explicitly enabled, and
 		Samba's FSRVP server must be running.
 	</para>
 	<para>
diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml
index 627eba6..61ad9f4 100644
--- a/docs-xml/manpages/vfs_glusterfs.8.xml
+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
@@ -132,7 +132,7 @@
 		<para>
 			Defines which volfile server to use, defaults to
 			localhost. It could be list of white space
-			seperated elements where each element could be
+			separated elements where each element could be
 		</para>
 		<para>
 			1. unix+/path/to/socket/file
diff --git a/docs-xml/smbdotconf/filename/hideunreadable.xml b/docs-xml/smbdotconf/filename/hideunreadable.xml
index 361320c..080118e 100644
--- a/docs-xml/smbdotconf/filename/hideunreadable.xml
+++ b/docs-xml/smbdotconf/filename/hideunreadable.xml
@@ -4,7 +4,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>This parameter prevents clients from seeing the
-		existance of files that cannot be read. Defaults to off.</para>
+		existence of files that cannot be read. Defaults to off.</para>
 	<para>Please note that enabling this can slow down listing large
 	directories significantly. Samba has to evaluate the ACLs of all
 	directory members, which can be a lot of effort.</para>
diff --git a/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml b/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml
index 97a44f0..58c872e 100644
--- a/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml
+++ b/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml
@@ -4,7 +4,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
-    This parameter prevents clients from seeing the existance of files that cannot be written to. 
+    This parameter prevents clients from seeing the existence of files that cannot be written to. 
     Defaults to off. Note that unwriteable directories are shown as usual.
     </para>
     <para>Please note that enabling this can slow down listing large
diff --git a/docs-xml/smbdotconf/misc/rpcdaemon.xml b/docs-xml/smbdotconf/misc/rpcdaemon.xml
index 6356d3c..d3e3e52 100644
--- a/docs-xml/smbdotconf/misc/rpcdaemon.xml
+++ b/docs-xml/smbdotconf/misc/rpcdaemon.xml
@@ -48,7 +48,7 @@
 		prefork_child_min_life
 	</programlisting>
 
-	To set one of these options use the follwing syntax:
+	To set one of these options use the following syntax:
 	<programlisting>
 	daemonname:prefork_min_children = 5
 	</programlisting>
diff --git a/docs-xml/smbdotconf/misc/spotlight.xml b/docs-xml/smbdotconf/misc/spotlight.xml
index fa2001d..c543f03 100644
--- a/docs-xml/smbdotconf/misc/spotlight.xml
+++ b/docs-xml/smbdotconf/misc/spotlight.xml
@@ -42,7 +42,7 @@
 </programlisting>
 
 	<para>
-	  Or it can be run in a seperate RPC service daemon:
+	  Or it can be run in a separate RPC service daemon:
 	</para>
 
 <programlisting>
diff --git a/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml b/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml
index b19a8a8..2c3c6c5 100644
--- a/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml
+++ b/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml
@@ -31,7 +31,7 @@
     encryption types are allowed.
     </para>
 
-    <para>When set to <constant>strong</constant>, only AES-based encyption
+    <para>When set to <constant>strong</constant>, only AES-based encryption
     types are offered. This can be used in hardened environments to prevent
     downgrade attacks.
     </para>
diff --git a/docs-xml/using_samba/ch01.xml b/docs-xml/using_samba/ch01.xml
index 01d7791..3c6594b 100644
--- a/docs-xml/using_samba/ch01.xml
+++ b/docs-xml/using_samba/ch01.xml
@@ -660,7 +660,7 @@ HYDRA          <20>  UNIQUE      Registered
 </table>
 
 
-<para>Note that because <indexterm id="ch01-idx-951737-0"><primary>DNS (Domain Name System)</primary><secondary>names</secondary><tertiary> resource types and</tertiary></indexterm>DNS names don't have resource types, the designers intentionally made hexidecimal value 20 (an ASCII space) default to the type for a file server.</para>
+<para>Note that because <indexterm id="ch01-idx-951737-0"><primary>DNS (Domain Name System)</primary><secondary>names</secondary><tertiary> resource types and</tertiary></indexterm>DNS names don't have resource types, the designers intentionally made hexadecimal value 20 (an ASCII space) default to the type for a file server.</para>
 </sect3>
 
 
diff --git a/docs-xml/using_samba/ch04.xml b/docs-xml/using_samba/ch04.xml
index 50f1d0e..b394bab 100644
--- a/docs-xml/using_samba/ch04.xml
+++ b/docs-xml/using_samba/ch04.xml
@@ -593,7 +593,7 @@ netbios aliases = sales accounting payroll</programlisting>
 
 <varlistentry><term>Numerical</term>
 <listitem><para>
-<indexterm id="ch04-idx-967220-0"><primary>numerical type</primary></indexterm>An integer, hexidecimal, or octal number. The standard <literal>0x</literal><emphasis>nn</emphasis> syntax is used for hexadecimal and <literal>0</literal><emphasis>nnn</emphasis> for octal.</para></listitem>
+<indexterm id="ch04-idx-967220-0"><primary>numerical type</primary></indexterm>An integer, hexadecimal, or octal number. The standard <literal>0x</literal><emphasis>nn</emphasis> syntax is used for hexadecimal and <literal>0</literal><emphasis>nnn</emphasis> for octal.</para></listitem>
 </varlistentry>
 
 
@@ -1362,7 +1362,7 @@ writeable = yes</programlisting>
 <indexterm id="ch04-idx-967307-0"><primary>hosts</primary><secondary>subnets and,
 caution with</secondary></indexterm>
 <indexterm id="ch04-idx-967307-1"><primary>subnets</primary><secondary>hosts and,
-caution with</secondary></indexterm>Take care that you don't explicity
+caution with</secondary></indexterm>Take care that you don't explicitly
 allow a host to access a share, but then deny access to the entire
 subnet of which the host is part.</para>
 
diff --git a/docs-xml/using_samba/ch06.xml b/docs-xml/using_samba/ch06.xml
index a4a9160..14fe238 100644
--- a/docs-xml/using_samba/ch06.xml
+++ b/docs-xml/using_samba/ch06.xml
@@ -1210,7 +1210,7 @@ username</title>
 
 
 <varlistentry><term>Last Change Time</term>
-<listitem><para>This code consists of the characters <literal>LCT-</literal> followed by a hexidecimal representation of the amount of seconds since the epoch (midnight on January 1, 1970) that the entry was last changed.</para></listitem>
+<listitem><para>This code consists of the characters <literal>LCT-</literal> followed by a hexadecimal representation of the amount of seconds since the epoch (midnight on January 1, 1970) that the entry was last changed.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -2322,7 +2322,7 @@ local group map</title>
 
 
 <para>One warning: because these scripts are loaded by Windows and executed on the Windows side, they must consist of DOS formatted <indexterm id="ch06-idx-968122-0"><primary>carriage-returns for scripts</primary></indexterm>
-<indexterm id="ch06-idx-968122-1"><primary>DOS-formated carriage returns</primary></indexterm>
+<indexterm id="ch06-idx-968122-1"><primary>DOS-formatted carriage returns</primary></indexterm>
 <indexterm id="ch06-idx-968122-2"><primary>Unix</primary><secondary> carriage returns</secondary></indexterm>carriage-return/linefeed characters instead of Unix carriage returns. It's best to use a DOS- or Windows-based editor to create them.</para>
 
 
diff --git a/docs-xml/using_samba/ch08.xml b/docs-xml/using_samba/ch08.xml
index 7465b8a..84cb87c 100644
--- a/docs-xml/using_samba/ch08.xml
+++ b/docs-xml/using_samba/ch08.xml
@@ -860,7 +860,7 @@ client code page</title>
 
 <entry colname="col1"><para><literal>HEX</literal></para></entry>
 
-<entry colname="col2"><para>Three-byte hexidecimal code</para></entry>
+<entry colname="col2"><para>Three-byte hexadecimal code</para></entry>
 
 </row>
 
@@ -868,7 +868,7 @@ client code page</title>
 
 <entry colname="col1"><para><literal>CAP</literal></para></entry>
 
-<entry colname="col2"><para>Three-byte hexidecimal code (Columbia Appletalk Program)</para></entry>
+<entry colname="col2"><para>Three-byte hexadecimal code (Columbia Appletalk Program)</para></entry>
 
 </row>
 
@@ -894,7 +894,7 @@ valid chars = 0450:0420 0x0A20:0x0A00
 valid chars = A:a</programlisting>
 
 
-<para>Each of the characters in the list specified should be separated by spaces. If there is a colon between two characters or their numerical equivalents, the data to the left of the colon is considered an uppercase character, while the data to the right is considered the lowercase character. You can represent characters both by literals (if you can type them) and by octal, hexidecimal, or decimal Unicode equivalents.</para>
+<para>Each of the characters in the list specified should be separated by spaces. If there is a colon between two characters or their numerical equivalents, the data to the left of the colon is considered an uppercase character, while the data to the right is considered the lowercase character. You can represent characters both by literals (if you can type them) and by octal, hexadecimal, or decimal Unicode equivalents.</para>
 
 
 <para>We recommend against using this option. Instead, go with one of the standard code pages listed earlier in this section. If you do use this option, however, it must be listed after the <literal>client</literal> <literal>code</literal> <literal>page</literal> to which you wish to add the character. Otherwise, the characters will not be added.<indexterm id="ch08-idx-965533-0" class="endofrange" startref="ch08-idx-965219-0"/>
diff --git a/docs-xml/xslt/latex/sambadoc.cls b/docs-xml/xslt/latex/sambadoc.cls
index 20c8132..b7f634f 100644
--- a/docs-xml/xslt/latex/sambadoc.cls
+++ b/docs-xml/xslt/latex/sambadoc.cls
@@ -18,7 +18,7 @@
 %================================================================================
 % 1. Page layout dimensions
 % 3. Define new fonts for headings
-% 4. Redefines the way "figure" amd "table" are formated in a \caption
+% 4. Redefines the way "figure" amd "table" are formatted in a \caption
 % 5. Defines a \capt macro which defines (1) \captwidth, (2) \captsize
 %    and \beforetableskip.
 % 6. Defines and modifies FANCYHDS.STY for headers and foots
diff --git a/examples/libsmbclient/testutime.c b/examples/libsmbclient/testutime.c
index cdbcfec..8cc78fd 100644
--- a/examples/libsmbclient/testutime.c
+++ b/examples/libsmbclient/testutime.c
@@ -52,7 +52,7 @@ int main(int argc, char * argv[])
            (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
            (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
     
-    utimbuf.actime = t;         /* unchangable (wont change) */
+    utimbuf.actime = t;         /* unchangeable (wont change) */
     utimbuf.modtime = t;        /* this one should succeed */
     if (smbc_utime(pSmbPath, &utimbuf) < 0)
     {
diff --git a/examples/misc/adssearch.pl b/examples/misc/adssearch.pl
index 02c4464..7c3570a 100755
--- a/examples/misc/adssearch.pl
+++ b/examples/misc/adssearch.pl
@@ -1723,14 +1723,14 @@ sub do_bind($$) {
 		$mesg = $async_ldap_hd->bind( 
 			sasl => $sasl_hd, 
 			callback => \&error_callback 
-		) || die "doesnt work"; 
+		) || die "doesn't work"; 
 	} else {
 		$sasl_mech = "";
 		$mesg = $async_ldap_hd->bind( 
 			$binddn, 
 			password => $password, 
 			callback => $opt_fastbind ? undef : \&error_callback
-		) || die "doesnt work";
+		) || die "doesn't work";
 	};
 	if ($mesg->code) { 
 		display_ldap_err($mesg) if (!$opt_fastbind);
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 0c98147..8ebf601 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -144,7 +144,7 @@ const krb5_data *krb5_princ_component(krb5_context context,
  *
  * @param[out] pkaddr   A Kerberos address to store tha address in.
  *
- * @return True on success, false if an error occured.
+ * @return True on success, false if an error occurred.
  */
 bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
@@ -177,7 +177,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
  *
  * @param[in]  pkaddr A Kerberos address to store tha address in.
  *
- * @return True on success, false if an error occured.
+ * @return True on success, false if an error occurred.
  */
 bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
@@ -2566,7 +2566,7 @@ krb5_error_code smb_krb5_make_pac_checksum(TALLOC_CTX *mem_ctx,
  *
  * @param[in] principal The principal to get the realm from.
  *
- * @return An allocated string with the realm or NULL if an error occured.
+ * @return An allocated string with the realm or NULL if an error occurred.
  *
  * The caller must free the realm string with free() if not needed anymore.


-- 
Samba Shared Repository



More information about the samba-cvs mailing list