remove some junk

diff --git a/doc/Makefile b/doc/Makefile
index 55e194c814262eb507126ca93119103edf9c8e73..f908b907f9716836b516069f175dda68e6e76b38 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -67,8 +67,8 @@ londiste.5: londiste.config.xml
 %.html: %.txt
        asciidoc $<
 
-manupload: londiste.1 londiste.1.html
-       rsync -avz londiste.1 londiste.1.html londiste.1.txt pgf:web/skytools/htdocs/man/
+manupload: man html
+       rsync -avz londiste.[15] *.html *.txt pgf:web/skytools/htdocs/man/
 
 
 

diff --git a/doc/londiste.cmdline.txt b/doc/londiste.cmdline.txt
index c3c258e012c1f5ae685e0e4ee875a2a575b10a4a..13e75043ea924d93f00ae0af2942b92773931b53 100644 (file)
--- a/doc/londiste.cmdline.txt
+++ b/doc/londiste.cmdline.txt
@@ -98,7 +98,7 @@ command.
 
 == PROVIDER COMMANDS ==
 
-  londiste.py config.ini provider <command>
+  $ londiste.py config.ini provider <command>
 
 Where command is one of:
 
@@ -110,20 +110,10 @@ queue. Equivalent to doing following by hand:
     CREATE LANGUAGE plpgsql;
     CREATE LANGUAGE plpython;
     \i .../contrib/txid.sql
-    \i .../contrib/logtriga.sql
     \i .../contrib/pgq.sql
     \i .../contrib/londiste.sql
     select pgq.create_queue(queue name);
 
-Notes:
-
- * If the PostgreSQL modules are not installed on the same machine as
-   the Python scripts are, the commands need to be done by hand.
-
- * The schema/tables are installed under user Londiste is configured
-   to run. If you prefer to run Londiste under non-admin user, they
-   should also be installed by hand.
-
 === provider add <table name> ... ===
 
 Registers table(s) on the provider database and adds the londiste trigger to