doc update

diff --git a/doc/Makefile b/doc/Makefile
index 646520900bf4052628a71d30ed0107c8effb96ef..ee7919983accb6906ed5fffdfdcd2f49596a9cba 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,8 +3,9 @@ wiki = https://developer.skype.com/SkypeGarage/DbProjects/SkyTools
 
 web = mkz@shell.pgfoundry.org:/home/pgfoundry.org/groups/skytools/htdocs/
 
-EPYARGS = --no-private -u "http://pgfoundry.org/projects/skytools/" \
-       -n "Skytools"
+EPYDOC = epydoc-py25
+EPYARGS = --no-private --url="http://pgfoundry.org/projects/skytools/" \
+       --name="Skytools" --html --no-private
 
 all:
 
@@ -18,22 +19,24 @@ upload:
        devupload.sh walmgr.txt $(wiki)/WalMgr
        devupload.sh pgq-admin.txt $(wiki)/PgqAdm
 
-PY_PKGS = skytools skytools.config skytools.dbstruct skytools.gzlog \
-       skytools.quoting skytools.scripting skytools.sqltools \
-       pgq pgq.consumer pgq.event pgq.maint pgq.producer pgq.status pgq.ticker \
-       londiste londiste.compare londiste.file_read londiste.file_write \
-       londiste.installer londiste.playback londiste.repair londiste.setup \
-       londiste.syncer londiste.table_copy
+PY_PKGS = skytools pgq londiste
+
+#      skytools.config skytools.dbstruct skytools.gzlog \
+#      skytools.quoting skytools.scripting skytools.sqltools \
+#      pgq pgq.consumer pgq.event pgq.maint pgq.producer pgq.status pgq.ticker \
+#      londiste londiste.compare londiste.file_read londiste.file_write \
+#      londiste.installer londiste.playback londiste.repair londiste.setup \
+#      londiste.syncer londiste.table_copy
 
 apidoc:
        rm -rf api
        mkdir -p api
-       cd ../python && epydoc3 -o ../doc/api --html --no-private $(PY_PKGS)
+       cd ../python && $(EPYDOC) $(EPYARGS) -o ../doc/api $(PY_PKGS)
 
 apiupload: apidoc
-       cd ../sql/pgq && rm -rf docs/pgq && $(MAKE) dox && mv docs/html docs/pgq
-       rsync -rtlz api $(web)
-       rsync -rtlz ../sql/pgq/docs/pgq $(web)
+       rsync -rtlz api/* $(web)/api
+       cd ../sql/pgq && rm -rf docs/html && $(MAKE) dox
+       rsync -rtlz ../sql/pgq/docs/html/* $(web)/pgq/
 
 clean:
        rm -rf api

diff --git a/doc/TODO.txt b/doc/TODO.txt
index 5d8e1bf267ff7a9267628bed8637b3ae0b570ea8..cb4f36f86c84ad4a6fb423ec15815d696893ec7f 100644 (file)
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -27,15 +27,19 @@
  * londiste: remove denytrigger from source, thus no plpython anymore...
  it was unused anyway.
  * replace logtriga() with pgq.logtriga() for londiste trigger
+ * backend modules need to be ported to 8.3
+ * londiste: good fkey support: store them in subscriber db and apply when both tables are in sync. [erik]
 
 == To Do ==
 
  * add <seq>, remove <seq> [marko]
  * pgq/londiste/pgq_ext: schema upgrade scripts  [marko]
+ * fast copy snapshot cleanup [marko]
 
 = Next major release - 2.2 =
 
  * cascaded replication, switchover, failover [marko]
+ * skytools: config from database
  * drop support for psycopg1
  * drop support for 8.1?
 
@@ -48,7 +52,6 @@
 == Smaller things ==
 
  * pgq: RemoteConsumer/SerialConsumer/pgq_ext sanity, too much duplication [marko]
- * backend modules need to be ported to 8.3
  * londiste: create tables on subscriber
  * pgqadm: Utility commands:
   * reg-copy que cons1 cons2
@@ -69,7 +72,6 @@
 
  * londiste: denytriggers on subscriber
  * londiste: Quote SQL identifiers, keep combined name, rule will be "Split schema as first dot"
- * londiste: good fkey support: store them in subscriber db and apply when both tables are in sync. [erik]
  * skylog: publish sample logdb schema, with some tools
  * londiste: allow table redirection on subscriber side
  * londiste: trigger handling
@@ -105,7 +107,6 @@
 = Just ideas =
 
  * skytools: config-less operation?
- * skytools: config from database?
  * skytools: partial sql parser for log processing
  * londiste: EXECUTE SCRIPT
  * londiste: somehow automatic sync of table structure/functions/...?