2 files changed, 18 insertions, 12 deletions
diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml
index a33a4f7cf85..f19c6b19f53 100644
--- a/doc/src/sgml/dblink.sgml
+++ b/doc/src/sgml/dblink.sgml
@@ -143,13 +143,13 @@ SELECT dblink_connect('myconn', 'dbname=postgres');
 
 CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw OPTIONS (hostaddr '127.0.0.1', dbname 'contrib_regression');
 
-CREATE USER dblink_regression_test WITH PASSWORD 'secret';
-CREATE USER MAPPING FOR dblink_regression_test SERVER fdtest OPTIONS (user 'dblink_regression_test', password 'secret');
-GRANT USAGE ON FOREIGN SERVER fdtest TO dblink_regression_test;
-GRANT SELECT ON TABLE foo TO dblink_regression_test;
+CREATE USER regress_dblink_user WITH PASSWORD 'secret';
+CREATE USER MAPPING FOR regress_dblink_user SERVER fdtest OPTIONS (user 'regress_dblink_user', password 'secret');
+GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+GRANT SELECT ON TABLE foo TO regress_dblink_user;
 
 \set ORIGINAL_USER :USER
-\c - dblink_regression_test
+\c - regress_dblink_user
 SELECT dblink_connect('myconn', 'fdtest');
  dblink_connect 
 ----------------
@@ -173,10 +173,10 @@ SELECT * FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[])
 (11 rows)
 
 \c - :ORIGINAL_USER
-REVOKE USAGE ON FOREIGN SERVER fdtest FROM dblink_regression_test;
-REVOKE SELECT ON TABLE foo FROM dblink_regression_test;
-DROP USER MAPPING FOR dblink_regression_test SERVER fdtest;
-DROP USER dblink_regression_test;
+REVOKE USAGE ON FOREIGN SERVER fdtest FROM regress_dblink_user;
+REVOKE SELECT ON TABLE foo FROM regress_dblink_user;
+DROP USER MAPPING FOR regress_dblink_user SERVER fdtest;
+DROP USER regress_dblink_user;
 DROP SERVER fdtest;
 </screen>
   </refsect1>
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index 504d8daa71b..89e765ea3ab 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -112,8 +112,14 @@ make installcheck-parallel
    <envar>PGPORT</envar> environment variables.  The tests will be run in a
    database named <literal>regression</>; any existing database by this name
    will be dropped.
+  </para>
+
+  <para>
    The tests will also transiently create some cluster-wide objects, such as
-   user identities named <literal>regressuser<replaceable>N</></literal>.
+   roles and tablespaces.  These objects will have names beginning with
+   <literal>regress_</literal>.  Beware of using <literal>installcheck</>
+   mode in installations that have any actual users or tablespaces named
+   that way.
   </para>
   </sect2>
 
@@ -195,8 +201,8 @@ make installcheck-world
   <para>
    When using <literal>installcheck</> mode, these tests will destroy any
    existing databases named <literal>pl_regression</>,
-   <literal>contrib_regression</>, <literal>isolationtest</>,
-   <literal>regress1</>, or <literal>connectdb</>, as well as
+   <literal>contrib_regression</>, <literal>isolation_regression</>,
+   <literal>ecpg1_regression</>, or <literal>ecpg2_regression</>, as well as
    <literal>regression</>.
   </para>
   </sect2>