[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-674-gecaca64

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  ecaca646f91750bc0a9a6f58ff1589197585ebdc (commit)
       via  c689d84d6d1232f0574d42d0cebee9236eaf2a5b (commit)
       via  f1f133dba832d129752c12a7656ce4a2dfae7806 (commit)
       via  78a2b98d92d5a651bdc07659e717b8a2249373e9 (commit)
       via  c62811a62bee3c5b5af4c8893813b1a56ad9c22f (commit)
      from  ed6388ee3a96972b7bf7df79c9ca0b63bfb84380 (commit)

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


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

    s3/popt.h: Fix typo.
    
    Karolin
    (cherry picked from commit 8da2fa36b4f4241d7d4cdbe254a2374dd373fe40)

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

    s3/loadparm: Fiy typos.
    
    Karolin
    (cherry picked from commit 4458809597ff4362a653ea5469c5237bbe2a0531)

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

    s3/gpo_ldap: Fix typo.
    
    Karolin
    (cherry picked from commit a103222e0b679d68684681c871ac912f279afc1b)

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

    s3/smbconf_reg: Fix typo.
    
    Karolin
    (cherry picked from commit 6343cab3086f5795c8428eddcb966ba8b72d3511)

commit c62811a62bee3c5b5af4c8893813b1a56ad9c22f
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Apr 7 19:55:45 2009 +0200

    s3/docs: Fix typo.
    
    Karolin
    (cherry picked from commit c002c1d776bc62bafe62e29a91e05100c5025890)

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

Summary of changes:
 docs-xml/manpages-3/smbcontrol.1.xml |    2 +-
 lib/popt/popt.h                      |    2 +-
 source3/lib/smbconf/smbconf_reg.c    |    2 +-
 source3/libgpo/gpo_ldap.c            |    2 +-
 source3/param/loadparm.c             |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index f8c31bb..b608244 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -66,7 +66,7 @@
 		<para>The <parameter>all</parameter> destination causes the 
 		message to "broadcast" to all running daemons including nmbd and
 		winbind. This is a change for Samba 3.3, prior to this the
-		paramter smbd used to do this.</para>
+		parameter smbd used to do this.</para>
 
 		<para>The <parameter>smbd</parameter> destination causes the 
 		message to be sent to the smbd daemon specified in the 
diff --git a/lib/popt/popt.h b/lib/popt/popt.h
index 08701d7..7b94a98 100644
--- a/lib/popt/popt.h
+++ b/lib/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 */
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index ae6a411..0ecac97 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -193,7 +193,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/source3/libgpo/gpo_ldap.c b/source3/libgpo/gpo_ldap.c
index 882804b..716b872 100644
--- a/source3/libgpo/gpo_ldap.c
+++ b/source3/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/source3/param/loadparm.c b/source3/param/loadparm.c
index f49a1bc..8630dd0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -878,7 +878,7 @@ static const struct enum_list enum_kerberos_method[] = {
 
 /* 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.
  *
@@ -887,7 +887,7 @@ static const struct enum_list enum_kerberos_method[] = {
  *	 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


-- 
Samba Shared Repository