Tweak some SCRAM error messages and code comments

Clarify/correct some error messages, fix up some code comments that
confused SASL and SCRAM, and other minor fixes.  No changes in
functionality.

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index c8b083c29cc..7c012f59a3e 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1405,13 +1405,13 @@ ErrorMessage.
   </para>
 
   <para>
-When SCRAM-SHA-256 is used in PostgreSQL, the server will ignore the username
-that the client sends in the <structname>client-first-message</>. The username
+When SCRAM-SHA-256 is used in PostgreSQL, the server will ignore the user name
+that the client sends in the <structname>client-first-message</>. The user name
 that was already sent in the startup message is used instead.
 <productname>PostgreSQL</> supports multiple character encodings, while SCRAM
-dictates UTF-8 to be used for the username, so it might be impossible to
-represent the PostgreSQL username in UTF-8. To avoid confusion, the client
-should use <literal>pg_same_as_startup_message</literal> as the username in the
+dictates UTF-8 to be used for the user name, so it might be impossible to
+represent the PostgreSQL user name in UTF-8. To avoid confusion, the client
+should use <literal>pg_same_as_startup_message</literal> as the user name in the
 <structname>client-first-message</>.
   </para>
 
@@ -5274,7 +5274,7 @@ RowDescription (B)
 
 <varlistentry>
 <term>
-SASLInitialresponse (F)
+SASLInitialResponse (F)
 </term>
 <listitem>
 <para>