From 9faf3d43bdbdab2aa0df10f3470208f260d51dcd Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 9 Nov 2009 15:18:13 -0700 Subject: [PATCH] version-etc: match standards.texi style This assumes that PACKAGE_BUGREPORTS and PACKAGE_PACKAGER_BUG_REPORTS are generally email addresses, not URLs. Coreutils switched to a similar style on 2009-02-01, with no complaints (the difference is that coreutils inserts the program name, derived from argv[0], into the bug reporting line). Around that time, standards.texi was also updated to mention this style. * lib/version-etc.c (emit_bug_reporting_address): Drop periods, and use <> only for URLs. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ lib/version-etc.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3ed685b9..405bfdaa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-12 Eric Blake + + version-etc: match standards.texi style + * lib/version-etc.c (emit_bug_reporting_address): Drop periods, + and use <> only for URLs. + 2009-11-10 Kamil Dudka fts: do not fail on a submount during traversal diff --git a/lib/version-etc.c b/lib/version-etc.c index a580140c4..bf67c37b0 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -236,13 +236,17 @@ emit_bug_reporting_address (void) for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + printf (_("\nReport bugs to: %s\n"), PACKAGE_BUGREPORT); #ifdef PACKAGE_PACKAGER_BUG_REPORTS - printf (_("Report %s bugs to <%s>.\n"), PACKAGE_PACKAGER, + printf (_("Report %s bugs to: %s\n"), PACKAGE_PACKAGER, PACKAGE_PACKAGER_BUG_REPORTS); #endif - printf (_("%s home page: .\n"), +#ifdef PACKAGE_URL + printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); +#else + printf (_("%s home page: \n"), PACKAGE_NAME, PACKAGE); - fputs (_("General help using GNU software: .\n"), +#endif + fputs (_("General help using GNU software: \n"), stdout); } -- 2.11.0