Fixed bug reporting address in --help messages

vbwagner · vbwagner · commit b5f506f17f99 · 2016-11-08T14:28:42.000+03:00
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
@@ -188,7 +188,7 @@ help(const char *progname)
 		   "  -x             extended (show additional columns)\n"
 		   "  -?, --help     show this help, then exit\n"
 		   "\nThe default action is to show all database OIDs.\n\n"
-		   "Report bugs to <pgsql-bugs@postgresql.org>.\n",
+		   "Report bugs to <" PACKAGE_BUGREPORT ">.\n",
 		   progname, progname);
 }
 
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -524,7 +524,7 @@ usage(void)
 		   "  restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n"
 		   "e.g.\n"
 	"  restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");
-	printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
+	printf("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n");
 }
 
 #ifndef WIN32
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
@@ -443,7 +443,7 @@ usage(const char *progname)
 	printf("  -w             never prompt for password\n");
 	printf("  -W             force password prompt\n");
 	printf("\n");
-	printf("Report bugs to <pgsql-bugs@postgresql.org>.\n");
+	printf("Report bugs to <" PACKAGE_BUGREPORT ">.\n");
 }
 
 
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
@@ -377,7 +377,8 @@ help(const char *progname)
 	printf(_("\nPlease read the documentation for the complete list of run-time\n"
 	 "configuration settings and how to set them on the command line or in\n"
 			 "the configuration file.\n\n"
-			 "Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+			 "Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
+
 }
 
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -4864,7 +4864,7 @@ ExitPostmaster(int status)
 		ereport(LOG,
 				(errcode(ERRCODE_INTERNAL_ERROR),
 				 errmsg_internal("postmaster became multithreaded"),
-		   errdetail("Please report this to <pgsql-bugs@postgresql.org>.")));
+		   errdetail("Please report this to <" PACKAGE_BUGREPORT ">.")));
 #endif
 
 	/* should cleanup shared memory and kill all backends */
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -2679,7 +2679,7 @@ usage(const char *progname)
 	printf(_("  -?, --help                show this help, then exit\n"));
 	printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
 			 "is used.\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 static void
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -278,7 +278,7 @@ usage(void)
 		   "Or for use as a standalone archive cleaner:\n"
 		   "e.g.\n"
 		   "  pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n");
-	printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
+	printf("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n");
 }
 
 /*------------ MAIN ----------------------------------------*/
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -267,7 +267,7 @@ usage(void)
 	printf(_("  -U, --username=NAME    connect as specified database user\n"));
 	printf(_("  -w, --no-password      never prompt for password\n"));
 	printf(_("  -W, --password         force password prompt (should happen automatically)\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -86,7 +86,7 @@ usage(void)
 	printf(_("\nOptional actions:\n"));
 	printf(_("      --create-slot      create a new replication slot (for the slot's name see --slot)\n"));
 	printf(_("      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 static bool
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -99,7 +99,7 @@ usage(void)
 	printf(_("  -U, --username=NAME    connect as specified database user\n"));
 	printf(_("  -w, --no-password      never prompt for password\n"));
 	printf(_("  -W, --password         force password prompt (should happen automatically)\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 /*
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
@@ -102,7 +102,7 @@ help(void)
 	printf(_("  --version             show the PostgreSQL version\n"));
 	printf(_("  -?, --help            show this help, then exit\n"));
 	printf(_("\nWith no arguments, all known items are shown.\n\n"));
-	printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 static void
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
@@ -39,7 +39,7 @@ usage(const char *progname)
 	printf(_("  -?, --help     show this help, then exit\n"));
 	printf(_("\nIf no data directory (DATADIR) is specified, "
 			 "the environment variable PGDATA\nis used.\n\n"));
-	printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -1970,7 +1970,7 @@ do_help(void)
 	printf(_("  demand     start service on demand\n"));
 #endif
 
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -940,7 +940,7 @@ help(const char *progname)
 
 	printf(_("\nIf no database name is supplied, then the PGDATABASE environment\n"
 			 "variable value is used.\n\n"));
-	printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 static void
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -589,7 +589,7 @@ help(void)
 
 	printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
 			 "output.\n\n"));
-	printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -490,5 +490,5 @@ usage(const char *progname)
 			 "The options -I, -n, -P, -t, -T, and --section can be combined and specified\n"
 			 "multiple times to select multiple objects.\n"));
 	printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
-	printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -1180,5 +1180,5 @@ usage(void)
 	printf(_("  -V, --version    output version information, then exit\n"));
 	printf(_("  -x XID           set next transaction ID\n"));
 	printf(_("  -?, --help       show this help, then exit\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -72,7 +72,7 @@ usage(const char *progname)
 	printf(_("      --debug                    write a lot of debug messages\n"));
 	printf(_("  -V, --version                  output version information, then exit\n"));
 	printf(_("  -?, --help                     show this help, then exit\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
@@ -326,7 +326,7 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
   C:\\> set PGBINNEW=newCluster/bin\n\
   C:\\> pg_upgrade\n"));
 #endif
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -449,7 +449,7 @@ usage(void)
 		 "  -V, --version            output version information, then exit\n"
 		   "  -?, --help               show this help, then exit\n"
 		   "\n"
-		   "Report bugs to <pgsql-bugs@postgresql.org>.\n",
+		   "Report bugs to <" PACKAGE_BUGREPORT ">.\n",
 		   progname, progname);
 }
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
@@ -144,7 +144,7 @@ usage(unsigned short int pager)
 	fprintf(output, _("\nFor more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
 					  "commands) from within psql, or consult the psql section in the PostgreSQL\n"
 					  "documentation.\n\n"));
-	fprintf(output, _("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	fprintf(output, _("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 
 	ClosePager(output);
 }
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
@@ -286,5 +286,5 @@ help(const char *progname)
 	printf(_("  -W, --password            force password prompt\n"));
 	printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
 	printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
@@ -270,5 +270,5 @@ help(const char *progname)
 	printf(_("  -W, --password               force password prompt\n"));
 	printf(_("  --maintenance-db=DBNAME      alternate maintenance database\n"));
 	printf(_("\nBy default, a database with the same name as the current user is created.\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
@@ -247,5 +247,5 @@ help(const char *progname)
 	printf(_("  -U, --username=USERNAME   user name to connect as\n"));
 	printf(_("  -w, --no-password         never prompt for password\n"));
 	printf(_("  -W, --password            force password prompt\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
@@ -378,5 +378,5 @@ help(const char *progname)
 	printf(_("  -U, --username=USERNAME   user name to connect as (not the one to create)\n"));
 	printf(_("  -w, --no-password         never prompt for password\n"));
 	printf(_("  -W, --password            force password prompt\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
@@ -167,5 +167,5 @@ help(const char *progname)
 	printf(_("  -w, --no-password         never prompt for password\n"));
 	printf(_("  -W, --password            force password prompt\n"));
 	printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
@@ -248,5 +248,5 @@ help(const char *progname)
 	printf(_("  -U, --username=USERNAME   user name to connect as\n"));
 	printf(_("  -w, --no-password         never prompt for password\n"));
 	printf(_("  -W, --password            force password prompt\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
@@ -168,5 +168,5 @@ help(const char *progname)
 	printf(_("  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"));
 	printf(_("  -w, --no-password         never prompt for password\n"));
 	printf(_("  -W, --password            force password prompt\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/pg_isready.c b/src/bin/scripts/pg_isready.c
@@ -233,5 +233,5 @@ help(const char *progname)
 	printf(_("  -p, --port=PORT          database server port\n"));
 	printf(_("  -t, --timeout=SECS       seconds to wait when attempting connection, 0 disables (default: %s)\n"), DEFAULT_CONNECT_TIMEOUT);
 	printf(_("  -U, --username=USERNAME  user name to connect as\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
@@ -420,5 +420,5 @@ help(const char *progname)
 	printf(_("  -W, --password            force password prompt\n"));
 	printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
 	printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -969,5 +969,5 @@ help(const char *progname)
 	printf(_("  -W, --password            force password prompt\n"));
 	printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
 	printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
@@ -896,7 +896,7 @@ spin_delay(void)
 
 /* Blow up if we didn't have any way to do spinlocks */
 #ifndef HAS_TEST_AND_SET
-#error PostgreSQL does not have native spinlock support on this platform.  To continue the compilation, rerun configure using --disable-spinlocks.  However, performance will be poor.  Please report this to pgsql-bugs@postgresql.org.
+#error PostgreSQL does not have native spinlock support on this platform.  To continue the compilation, rerun configure using --disable-spinlocks.  However, performance will be poor.  Please report this to bugs@postgrespro.org.
 #endif
 
 
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
@@ -58,7 +58,7 @@ help(const char *progname)
 	printf(_("  -?, --help     show this help, then exit\n"));
 	printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"
 			 "input file name, after stripping off .pgc if present.\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 static void
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -1256,7 +1256,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 
 					}
 				}
-<INITIAL>{other}|\n	{ mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"); }
+<INITIAL>{other}|\n	{ mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <" PACKAGE_BUGREPORT ">"); }
 %%
 void
 lex_init(void)
diff --git a/src/interfaces/ecpg/preproc/po/ru.po b/src/interfaces/ecpg/preproc/po/ru.po
@@ -171,10 +171,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+"Report bugs to <bugs@postgrespro.ru>.\n"
 msgstr ""
 "\n"
-"Об ошибках сообщайте по адресу <pgsql-bugs@postgresql.org>.\n"
+"Об ошибках сообщайте по адресу <bugs@postgrespro.ru>.\n"
 
 #: ecpg.c:139
 #, c-format
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
@@ -299,7 +299,7 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * type, const int bra
 					break;
 				default:
 					if (!IS_SIMPLE_TYPE(type->u.element->type))
-						base_yyerror("internal error: unknown datatype, please report this to <pgsql-bugs@postgresql.org>");
+						base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">");
 
 					ECPGdump_a_simple(o, name,
 									  type->u.element->type,
@@ -651,7 +651,7 @@ ECPGfree_type(struct ECPGtype * type)
 						break;
 					default:
 						if (!IS_SIMPLE_TYPE(type->u.element->type))
-							base_yyerror("internal error: unknown datatype, please report this to <pgsql-bugs@postgresql.org>");
+							base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">");
 
 						free(type->u.element);
 				}
diff --git a/src/port/chklocale.c b/src/port/chklocale.c
@@ -291,7 +291,7 @@ pg_codepage_to_encoding(UINT cp)
 
 	ereport(WARNING,
 			(errmsg("could not determine encoding for codeset \"%s\"", sys),
-		   errdetail("Please report this to <pgsql-bugs@postgresql.org>.")));
+		   errdetail("Please report this to <" PACKAGE_BUGREPORT ">.")));
 
 	return -1;
 }
@@ -420,7 +420,8 @@ pg_get_encoding_from_locale(const char *ctype, bool write_message)
 		ereport(WARNING,
 				(errmsg("could not determine encoding for locale \"%s\": codeset is \"%s\"",
 						ctype, sys),
-		   errdetail("Please report this to <pgsql-bugs@postgresql.org>.")));
+		   errdetail("Please report this to <" PACKAGE_BUGREPORT ">.")));
+
 #endif
 	}
 
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -1988,7 +1988,7 @@ help(void)
 	printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
 	printf(_("if the tests could not be run for some reason.\n"));
 	printf(_("\n"));
-	printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
+	printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ help(const char *progname)`
`188`	`188`	`" -x extended (show additional columns)\n"`
`189`	`189`	`" -?, --help show this help, then exit\n"`
`190`	`190`	`"\nThe default action is to show all database OIDs.\n\n"`
`191`		`- "Report bugs to <pgsql-bugs@postgresql.org>.\n",`
	`191`	`+ "Report bugs to <" PACKAGE_BUGREPORT ">.\n",`
`192`	`192`	`progname, progname);`
`193`	`193`	`}`
`194`	`194`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ usage(void)`
`524`	`524`	`" restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n"`
`525`	`525`	`"e.g.\n"`
`526`	`526`	`" restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");`
`527`		`- printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");`
	`527`	`+ printf("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n");`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`#ifndef WIN32`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ usage(const char *progname)`
`443`	`443`	`printf(" -w never prompt for password\n");`
`444`	`444`	`printf(" -W force password prompt\n");`
`445`	`445`	`printf("\n");`
`446`		`- printf("Report bugs to <pgsql-bugs@postgresql.org>.\n");`
	`446`	`+ printf("Report bugs to <" PACKAGE_BUGREPORT ">.\n");`
`447`	`447`	`}`
`448`	`448`
`449`	`449`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,8 @@ help(const char *progname)`
`377`	`377`	`printf(_("\nPlease read the documentation for the complete list of run-time\n"`
`378`	`378`	`"configuration settings and how to set them on the command line or in\n"`
`379`	`379`	`"the configuration file.\n\n"`
`380`		`- "Report bugs to <pgsql-bugs@postgresql.org>.\n"));`
	`380`	`+ "Report bugs to <" PACKAGE_BUGREPORT ">.\n"));`
	`381`	`+`
`381`	`382`	`}`
`382`	`383`
`383`	`384`
Original file line number	Diff line number	Diff line change
`@@ -2679,7 +2679,7 @@ usage(const char *progname)`
`2679`	`2679`	`printf(_(" -?, --help show this help, then exit\n"));`
`2680`	`2680`	`printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"`
`2681`	`2681`	`"is used.\n"));`
`2682`		`- printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));`
	`2682`	`+ printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));`
`2683`	`2683`	`}`
`2684`	`2684`
`2685`	`2685`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ usage(void)`
`278`	`278`	`"Or for use as a standalone archive cleaner:\n"`
`279`	`279`	`"e.g.\n"`
`280`	`280`	`" pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n");`
`281`		`- printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");`
	`281`	`+ printf("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n");`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`/------------ MAIN ----------------------------------------/`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ usage(void)`
`267`	`267`	`printf(_(" -U, --username=NAME connect as specified database user\n"));`
`268`	`268`	`printf(_(" -w, --no-password never prompt for password\n"));`
`269`	`269`	`printf(_(" -W, --password force password prompt (should happen automatically)\n"));`
`270`		`- printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));`
	`270`	`+ printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));`
`271`	`271`	`}`
`272`	`272`
`273`	`273`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ usage(void)`
`86`	`86`	`printf(_("\nOptional actions:\n"));`
`87`	`87`	`printf(_(" --create-slot create a new replication slot (for the slot's name see --slot)\n"));`
`88`	`88`	`printf(_(" --drop-slot drop the replication slot (for the slot's name see --slot)\n"));`
`89`		`- printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));`
	`89`	`+ printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`static bool`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ usage(void)`
`99`	`99`	`printf(_(" -U, --username=NAME connect as specified database user\n"));`
`100`	`100`	`printf(_(" -w, --no-password never prompt for password\n"));`
`101`	`101`	`printf(_(" -W, --password force password prompt (should happen automatically)\n"));`
`102`		`- printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));`
	`102`	`+ printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/*`