diff --git a/configure b/configure
index 460df8ad6a5b716502f0449c27b85736f738e646..e461bacf073a468795181b9e519020bf046b0e49 100755
--- a/configure
+++ b/configure
@@ -2081,7 +2081,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 <pgsql-ports@postgresql.org> to see about
+Please also contact <pgsql-bugs@postgresql.org> to see about
rectifying this. Include the above 'checking host system type...'
line.
*******************************************************************
@@ -2092,7 +2092,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 <pgsql-ports@postgresql.org> to see about
+Please also contact <pgsql-bugs@postgresql.org> to see about
rectifying this. Include the above 'checking host system type...'
line.
*******************************************************************
diff --git a/configure.in b/configure.in
index 228157c062af7734c120960dc2b9b3799dfdc6f4..4f7198915ef258a69c1e8eca45f68e8eaf625e9f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.581 2009/01/06 15:38:44 tgl Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.582 2009/01/06 17:27:06 tgl Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@@ -88,7 +88,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 <pgsql-ports@postgresql.org> to see about
+Please also contact <pgsql-bugs@postgresql.org> to see about
rectifying this. Include the above 'checking host system type...'
line.
*******************************************************************
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 5fd1d842c4b81077fc21d959fa2254e5706dd7bc..fe8b23465000222332ce0ffddc89e6731871414e 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.16 2008/12/15 22:13:02 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.17 2009/01/06 17:27:06 tgl Exp $
*
*
* pg_standby.c
@@ -91,7 +91,7 @@ struct stat stat_buf;
* 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
- * enouraged to submit any changes to pgsql-patches@postgresql.org
+ * enouraged to submit any changes to pgsql-hackers@postgresql.org
* or personally to the current maintainer. Those changes may be
* folded in to later versions of this program.
*/
diff --git a/doc/bug.template b/doc/bug.template
index 2292ea8001f13783f42334b805ef10adbe02869f..c1b31425d766e3bd5a22293764b1b3680a29fff2 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -1,16 +1,12 @@
-If PostgreSQL failed to compile on your computer or you found a bug that
-is likely to be specific to one platform, then please fill out this form
-and e-mail it to pgsql-ports@postgresql.org.
-
-To report non-porting-related bugs, fill out the form below and e-mail it to
-pgsql-bugs@postgresql.org.
+If PostgreSQL failed to compile on your computer or you found a bug,
+please fill out this form and e-mail it to pgsql-bugs@postgresql.org.
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 security@postgresql.org.
If you not only found the problem but solved it and generated a patch
-then e-mail it to pgsql-patches@postgresql.org instead. Please use the
+then e-mail it to pgsql-hackers@postgresql.org instead. Please use the
command "diff -c" to generate the patch.
You may also enter a bug report at http://www.postgresql.org/ instead of
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index 0730b17a3fa410537eaa7118d20c7eedc8ea6879..2601cc679aba0fc415f77a9076b2c6de4f48bcfb 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.28 2007/01/31 20:56:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.29 2009/01/06 17:27:06 tgl Exp $ -->
<sect1 id="bug-reporting">
<title>Bug Reporting Guidelines</title>
@@ -341,10 +341,10 @@
Please be specific about what part of the documentation you are unhappy
with.
</para>
-
+
<para>
If your bug is a portability problem on a non-supported platform,
- send mail to <email>pgsql-ports@postgresql.org</email>,
+ send mail to <email>pgsql-hackers@postgresql.org</email>,
so we (and you) can work on
porting <productname>PostgreSQL</productname> to your platform.
</para>