move authfile section to config.txt

diff --git a/doc/config.txt b/doc/config.txt
index 622646300bbd0d75fe10a2f63b798286e524ac49..f0c4875f56cdf0e867ca37d7f7dcc0d45e065c40 100644 (file)
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -179,14 +179,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.
 
@@ -404,9 +406,25 @@ Ask specific +timezone+ from server.
   ; acceess to dest database will go with single user
   forcedb = host=127.0.0.1 port=300 user=baz password=foo client_encoding=UNICODE datestyle=ISO
 
+== 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.
+
 == 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 4fe49cdbe9d839c48a030863dcaa8e8c6700e171..ffc9a3c0158c5db045fb6069cda7c1f1e526ba92 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[]