Merge branch 'PGPROEE9_6' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6

vbwagner · vbwagner · commit af68524a0c5d · 2016-10-24T17:33:40.000+03:00
diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
@@ -45,7 +45,10 @@
 # METHOD can be "trust", "reject", "md5", "password", "scram", "gss",
 # "sspi", "ident", "peer", "pam", "ldap", "radius" or "cert".  Note that
 # "password" sends passwords in clear text; "md5" or "scram" are preferred
-# since they send encrypted passwords.
+# since they send encrypted passwords. Please note that user created with
+# CREATE ROLE ... USING PASSWORD ... USING 'scram' can authorize using
+# only "scram" method. For historical reasons users that have 'md5'
+# password can authorize using both 'md5' and 'password' methods.
 #
 # OPTIONS are a set of options for the authentication in the format
 # NAME=VALUE.  The available options depend on the different
