more doc updates

diff --git a/config.mak.in b/config.mak.in
index 93a587f436541b312e16ffd81f293d0413d868be..1e31cbb58a09ff7b6e34d3a32d0eca5307710951 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -16,6 +16,7 @@ datarootdir = @datarootdir@
 sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
 docdir = @docdir@
+mandir = @mandir@
 
 top_builddir = @top_builddir@
 srcdir = @srcdir@

diff --git a/doc/Makefile b/doc/Makefile
index ad4a040ddba41290cf9590a4ec06f9985a7fd847..b6d657419fe88d94ab08ce157b302916011abeef 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -29,7 +29,8 @@ pgbouncer.5: pgbouncer.config.xml
        xmlto man $<
 
 %.xml: %.txt
-       asciidoc -b docbook -d manpage $<
+       asciidoc -b docbook -d manpage -o - $< \
+       | python fixman.py > $@
 
 %.html: %.txt
        asciidoc -a toc $<

diff --git a/doc/fixman.py b/doc/fixman.py
new file mode 100755 (executable)
index 0000000..b227180
--- /dev/null
+++ b/doc/fixman.py
@@ -0,0 +1,4 @@
+#! /usr/bin/env python
+import sys,re
+# add empty <simpara> after <literallayout> to force line break
+sys.stdout.write(re.sub(r"</literallayout>\s+<simpara>", r"\g<0></simpara><simpara>", sys.stdin.read()))

diff --git a/doc/pgbouncer.cmdline.txt b/doc/pgbouncer.cmdline.txt
index 3c454ffbb6d0cf550b6164e97d97135208147f64..17db7e8be20d13ea4e436e7b3c1ac585429660c7 100644 (file)
--- a/doc/pgbouncer.cmdline.txt
+++ b/doc/pgbouncer.cmdline.txt
@@ -46,14 +46,10 @@ database +pgbouncer+.
 
 Basic setup and usage as following.
 
-This example assumes the +postgres+ user is given administrative
-permissions from +pgbouncer.ini+ and that +pgbouncer+ is configured to
-be listening on +localhost:6543+.
-
  1. Create config file.  Details in +pgbouncer(5)+.  Simplest:
 
     [databases]
-    template1 = host=127.0.0.1 dbname=template1
+    template1 = host=127.0.0.1 port=5432 dbname=template1
     
     [pgbouncer]
     listen_port = 6543

diff --git a/doc/pgbouncer.config.txt b/doc/pgbouncer.config.txt
index b178a3a8ba0203e0aba726161eda3fd08351986b..b43134053abc7c9cff745fbf32a2eafe11bae1ec 100644 (file)
--- a/doc/pgbouncer.config.txt
+++ b/doc/pgbouncer.config.txt
@@ -102,7 +102,22 @@ statement::
 
 ==== max_client_conn ====
 
-Maximum number of client connections allowed.
+Maximum number of client connections allowed.  When increased then the file
+descriptor limits should also be increased.  Note that actual number of file
+descriptiors used is more that max_client_conn.  Theoretical maximum used is:
+
+  max_client_conn * max_pool_size * total_databases * total_users
+
+if each user connects under it's own username to server.  If database user
+is specified in connect string (all users connect under same username),
+the theoretical maximum is:
+
+  max_client_conn * max_pool_size * total_databases
+
+The theoretical maximum is never reaches, unless somebody deliberately
+crafts special load for it.  Still, it means you should give fds liberately.
+
+Search for `ulimit` in your favourite shell man page.
 
 Default: 100
 

diff --git a/doc/todo.txt b/doc/todo.txt
index 5945b5361c7820fa74ed28427efc36dd749e81c8..9fea30cb9b8c6578e16d77296937eb35f26b12e8 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -7,6 +7,7 @@
  then issue rollback and keep it
  * suspend_timeout - drop stalled conns
  * rename disable_varcache to track_parameters
+ * some preliminary notification that fd limit is full
 
 == Ver 1.0.9 ==