Spelling fixes s/convertion/conversion/

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index a14322b8e578a94f693b53478829a1d55cd5d043..99b18e8259053e0ffad186780a74a13f7050f69a 100644 (file)
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -547,7 +547,7 @@ long long int rep_strtoll(const char *str, char **endptr, int base)
        if (errno == EINVAL) {
                if (base == 0 || (base >1 && base <37)) {
                        /* Base was ok so it's because we were not
-                        * able to make the convertion.
+                        * able to make the conversion.
                         * Let's reset errno.
                         */
                        errno = saved_errno;
@@ -583,7 +583,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
        if (errno == EINVAL) {
                if (base == 0 || (base >1 && base <37)) {
                        /* Base was ok so it's because we were not
-                        * able to make the convertion.
+                        * able to make the conversion.
                         * Let's reset errno.
                         */
                        errno = saved_errno;

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4df1b4d77c405baacb74f4a5560ca9278f3efea2..9af8ac49b2c7795c22e68e4274ac4e5fc5a4fa0b 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -404,7 +404,7 @@ def configure(conf):
                 msg="Checking whether we can use SO_PEERCRED to get socket credentials",
                 headers='sys/types.h sys/socket.h')
 
-    #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
+    #Some OS (ie. freebsd) return EINVAL if the conversion could not be done, it's not what we expect
     #Let's detect those cases
     if conf.CONFIG_SET('HAVE_STRTOLL'):
         conf.CHECK_CODE('''

diff --git a/source3/libads/util.c b/source3/libads/util.c
index 354125b74fe846cd9c871c00bdffa798200567f6..edbb368a2de474c62a000df12f3fcbb9daff510d 100644 (file)
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -223,7 +223,7 @@ struct spn_struct *parse_spn(TALLOC_CTX *ctx, const char *srvprinc)
                    || result->port > 65535
                    || errno == ERANGE) {
                        DBG_ERR("Failed to parse spn %s, port number "
-                               "convertion failed\n", srvprinc);
+                               "conversion failed\n", srvprinc);
                        errno = 0;
                        goto fail;
                }