Doc: clarify location of libpq's default service file on Windows.

The documentation didn't specify the name of the per-user service file
on Windows, and extrapolating from the pattern used for other config
files gave the wrong answer.  The fact that it isn't consistent with the
others sure seems like a bug, but it's far too late to change that now;
we'd just penalize people who worked it out in the past.  So, simply
document the true state of affairs.

In passing, fix some gratuitous differences between the discussions
of the service file and the password file.

Julien Rouhaud, per question from Dominique Devienne.

Backpatch to all supported branches.  I (tgl) also chose to back-patch
the part of commit ba356a397 that touched libpq.sgml's description of
the service file --- in hindsight, I'm not sure why I didn't do so at
the time, as it includes some fairly essential information.

Discussion: https://postgr.es/m/CAFCRh-_mdLrh8eYVzhRzu4c8bAFEBn=rwoHOmFJcQOTsCy5nig@mail.gmail.com

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 6659300e3ff2ad7103077b04799c9845a1fe22bf..1d04494cdbbf14ea22982c09758899d3daeeaabc 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -7775,9 +7775,11 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        PGSERVICEFILE
       
       PGSERVICEFILE specifies the name of the per-user
-      connection service file.  If not set, it defaults
-      to ~/.pg_service.conf
+      connection service file
       (see ).
+      Defaults to ~/.pg_service.conf, or
+      %APPDATA%\postgresql\.pg_service.conf on
+      Microsoft Windows.
      
     
 
@@ -8077,11 +8079,11 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
    The file .pgpass in a user's home directory can
    contain passwords to
    be used if the connection requires a password (and no password has been
-   specified  otherwise). On Microsoft Windows the file is named
+   specified otherwise). On Microsoft Windows the file is named
    %APPDATA%\postgresql\pgpass.conf (where
    %APPDATA% refers to the Application Data subdirectory in
    the user's profile).
-   Alternatively, a password file can be specified
+   Alternatively, the password file to use can be specified
    using the connection parameter 
    or the environment variable PGPASSFILE.
   
@@ -8150,8 +8152,12 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
    Service names can be defined in either a per-user service file or a
    system-wide file.  If the same service name exists in both the user
    and the system file, the user file takes precedence.
-   By default, the per-user service file is located
-   at ~/.pg_service.conf; this can be overridden by
+   By default, the per-user service file is named
+   ~/.pg_service.conf.
+   On Microsoft Windows, it is named
+   %APPDATA%\postgresql\.pg_service.conf (where
+   %APPDATA% refers to the Application Data subdirectory
+   in the user's profile).  A different file name can be specified by
    setting the environment variable PGSERVICEFILE.
    The system-wide file is named pg_service.conf.
    By default it is sought in the etc directory