sync some doc fixes from -stable

diff --git a/doc/config.txt b/doc/config.txt
index 116573cefc91dd8bb81e4c3489ce4c83049561c4..bb0ef58e74bfaf275a1db9be1469e2d4c9619ee4 100644 (file)
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -150,7 +150,7 @@ Default: 0
 By default, PgBouncer allows only parameters it can keep track of in startup
 packets - `client_encoding`, `datestyle`, `timezone` and `standard_conforming_strings`.
 
-All others raise error.  To allow but ignore others too, they can be specified here,
+All others raise error.  To allow others too, they can be specified here,
 so that pgbouncer knows that they are handled by admin and it can ignore them.
 
 Default: empty
@@ -192,14 +192,16 @@ Default: 1
 
 ==== admin_users ====
 
-List of users that are allowed to run all commands on console.
+Comma-separted list of database users that are allowed to connect and
+run all commands on console.
 
 Default: empty
 
 ==== stats_users ====
 
-List of users that are allowed to run read-only queries on console. Thats means
-all SHOW commands except SHOW FDS.
+Comma-separated list of database users that are allowed to connect and
+run read-only queries on console. Thats means all SHOW commands except
+SHOW FDS.
 
 Default: empty.
 
@@ -392,7 +394,23 @@ Ask specific +datestyle+ from server.
 
 Ask specific +timezone+ from server.
 
-== Example ==
+== AUTHENTICATION FILE FORMAT ==
+
+PgBouncer needs its own user database. The users are loaded from text
+file that should be in same format as PostgreSQL's +pg_auth/pg_pwd+
+file.
+
+  "username1" "password" ... 
+  "username2" "md5abcdef012342345" ...
+
+There shoud be at least 2 fields, surrounded by double quotes. First
+is username and second either plain-text or md5-hashed
+password. PgBouncer ignores rest of the line.
+
+Such file format allows to direct PgBouncer directly to PostgreSQL
+user file under data directory.
+
+== EXAMPLE ==
 
 === Minimal config ===
 
@@ -425,7 +443,7 @@ Ask specific +timezone+ from server.
 
 == SEE ALSO ==
 
-pgbouncer(1)
+pgbouncer(1) - manpage for general usage, console commands.
 
 https://developer.skype.com/SkypeGarage/DbProjects/PgBouncer[]
 

diff --git a/doc/usage.txt b/doc/usage.txt
index 71ab54124b0ea39714691fadac3be68edec918f1..72beb4afdb44dc4f7b8c0e57cac08dd7951e6345 100644 (file)
--- a/doc/usage.txt
+++ b/doc/usage.txt
@@ -436,24 +436,8 @@ From libevent docs:
   By setting the environment variable EVENT_SHOW_METHOD, libevent
   displays the kernel notification method that it uses.
 
-=== AUTHENTICATION FILE FORMAT ===
-
-PgBouncer needs its own user database. The users are loaded from text
-file that should be in same format as PostgreSQL's +pg_auth/pg_pwd+
-file.
-
-  "username1" "password" ... 
-  "username2" "md12342345234" ...
-
-There shoud be at least 2 fields, surrounded by double quotes. First
-is username and second either plain-text or md5-hashed
-password. PgBouncer ignores rest of the line.
-
-Such file format allows to direct PgBouncer directly to PostgreSQL
-user file under data directory.
-
 == SEE ALSO ==
 
-pgbouncer(5) - configuration settings descriptions.
+pgbouncer(5) - manpage of configuration settings descriptions.
 
 https://developer.skype.com/SkypeGarage/DbProjects/PgBouncer[]