Merge remote branch 'sf/master'

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index 945672cc3d7880723e2781fbd397c3adb40bfc92..eeb20a859d7971a01c69d88581d5ef3a9a6aad9b 100644 (file)
--- a/config/AppleVolumes.default.tmpl
+++ b/config/AppleVolumes.default.tmpl
@@ -84,7 +84,7 @@
 #                        as the volume codepage
 #                        e.g. "UTF8", "UTF8-MAC", "ISO-8859-15"
 # maccharset          -> specifies the charset to be used
-#                        as the mac client codepage
+#                        as the legacy client (<=Mac OS 9) codepage
 #                        e.g. "MAC_ROMAN", "MAC_CYRILLIC"
 #
 # perm                -> default permission value

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index 04ba0ca6b71290a25bb27482e536c647637541e5..7862d73310d8564314a3ad3203cb23ff94ae41a6 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -249,8 +249,8 @@
 #                               Defaults to LOCALE if your system supports it,
 #                               otherwise ASCII will be used.
 #
-#     -maccodepage <CODEPAGE>   Specifies the mac clients codepage,
-#                               e.g. "MAC_ROMAN".
+#     -maccodepage <CODEPAGE>   Specifies the legacy clients (<= Mac OS 9)
+#                               codepage, e.g. "MAC_ROMAN".
 #                               This is used to convert strings to the
 #                               systems locale, e.g. for authenthication
 #                               and SIGUSR2 messaging. This will also be

diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
index dbd0cf2e75fd266f8e328b6df485ad4986a7ff29..f34b8806b0a2a9c202928eda9d0a89c06bad953c 100644 (file)
--- a/etc/afpd/afp_avahi.c
+++ b/etc/afpd/afp_avahi.c
@@ -112,7 +112,7 @@ static void register_stuff(void) {
                 goto fail;
 
             }
-            LOG(log_info, logtype_afpd, "Registering server '%s' with with Bonjour",
+            LOG(log_info, logtype_afpd, "Registering server '%s' with Bonjour",
                 dsi->bonjourname);
 
             if (avahi_entry_group_add_service(ctx->group,