The branch, master has been updated
       via  5521cf0 Typo: speciefied -> specified.
       via  23beb5b Typo: s/prefered/preferred/
       via  d81bada9 Typo: sucessfully -> successfully
       via  9de0dc7 Typo: Specifing -> specifying.
      from  e49bae7 s3:smb2_server: remove unused get_min_receive_file_size() 
wrapper function

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


- Log -----------------------------------------------------------------
commit 5521cf03089322005e7d94c1c2915b31b2b21158
Author: Jelmer Vernooij <[email protected]>
Date:   Sun Mar 30 04:03:15 2014 +0200

    Typo: speciefied -> specified.
    
    Signed-Off-By: Jelmer Vernooij <[email protected]>
    Change-Id: I0357440cde2ef70945ff4a9ba87b62ab88b271a8
    Reviewed-on: https://gerrit.samba.org/218
    Reviewed-by: Andrew Bartlett <[email protected]>
    
    Autobuild-User(master): Jelmer Vernooij <[email protected]>
    Autobuild-Date(master): Sun Apr 13 19:12:22 CEST 2014 on sn-devel-104

commit 23beb5b37c415c1b10a06d8dc0aa93b6eea0aade
Author: Jelmer Vernooij <[email protected]>
Date:   Sun Mar 30 04:05:09 2014 +0200

    Typo: s/prefered/preferred/
    
    Signed-Off-By: Jelmer Vernooij <[email protected]>
    Change-Id: Ib82b71111fd208990aa876a8bf06431cfed21a6c
    Reviewed-on: https://gerrit.samba.org/220
    Reviewed-by: Andrew Bartlett <[email protected]>

commit d81bada9f73af5eebfd21b2242612a5986f2a2d3
Author: Jelmer Vernooij <[email protected]>
Date:   Sun Mar 30 04:04:18 2014 +0200

    Typo: sucessfully -> successfully
    
    Signed-Off-By: Jelmer Vernooij <[email protected]>
    Change-Id: I23258edf9c197081c882ba85dedf833292e56e4e
    Reviewed-on: https://gerrit.samba.org/219
    Reviewed-by: Andrew Bartlett <[email protected]>

commit 9de0dc792d422145291a8682e5560f5444ec1e70
Author: Jelmer Vernooij <[email protected]>
Date:   Sun Mar 30 04:05:45 2014 +0200

    Typo: Specifing -> specifying.
    
    Signed-Off-By: Jelmer Vernooij <[email protected]>
    Change-Id: I80286441b32cd0b8384610b5b6db7790b8a22d48
    Reviewed-on: https://gerrit.samba.org/221
    Reviewed-by: Andrew Bartlett <[email protected]>

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

Summary of changes:
 docs-xml/Samba3-Developers-Guide/unix-smb.xml |    2 +-
 source3/lib/util.c                            |    2 +-
 source3/smbd/statvfs.c                        |    2 +-
 source3/utils/net_ads_gpo.c                   |    2 +-
 source3/utils/net_groupmap.c                  |    2 +-
 source3/utils/net_rpc_printer.c               |    4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-Developers-Guide/unix-smb.xml 
b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
index 6964b7f..3412019 100644
--- a/docs-xml/Samba3-Developers-Guide/unix-smb.xml
+++ b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
@@ -206,7 +206,7 @@ Unix has no equivalent notion. To implement this Samba uses 
either lock
 files based on the files inode and placed in a separate lock
 directory or a shared memory implementation. The lock file method 
 is clumsy and consumes processing and file resources,
-the shared memory implementation is vastly prefered and is turned on
+the shared memory implementation is vastly preferred and is turned on
 by default for those systems that support it.
 </para>
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 945fc97..f11d6f1 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1856,7 +1856,7 @@ bool name_to_fqdn(fstring fqdn, const char *name)
        }
        if (full && (strcasecmp_m(full, "localhost.localdomain") == 0)) {
                DEBUG(1, ("WARNING: your /etc/hosts file may be broken!\n"));
-               DEBUGADD(1, ("    Specifing the machine hostname for address 
127.0.0.1 may lead\n"));
+               DEBUGADD(1, ("    Specifying the machine hostname for address 
127.0.0.1 may lead\n"));
                DEBUGADD(1, ("    to Kerberos authentication problems as 
localhost.localdomain\n"));
                DEBUGADD(1, ("    may end up being used instead of the real 
machine FQDN.\n"));
                full = hp->h_name;
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 94ec2d5..f9f2211 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -151,7 +151,7 @@ static int linux_statvfs(const char *path, 
vfs_statvfs_struct *statbuf)
  sys_statvfs() is an abstraction layer over system-dependent statvfs()/statfs()
  for particular POSIX systems. Due to controversy of what is considered more 
important
  between LSB and FreeBSD/POSIX.1 (IEEE Std 1003.1-2001) we need to abstract 
the interface
- so that particular OS would use its prefered interface.
+ so that particular OS would use its preferred interface.
 */
 int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf)
 {
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 444e160..79793b8 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -588,7 +588,7 @@ static int net_ads_gpo_get_gpo(struct net_context *c, int 
argc, const char **arg
                d_printf("%s\n%s\n%s",
                         _("Usage:"),
                         _("net ads gpo getgpo <gpo>"),
-                        _("  List speciefied GPO\n"
+                        _("  List specified GPO\n"
                           "    gpo\t\tGPO to list\n"));
                return -1;
        }
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 13716a2..8c6aa2e 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -586,7 +586,7 @@ static int net_groupmap_delete(struct net_context *c, int 
argc, const char **arg
                return -1;
        }
 
-       d_printf(_("Sucessfully removed %s from the mapping db\n"), ntgroup);
+       d_printf(_("Successfully removed %s from the mapping db\n"), ntgroup);
 
        return 0;
 }
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 3ed97a7..7ff8386 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -2019,7 +2019,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct 
net_context *c,
                                goto done;
                        }
 
-                       DEBUGADD(1,("Sucessfully added driver [%s] for printer 
[%s]\n",
+                       DEBUGADD(1,("Successfully added driver [%s] for printer 
[%s]\n",
                                drivername, printername));
 
                }
@@ -2038,7 +2038,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct 
net_context *c,
                        goto done;
                }
 
-               DEBUGADD(1,("Sucessfully set driver %s for printer %s\n",
+               DEBUGADD(1,("Successfully set driver %s for printer %s\n",
                        drivername, printername));
 
                /* close dst */


-- 
Samba Shared Repository

Reply via email to