Replace @postgresql.org with @lists.postgresql.org for mailinglists

Commit c0d0e54084 replaced the ones in the documentation, but missed out
on the ones in the code. Replace those as well, but unlike c0d0e54084,
don't backpatch the code changes to avoid breaking translations.

44 files changed, 60 insertions, 60 deletions

diff --git a/configure b/configure
index 67ba8b677ac..7602e65416e 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for PostgreSQL 12devel.
 #
-# Report bugs to <[email protected]>.
+# Report bugs to <[email protected]>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -269,10 +269,10 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell [email protected] and
-$0: [email protected] about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
+$0: [email protected] about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -584,7 +584,7 @@ PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
 PACKAGE_VERSION='12devel'
 PACKAGE_STRING='PostgreSQL 12devel'
-PACKAGE_BUGREPORT='[email protected]'
+PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1602,7 +1602,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <[email protected]>.
+Report bugs to <[email protected]>.
 _ACEOF
 ac_status=$?
 fi
@@ -1910,9 +1910,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------- ##
-## Report this to [email protected] ##
-## ---------------------------------------- ##"
+( $as_echo "## ---------------------------------------------- ##
+## Report this to [email protected] ##
+## ---------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2969,7 +2969,7 @@ PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
 for a similar platform and use the '--with-template=' option.
 
-Please also contact <[email protected]> to see about
+Please also contact <[email protected]> to see about
 rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
@@ -19687,7 +19687,7 @@ $config_links
 Configuration commands:
 $config_commands
 
-Report bugs to <[email protected]>."
+Report bugs to <[email protected]>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
diff --git a/configure.in b/configure.in
index 0fc0fb3cfe3..d599ad85cc8 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [12devel], [[email protected]])
+AC_INIT([PostgreSQL], [12devel], [[email protected]])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -79,7 +79,7 @@ PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
 for a similar platform and use the '--with-template=' option.
 
-Please also contact <[email protected]> to see about
+Please also contact <[email protected]> to see about
 rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index aa122ca0e98..d3a4a50005b 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -211,7 +211,7 @@ help(const char *progname)
 		   "  -p, --port=PORT            database server port number\n"
 		   "  -U, --username=USERNAME    connect as specified database user\n"
 		   "\nThe default action is to show all database OIDs.\n\n"
-		   "Report bugs to <[email protected]>.\n",
+		   "Report bugs to <[email protected]>.\n",
 		   progname, progname);
 }
 
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 946239c2ac7..23f706b21da 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -115,7 +115,7 @@ static bool SetWALSegSize(void);
  *	accessible directory. If you want to make other assumptions,
  *	such as using a vendor-specific archive and access API, these
  *	routines are the ones you'll need to change. You're
- *	encouraged to submit any changes to [email protected]
+ *	encouraged to submit any changes to [email protected]
  *	or personally to the current maintainer. Those changes may be
  *	folded in to later versions of this program.
  */
@@ -615,7 +615,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 <[email protected]>.\n");
+	printf("\nReport bugs to <[email protected]>.\n");
 }
 
 #ifndef WIN32
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index ec5059e9f62..e2baaef4575 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -447,7 +447,7 @@ usage(const char *progname)
 	printf("  -w, --no-password         never prompt for password\n");
 	printf("  -W, --password            force password prompt\n");
 	printf("\n");
-	printf("Report bugs to <[email protected]>.\n");
+	printf("Report bugs to <[email protected]>.\n");
 }
 
 
diff --git a/doc/bug.template b/doc/bug.template
index 53e490433da..f4268a2aace 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -1,12 +1,12 @@
 If PostgreSQL failed to compile on your computer or you found a bug,
-please fill out this form and e-mail it to [email protected].
+please fill out this form and e-mail it to [email protected].
 
 If your bug report has security implications and you'd prefer that it not
 become immediately visible in public archives, don't send it to pgsql-bugs.
 Security issues can be reported privately to [email protected].
 
 If you not only found the problem but solved it and generated a patch
-then e-mail it to [email protected] instead.  Please use the
+then e-mail it to [email protected] instead.  Please use the
 command "diff -c" to generate the patch.
 
 You may also enter a bug report at https://www.postgresql.org/ instead of
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index e7ead7dcc0f..b63ca9234f8 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -925,6 +925,6 @@ headers from specially formatted header files and .dat
 files.  The BKI files are used to initialize the
 postgres template database.
 
-Report bugs to <pgsql-bugs\@postgresql.org>.
+Report bugs to <pgsql-bugs\@lists.postgresql.org>.
 EOM
 }
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index c549974524d..7b18f8c7582 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -377,7 +377,7 @@ 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 <[email protected]>.\n"));
+			 "Report bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a707d4d4653..3052bbbc21a 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -5004,7 +5004,7 @@ ExitPostmaster(int status)
 		ereport(LOG,
 				(errcode(ERRCODE_INTERNAL_ERROR),
 				 errmsg_internal("postmaster became multithreaded"),
-				 errdetail("Please report this to <[email protected]>.")));
+				 errdetail("Please report this to <[email protected]>.")));
 #endif
 
 	/* should cleanup shared memory and kill all backends */
diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl
index f9709405e75..f17a78ebcd2 100644
--- a/src/backend/utils/Gen_fmgrtab.pl
+++ b/src/backend/utils/Gen_fmgrtab.pl
@@ -297,7 +297,7 @@ Usage: perl -I [directory of Catalog.pm] Gen_fmgrtab.pl -I [include path] [path
 Gen_fmgrtab.pl generates fmgroids.h, fmgrprotos.h, and fmgrtab.c from
 pg_proc.dat
 
-Report bugs to <pgsql-bugs\@postgresql.org>.
+Report bugs to <pgsql-bugs\@lists.postgresql.org>.
 EOM
 }
 
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index e55ba668cec..fd50a809ea4 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2419,7 +2419,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 static void
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index c62478dbd6f..4c3a2de0453 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -43,7 +43,7 @@ char		exclusiveCleanupFileName[MAXFNAMELEN];	/* the oldest file we want
  *	accessible directory. If you want to make other assumptions,
  *	such as using a vendor-specific archive and access API, these
  *	routines are the ones you'll need to change. You're
- *	encouraged to submit any changes to [email protected]
+ *	encouraged to submit any changes to [email protected]
  *	or personally to the current maintainer. Those changes may be
  *	folded in to later versions of this program.
  */
@@ -273,7 +273,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 /*------------ MAIN ----------------------------------------*/
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index e51ef91d662..594d67c9e91 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -377,7 +377,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index dc6705c330c..aa114f1563d 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -103,7 +103,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 static bool
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index d75b66f1e79..10429a529d9 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -105,7 +105,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 /*
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 6b119be9d74..5279e7fd797 100644
--- 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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
 
 static void
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 895a51f89d5..1e1fd85b0ba 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -40,7 +40,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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 24caa6fca5a..c82a702ffa6 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -2084,7 +2084,7 @@ do_help(void)
 	printf(_("  demand     start service on demand\n"));
 #endif
 
-	printf(_("\nReport bugs to <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 0e129f96540..2b1a94733b3 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -997,7 +997,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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
 
 static void
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 1d539193ca5..5d40d19596b 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -643,7 +643,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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 44012ff44d1..428e040acb0 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -520,5 +520,5 @@ usage(const char *progname)
 			 "The options -I, -n, -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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index e3213d404ac..562c27904f0 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -1325,5 +1325,5 @@ usage(void)
 	printf(_("  -x, --next-transaction-id=XID  set next transaction ID\n"));
 	printf(_("      --wal-segsize=SIZE         size of WAL segments, in megabytes\n"));
 	printf(_("  -?, --help                     show this help, then exit\n"));
-	printf(_("\nReport bugs to <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index a0dfda701e6..7ccde5c87f5 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -78,7 +78,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index cf4151758f3..ab5e2d6a303 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -336,7 +336,7 @@ usage(void)
 			 "  C:\\> set PGBINNEW=newCluster/bin\n"
 			 "  C:\\> pg_upgrade\n"));
 #endif
-	printf(_("\nReport bugs to <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 
diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c
index cc6ebb9df0d..511262ab5ff 100644
--- a/src/bin/pg_verify_checksums/pg_verify_checksums.c
+++ b/src/bin/pg_verify_checksums/pg_verify_checksums.c
@@ -47,7 +47,7 @@ usage(void)
 	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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
 
 /*
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 49670768f5c..b5c75ce1c68 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -690,7 +690,7 @@ usage(void)
 		   "  -V, --version            output version information, then exit\n"
 		   "  -?, --help               show this help, then exit\n"
 		   "\n"
-		   "Report bugs to <[email protected]>.\n",
+		   "Report bugs to <[email protected]>.\n",
 		   progname, progname);
 }
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index a403431760d..7c6fa2c5902 100644
--- 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 <[email protected]>.\n"));
+	fprintf(output, _("Report bugs to <[email protected]>.\n"));
 
 	ClosePager(output);
 }
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 41dd2a57582..cc6efce5960 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -290,5 +290,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index c765b8ec66f..b40eea4365e 100644
--- 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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 8098f482bb8..ae546c70fbd 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -370,5 +370,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 45680dde273..df7823df991 100644
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -168,5 +168,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 2b6f7218445..62971131c54 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -173,5 +173,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/pg_isready.c b/src/bin/scripts/pg_isready.c
index 467c22891ca..26b21dcbb07 100644
--- 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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 69fb2f8fd2c..1cd1ccc951f 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -421,5 +421,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 127b75e0b43..ec7d0a326a1 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -1093,5 +1093,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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 1a89a8c24e2..8a560ef0f39 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -618,7 +618,7 @@
 #define MEMSET_LOOP_LIMIT 1024
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "[email protected]"
+#define PACKAGE_BUGREPORT "[email protected]"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "PostgreSQL"
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 9fa09bbcb15..75088f83632 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -897,7 +897,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 [email protected].
+#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 [email protected].
 #endif
 
 
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index bef5bb46796..4e4528b0aa3 100644
--- 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 <[email protected]>.\n"));
+	printf(_("\nReport bugs to <[email protected]>.\n"));
 }
 
 static void
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 3131f5f1479..3f7a5d79998 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -1408,7 +1408,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 <[email protected]>"); }
+<INITIAL>{other}|\n	{ mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <[email protected]>"); }
 
 %%
 
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index 40ce3fb5228..afe90498b72 100644
--- 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 brac
 					break;
 				default:
 					if (!IS_SIMPLE_TYPE(type->u.element->type))
-						base_yyerror("internal error: unknown datatype, please report this to <[email protected]>");
+						base_yyerror("internal error: unknown datatype, please report this to <[email protected]>");
 
 					ECPGdump_a_simple(o, name,
 									  type->u.element->type,
@@ -663,7 +663,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 <[email protected]>");
+							base_yyerror("internal error: unknown datatype, please report this to <[email protected]>");
 
 						free(type->u.element);
 				}
diff --git a/src/nls-global.mk b/src/nls-global.mk
index 4fc99379916..aa4058f7663 100644
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -40,7 +40,7 @@ ALL_PO_FILES = $(addprefix po/, $(addsuffix .po, $(AVAIL_LANGUAGES)))
 MO_FILES = $(addprefix po/, $(addsuffix .mo, $(LANGUAGES)))
 
 ifdef XGETTEXT
-XGETTEXT += -ctranslator --copyright-holder='PostgreSQL Global Development Group' [email protected] --no-wrap --sort-by-file --package-name='$(CATALOG_NAME) (PostgreSQL)' --package-version='$(MAJORVERSION)'
+XGETTEXT += -ctranslator --copyright-holder='PostgreSQL Global Development Group' [email protected] --no-wrap --sort-by-file --package-name='$(CATALOG_NAME) (PostgreSQL)' --package-version='$(MAJORVERSION)'
 endif
 
 ifdef MSGMERGE
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index d4f04a8a2c6..4b742a162d4 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2032,7 +2032,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 <[email protected]>.\n"));
+	printf(_("Report bugs to <[email protected]>.\n"));
 }
 
 int
diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README
index 0058770d198..6d355e46167 100644
--- a/src/timezone/tznames/README
+++ b/src/timezone/tznames/README
@@ -18,7 +18,7 @@ in any of the usual ways for setting a parameter, where xyz is the filename
 that contains the desired time zone abbreviations.
 
 If you do not find an appropriate set of abbreviations for your geographic
-location supplied here, please report this to <[email protected]>.
+location supplied here, please report this to <[email protected]>.
 Your set of time zone abbreviations can then be included in future releases.
 For the time being you can always add your own set.
 
diff --git a/src/tools/fix-old-flex-code.pl b/src/tools/fix-old-flex-code.pl
index 4e189405036..45e9433e10a 100644
--- a/src/tools/fix-old-flex-code.pl
+++ b/src/tools/fix-old-flex-code.pl
@@ -61,6 +61,6 @@ Usage: fix-old-flex-code.pl c-file-name
 fix-old-flex-code.pl modifies a flex output file to suppress
 an unused-variable warning that occurs with older flex versions.
 
-Report bugs to <pgsql-bugs\@postgresql.org>.
+Report bugs to <pgsql-bugs\@lists.postgresql.org>.
 EOM
 }