[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3546-g89542c9

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  89542c9dc4fede1547886b480791322f0497f277 (commit)
       via  a3081c94e64d226328885191212bd1ba46add09e (commit)
       via  7038846d514b9ea25d991bc72b807921ab1ee158 (commit)
       via  36cb36581208f754b14e2a955fbd886e6c82cfaa (commit)
      from  d3d4baecb89ddac6d460269e126a60b99f687a5b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 89542c9dc4fede1547886b480791322f0497f277
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Apr 7 20:01:27 2009 +0200

    s3/popt.h: Fix typo.
    
    This used to be commit 8da2fa36 in master.
    
    Karolin
    (cherry picked from commit 3df28fce45ce552df2c0815597fc1808ea08b363)

commit a3081c94e64d226328885191212bd1ba46add09e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Apr 7 20:00:47 2009 +0200

    s3/loadparm: Fiy typos.
    
    This used to be commit 44588095 in master.
    
    Karolin
    (cherry picked from commit 7648c51afaf844e576935dadc0d66a94e2cad28b)

commit 7038846d514b9ea25d991bc72b807921ab1ee158
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Apr 7 19:58:47 2009 +0200

    s3/gpo_ldap: Fix typo.
    
    This used to be commit a103222e in master.
    
    Karolin
    (cherry picked from commit a33677c8a80925965a4023785fc3a221d2ed9585)

commit 36cb36581208f754b14e2a955fbd886e6c82cfaa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Apr 7 19:58:14 2009 +0200

    s3/smbconf_reg: Fix typo.
    
    This used to be commit 6343cab3 in master.
    
    Karolin
    (cherry picked from commit 56e877662dd6da64b348803c24e85f60ee6b3d85)

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

Summary of changes:
 source/lib/smbconf/smbconf_reg.c |    2 +-
 source/libgpo/gpo_ldap.c         |    2 +-
 source/param/loadparm.c          |    4 ++--
 source/popt/popt.h               |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index dfce750..eb67781 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -265,7 +265,7 @@ static WERROR smbconf_reg_set_value(struct registry_key *key,
 	if (!strequal(subkeyname, GLOBAL_NAME) &&
 	    lp_parameter_is_global(valname))
 	{
-		DEBUG(5, ("Global paramter '%s' not allowed in "
+		DEBUG(5, ("Global parameter '%s' not allowed in "
 			  "service definition ('%s').\n", canon_valname,
 			  subkeyname));
 		werr = WERR_INVALID_PARAM;
diff --git a/source/libgpo/gpo_ldap.c b/source/libgpo/gpo_ldap.c
index 477832a..084017d 100644
--- a/source/libgpo/gpo_ldap.c
+++ b/source/libgpo/gpo_ldap.c
@@ -453,7 +453,7 @@ ADS_STATUS ads_delete_gpo_link(ADS_STRUCT *ads,
 }
 
 /****************************************************************
- get a GROUP_POLICY_OBJECT structure based on different input paramters
+ get a GROUP_POLICY_OBJECT structure based on different input parameters
 ****************************************************************/
 
 ADS_STATUS ads_get_gpo(ADS_STRUCT *ads,
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index aa41bf9..3ccb772 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -863,7 +863,7 @@ static const struct enum_list enum_config_backend[] = {
 
 /* Note: We do not initialise the defaults union - it is not allowed in ANSI C
  *
- * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
+ * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit
  * screen in SWAT. This is used to exclude parameters as well as to squash all
  * parameters that have been duplicated by pseudonyms.
  *
@@ -872,7 +872,7 @@ static const struct enum_list enum_config_backend[] = {
  *	 Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in
  *        respective views.
  *
- * NOTE2: Handling of duplicated (synonym) paramters:
+ * NOTE2: Handling of duplicated (synonym) parameters:
  *	Only the first occurance of a parameter should be enabled by FLAG_BASIC
  *	and/or FLAG_ADVANCED. All duplicates following the first mention should be
  *	set to FLAG_HIDE. ie: Make you must place the parameter that has the preferred
diff --git a/source/popt/popt.h b/source/popt/popt.h
index 08701d7..7b94a98 100644
--- a/source/popt/popt.h
+++ b/source/popt/popt.h
@@ -83,7 +83,7 @@
 #define POPT_ERROR_NOARG	-10	/*!< missing argument */
 #define POPT_ERROR_BADOPT	-11	/*!< unknown option */
 #define POPT_ERROR_OPTSTOODEEP	-13	/*!< aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE	-15	/*!< error in paramter quoting */
+#define POPT_ERROR_BADQUOTE	-15	/*!< error in parameter quoting */
 #define POPT_ERROR_ERRNO	-16	/*!< errno set, use strerror(errno) */
 #define POPT_ERROR_BADNUMBER	-17	/*!< invalid numeric value */
 #define POPT_ERROR_OVERFLOW	-18	/*!< number too large or too small */


-- 
Samba Shared Repository