diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml
index 1172653942a..83da642a8fe 100644
--- a/doc/src/sgml/ref/abort.sgml
+++ b/doc/src/sgml/ref/abort.sgml
@@ -1,5 +1,5 @@
@@ -62,7 +62,7 @@ ROLLBACK
-NOTICE: ROLLBACK: no transaction in progress
+WARNING: ROLLBACK: no transaction in progress
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index 15c1dbdf070..61ddd1417ff 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -1,5 +1,5 @@
@@ -72,7 +72,7 @@ BEGIN
-NOTICE: BEGIN: already a transaction in progress
+WARNING: BEGIN: already a transaction in progress
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 41746ed49ae..4f05079c67d 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,5 +1,5 @@
@@ -70,7 +70,7 @@ CLOSE
-NOTICE PerformPortalClose: portal "cursor" not found
+WARNING: PerformPortalClose: portal "cursor" not found
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index e8a956f6938..8d983652a69 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -1,5 +1,5 @@
@@ -72,7 +72,7 @@ COMMIT
-NOTICE: COMMIT: no transaction in progress
+WARNING: COMMIT: no transaction in progress
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index c0d60f3e92c..942dd900897 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -1,5 +1,5 @@
@@ -102,7 +102,7 @@ ERROR: Relation 'view' already exi
-NOTICE: Attribute 'column' has an unknown type
+WARNING: Attribute 'column' has an unknown type
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index 692656af9c4..67fa3cc8cfe 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,5 +1,5 @@
@@ -153,7 +153,7 @@ SELECT
-NOTICE: Closing pre-existing portal "cursorname"
+WARNING: Closing pre-existing portal "cursorname"
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 34de6e73055..642dc63d480 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -1,5 +1,5 @@
@@ -77,7 +77,7 @@ DROP
-NOTICE RemoveFunction: Function "name" ("types") does not exist
+WARNING: RemoveFunction: Function "name" ("types") does not exist
diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml
index 119ce8235f5..27a6e52b88d 100644
--- a/doc/src/sgml/ref/end.sgml
+++ b/doc/src/sgml/ref/end.sgml
@@ -1,5 +1,5 @@
@@ -72,7 +72,7 @@ COMMIT
-NOTICE: COMMIT: no transaction in progress
+WARNING: COMMIT: no transaction in progress
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index 5a4e2771ec8..d9ed871b289 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -1,5 +1,5 @@
@@ -77,7 +77,7 @@ EXPLAIN [ ANALYZE ] [ VERBOSE ] query
-NOTICE: QUERY PLAN:
+INFO: QUERY PLAN:
plan
@@ -193,7 +193,7 @@ ROLLBACK;
EXPLAIN SELECT * FROM foo;
-NOTICE: QUERY PLAN:
+INFO: QUERY PLAN:
Seq Scan on foo (cost=0.00..2.28 rows=128 width=4)
@@ -210,7 +210,7 @@ EXPLAIN
EXPLAIN SELECT * FROM foo WHERE i = 4;
-NOTICE: QUERY PLAN:
+INFO: QUERY PLAN:
Index Scan using fi on foo (cost=0.00..0.42 rows=1 width=4)
@@ -228,7 +228,7 @@ EXPLAIN
EXPLAIN SELECT sum(i) FROM foo WHERE i = 4;
-NOTICE: QUERY PLAN:
+INFO: QUERY PLAN:
Aggregate (cost=0.42..0.42 rows=1 width=4)
-> Index Scan using fi on foo (cost=0.00..0.42 rows=1 width=4)
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index 60e11ab50f5..c21b22cc2eb 100644
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -1,5 +1,5 @@
@@ -159,7 +159,7 @@ FETCH [ FORWARD | BACKWARD | RELATIVE ] [ #
-NOTICE: PerformPortalFetch: portal "cursor" not found
+WARNING: PerformPortalFetch: portal "cursor" not found
@@ -172,7 +172,7 @@ NOTICE: PerformPortalFetch: portal "cursor
-NOTICE: FETCH/ABSOLUTE not supported, using RELATIVE
+WARNING: FETCH/ABSOLUTE not supported, using RELATIVE
diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml
index dfa6ecbaf98..dfb0c54d097 100644
--- a/doc/src/sgml/ref/listen.sgml
+++ b/doc/src/sgml/ref/listen.sgml
@@ -1,5 +1,5 @@
@@ -70,7 +70,7 @@ LISTEN
-NOTICE Async_Listen: We are already listening on name
+WARNING: Async_Listen: We are already listening on name
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 2ba6eecc9c6..8e87dc30f3b 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -1,5 +1,5 @@
@@ -61,7 +61,7 @@ ABORT
-NOTICE: ROLLBACK: no transaction in progress
+WARNING: ROLLBACK: no transaction in progress
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index a5e0d7735a9..37e7e856525 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -1,5 +1,5 @@
@@ -83,7 +83,7 @@ SHOW ALL
- NOTICE: Time zone is unknown
+ WARNING: Time zone is unknown
If the TZ or PGTZ environment
@@ -102,7 +102,7 @@ SHOW ALL
SHOW DateStyle;
-NOTICE: DateStyle is ISO with US (NonEuropean) conventions
+INFO: DateStyle is ISO with US (NonEuropean) conventions
@@ -110,7 +110,7 @@ NOTICE: DateStyle is ISO with US (NonEuropean) conventions
Show the current genetic optimizer (geqo) setting:
SHOW GEQO;
-NOTICE: geqo is on
+INFO: geqo is on
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index d1038735897..5b2f6c5f1bd 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -1,5 +1,5 @@
@@ -115,7 +115,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [
-NOTICE: --Relation table--
+INFO: --Relation table--
@@ -126,7 +126,7 @@ NOTICE: --Relation table--
-NOTICE: Pages 98: Changed 25, Reapped 74, Empty 0, New 0;
+INFO: Pages 98: Changed 25, Reapped 74, Empty 0, New 0;
Tup 1000: Vac 3000, Crash 0, UnUsed 0, MinLen 188, MaxLen 188;
Re-using: Free/Avail. Space 586952/586952; EndEmpty/Avail. Pages 0/74.
Elapsed 0/0 sec.
@@ -140,7 +140,7 @@ NOTICE: Pages 98: Changed 25, Reapped 74, Empty 0, New 0;
-NOTICE: Index index: Pages 28;
+INFO: Index index: Pages 28;
Tuples 1000: Deleted 3000. Elapsed 0/0 sec.
@@ -251,20 +251,20 @@ NOTICE: Index index: Pages 28;
regression=> VACUUM VERBOSE ANALYZE onek;
-NOTICE: --Relation onek--
-NOTICE: Index onek_unique1: Pages 14; Tuples 1000: Deleted 3000.
+INFO: --Relation onek--
+INFO: Index onek_unique1: Pages 14; Tuples 1000: Deleted 3000.
CPU 0.00s/0.11u sec elapsed 0.12 sec.
-NOTICE: Index onek_unique2: Pages 16; Tuples 1000: Deleted 3000.
+INFO: Index onek_unique2: Pages 16; Tuples 1000: Deleted 3000.
CPU 0.00s/0.10u sec elapsed 0.10 sec.
-NOTICE: Index onek_hundred: Pages 13; Tuples 1000: Deleted 3000.
+INFO: Index onek_hundred: Pages 13; Tuples 1000: Deleted 3000.
CPU 0.00s/0.10u sec elapsed 0.10 sec.
-NOTICE: Index onek_stringu1: Pages 31; Tuples 1000: Deleted 3000.
+INFO: Index onek_stringu1: Pages 31; Tuples 1000: Deleted 3000.
CPU 0.01s/0.09u sec elapsed 0.10 sec.
-NOTICE: Removed 3000 tuples in 70 pages.
+INFO: Removed 3000 tuples in 70 pages.
CPU 0.02s/0.04u sec elapsed 0.07 sec.
-NOTICE: Pages 94: Changed 0, Empty 0; Tup 1000: Vac 3000, Keep 0, UnUsed 0.
+INFO: Pages 94: Changed 0, Empty 0; Tup 1000: Vac 3000, Keep 0, UnUsed 0.
Total CPU 0.05s/0.45u sec elapsed 0.59 sec.
-NOTICE: Analyzing onek
+INFO: Analyzing onek
VACUUM