diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
| commit | 7f10bf980edef3ace1522d0c9c082b35e225c950 (patch) | |
| tree | d4e9af21de194cca812e754b28f9358a3651f4ce /source3/param | |
| parent | f8f68703da58cf7f61b655b48bbbc45cda647748 (diff) | |
| parent | f930f504e1d5e78d2f6f36cab9ce36dbeb34e955 (diff) | |
| download | samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.gz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.bz2 samba-7f10bf980edef3ace1522d0c9c082b35e225c950.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8da1f6348f..4b14b80339 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -885,7 +885,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. * @@ -894,7 +894,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 |