more doc update

diff --git a/doc/Makefile b/doc/Makefile
index 8cc549dfb9a4965d1020191e3dd2743847394690..954ea46895da03cb89d4ead88004fe0a42da2d5d 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,10 +5,11 @@ web = mkz@shell.pgfoundry.org:/home/pgfoundry.org/groups/pgbouncer/htdocs/
 -include ../config.mak
 
 MANPAGES = pgbouncer.1 pgbouncer.5
+HTML = config.html usage.html todo.html
 
 all: $(MANPAGES)
 
-html: config.html usage.html
+html: $(HTML)
 
 install: $(MANPAGES)
        mkdir -p $(DESTDIR)$(mandir)/man1/
@@ -18,7 +19,7 @@ install: $(MANPAGES)
 
 upload:
        devupload.sh overview.txt $(wiki)
-       devupload.sh todo.txt $(wiki)/ToDo
+       #devupload.sh todo.txt $(wiki)/ToDo
        #devupload.sh usage.txt $(wiki)/UsageInfo
        #devupload.sh config.txt $(wiki)/ConfigFile
 
@@ -48,6 +49,6 @@ distclean: clean
 realclean: distclean
        rm -f *.[1-9]
 
-web:
+web: $(HTML)
        rsync -av $(HTML) $(web)/doc/
 

diff --git a/doc/overview.txt b/doc/overview.txt
index 156c299b4952549dda3cc4bf73551402569ae431..0c2bce63e8638f661bd289a73de12d57bdcde590 100644 (file)
--- a/doc/overview.txt
+++ b/doc/overview.txt
@@ -42,9 +42,9 @@ Downloads, bugtracker, CVS: http://pgfoundry.org/projects/pgbouncer
 
 == Docs ==
 
- * Detailed usage info: ./UsageInfo
- * Config file help: ./ConfigFile
- * TODO list: ./ToDo
+ * Detailed usage info: [http://pgbouncer.projects.postgresql.org/doc/usage.html usage.html]
+ * Config file help: [http://pgbouncer.projects.postgresql.org/doc/config.html config.html]
+ * TODO list: [http://pgbouncer.projects.postgresql.org/doc/todo.html todo.html]
 
 == Feature map ==
 

diff --git a/doc/todo.txt b/doc/todo.txt
index 0bbc3aed812f091eb8fd6a7356b42638583f98e5..08907353a64d4f042150716e5614e568a6906d5b 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,27 +1,5 @@
 = PgBouncer TODO list =
 
-== Ver 1.1 ==
-
-
-== Ver 1.0.9 ==
-
- * Support downgrade from 1.1.
-
-== Make -R less scary ==
-
- * -R should somehow log whats happens
- * -R should detect that no pooler is running and boot normally
- * -R should detect if login fails then exit()
-
-''' Details: '''
- * Takeover before fork()
- * must not touch libevent, just fill structures,
- libevent init after fork()
- * ^C while takeover - immidiate _exit()
- * detection:
-   * if tcp - try binding
-   * if unix - try connect()
-
 == Minor features ==
 
  * suspend_timeout - drop stalled conns
@@ -37,7 +15,27 @@
 
 == Major features ==
 
- * load-balancing between different servers.
-   - possibility to specify failover databases.
+=== prepared plans ===
+
  * keeping track of protocol-level prepared plans
    - JDBC workaround in the meantime: protocolVersion=2
+
+=== make -R less scary ===
+
+ * -R should somehow log whats happens
+ * -R should detect that no pooler is running and boot normally
+ * -R should detect if login fails then exit()
+ * Details:
+   - Takeover before fork()
+   - must not touch libevent, just fill structures,
+     libevent init after fork()
+   - ^C while takeover - immidiate _exit()
+ * Detect existing process:
+   - if tcp - try binding
+   - if unix - try connect()
+
+=== load-balancing ===
+
+ * allow serveral server to serve one db
+   - possibility to specify failover databases.
+