diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index ae907386fd348aab3c99ffcf2685850c9b18e493..0dddafaa9a284be7ca7a6b30c2492ce13d8f2641 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.289 2004/08/26 13:08:59 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.290 2004/08/26 13:44:38 momjian Exp $
-->
<appendix id="release">
@@ -40,9 +40,9 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.289 2004/08/26 13:08:59 momjian
</para>
<para>
Because Win32 is significantly different from the Unix platforms
- supported in previous releases, this port might have more bugs
- than other supported platforms in this release. Please test it
- thoroughly before using it in production.
+ supported in previous releases, it has not been tested as
+ extensively as other supported platforms in this release. Please
+ test it thoroughly before using it in production.
</para>
<para>
Previous releases required the Unix emulation toolkit Cygwin for
diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index 490fe76ffb105fc8658a7a0e7af5908d464811e1..2f061b27b4e977c41d6f00a506175cc13711063f 100644
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -10,12 +10,12 @@
# databases they can access. Records take one of seven forms:
#
# local DATABASE USER METHOD [OPTION]
-# host DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
-# hostssl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
-# hostnossl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
-# host DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
-# hostssl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
-# hostnossl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
+# host DATABASE USER CIDR-ADDRESS METHOD [OPTION]
+# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
+# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
+# host DATABASE USER CIDR-ADDRESS METHOD [OPTION]
+# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
+# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
#
# (The uppercase quantities should be replaced by actual values.)
# The first field is the connection type: "local" is a Unix-domain socket,
@@ -24,16 +24,21 @@
# DATABASE can be "all", "sameuser", "samegroup", a database name (or
# a comma-separated list thereof), or a file name prefixed with "@".
# USER can be "all", an actual user name or a group name prefixed with
-# "+" or a list containing either. IP-ADDRESS and IP-MASK specify the
-# set of hosts the record matches. CIDR-MASK is an integer between 0
-# and 32 (IPv6) or 128(IPv6) inclusive, that specifies the number of
-# significant bits in the mask, so an IPv4 CIDR-MASK of 8 is equivalent
-# to an IP-MASK of 255.0.0.0, and an IPv6 CIDR-MASK of 64 is equivalent
-# to an IP-MASK of ffff:ffff:ffff:ffff::. METHOD can be "trust", "reject",
-# "md5", "crypt", "password", "krb4", "krb5", "ident", or "pam". Note
-# that "password" uses clear-text passwords; "md5" is preferred for
-# encrypted passwords. OPTION is the ident map or the name of the PAM
-# service.
+# "+" or a list containing either.
+#
+# CIDR-ADDRESS specifies the set of hosts the record matches.
+# It is made up of an IP address and a CIDR mask that is an integer
+# between 0 and 32 (IPv6) or 128(IPv6) inclusive, that specifies
+# the number of significant bits in the mask, e.g. an IPv4 CIDR mask
+# of 8 is equivalent to an IP mask of 255.0.0.0, an IPv6 CIDR mask
+# of 64 is equivalent to an IP mask of ffff:ffff:ffff:ffff::. A
+# IPv4 CIDR mask of 32 is used for single hosts. Also, you can use a
+# separate IP address and netmask to specify the set of hosts.
+#
+# METHOD can be "trust", "reject", "md5", "crypt", "password",
+# "krb4", "krb5", "ident", or "pam". Note that "password" uses
+# clear-text passwords; "md5" is preferred for encrypted passwords.
+# OPTION is the ident map or the name of the PAM service.
#
# Database and user names containing spaces, commas, quotes and other special
# characters can be quoted. Quoting one of the keywords "all", "sameuser" or
@@ -56,10 +61,10 @@
@authcomment@
-# TYPE DATABASE USER IP-ADDRESS IP-MASK METHOD
+# TYPE DATABASE USER CIDR-ADDRESS METHOD
-local all all @authmethod@
+local all all @authmethod@
# IPv4-style local connections:
-host all all 127.0.0.1/32 @authmethod@
+host all all 127.0.0.1/32 @authmethod@
# IPv6-style local connections:
-host all all ::1/128 @authmethod@
+host all all ::1/128 @authmethod@