documentation updates

diff --git a/README b/README
index bdc7fa1..927cd76 100644 (file)
--- a/README
+++ b/README
@@ -66,10 +66,16 @@ There are several interfaces to interact with uzbl:
   insert mode: keystrokes are not interpreted so you can enter text into html forms
   Press ESC/i to toggle command/insert mode
   But if you don't like modal interfaces, you can set `always_insert_mode` and configure a modkey to execute the commands. (emacs style).
-* FIFO & socket file: if enabled by setting their paths through one of the above means, you can have socket and fifo files available which are very useful to programatically (from scripts etc) to uzbl.
+  There is also support for "chained" commands (multiple characters long) (with backspace/esc shortcuts), and keyworded commands.
+  Also you can have incremental matching on commands or match after pressing return.  (see sampleconfig for more info)
+  Also, copy paste works when typing commands:
+  * insert (paste X cliboard)
+  * shift insert (paste primary selection buffer)
+* FIFO & socket file: if enabled by setting their paths through one of the above means, you can have socket and fifo files available which are very useful to programatically control uzbl (from scripts etc).
   The advantage of the fifo is you can write plaintxt commands to it, but it's half duplex only (uzbl cannot send a response to you).
   The socket is full duplex but you need a socket-compatible wrapper such as netcat to work with it, or uzblctrl of course,
-   an utitly we include with uzbl made especially for writing commnands to the socket (and at some point, it will be able to tell you the response too)
+  an utitly we include with uzbl made especially for writing commnands to the socket (and at some point, it will be able to tell you the response
+  too):  `uzblctrl -s <socketfile> -c <command>`
 
 ### COMMAND SYNTAX
 TODO
@@ -129,6 +135,16 @@ The script specific arguments are this:
     $11 cookie (only with PUT requests)
 
 
+### COMMAND LINE ARGUMENTS
+
+    -u, --uri=URI            Uri to load (equivalent to 'set uri = URI')
+    -v, --verbose=VERBOSE    Whether to print all messages or just errors.
+    -n, --name=NAME          Name of the current instance (defaults to Xorg window id)
+    -c, --config=FILE        Config file (this is pretty much equivalent to uzbl < FILE )
+    --display=DISPLAY        X display to use
+    --help                   Help
+
+
 ### BUGS
 known bugs:
 

diff --git a/docs/CHECKLIST b/docs/CHECKLIST
deleted file mode 100644 (file)
index 6c4a4f7..0000000
--- a/docs/CHECKLIST
+++ /dev/null
@@ -1,43 +0,0 @@
-THIS FILE IS DEPRECATED.
-TODO: make sure that all this gets merged into the documentation
-
-This file contains all things that are/should be working.
-When you have been working on something, use this list to verify that you did not cause any regressions (things that worked before, but got broken).
-Also, when you finish a new feature, add it to this list so that everyone knows about it, can play with it, and can test it.
-
-Also testers and interested people can use this list to see what uzbl is about, and report problems if they find items listed here that do not work.
-
-* commandline switches --uri "http://.." and --config behave as expected
-* --help and -? should show help
-* config loading: loading of settings, bindings and all behavior settings (including handlers) from config file
-* fifo: type this in your shell after starting uzbl:
-  echo 'uri http://www...' > <fifo path here>'
-  where <fifo path> is printed on stdout during program startup.  Also "back" , "forward", "refresh" (basically all actions defined in `static Command commands` should behave as expected)
-  On one of Dieter's pc's, using the fifo only works once.  Please report issues with the fifo if you find any.
-* socket: uzblctrl -s <socketname> -c <command> (same commands as with fifo)
-* history logging: the script as defined in sample config should write history entries (date,time, url) into the file defined in the script (by default ./extra/history.sh and /tmp/uzbl.history)
-* invocations of external commands: you'll see it on stdout everytime uzbl calls an external script/program. the invocations should work and none of the arguments passed should be null/garbage/.. .
-  all should be valid strings and contain things like the pid, fifo file, config file,.. (see README for details).
-* XDG_CONFIG_HOME and XDG_CONFIG_DIRS (+ default values) fully supported and working (looks for a config file called 'uzbl/config').
-* --uri can be specified without http:// -- if missing will be prepended.
-* Downloading of files with handler script
-* Open in new window. all (valid) args passed to your uzbl instance are passed also to the new instance, with the obvious exception of --uri.
-* internal keybinds to change things work (as loaded by config)
-* vimlike command and insert modes behave as expected
-* always_insert_mode and modkey work too
-* status bar can be toggled on and off, if off, some info (mode) will be put in title bar. position of statusbar (top/bottom) also works
-* backspace erases last edit character. esc erases entire command buffer (if in comand mode)
-* commands with parameters (keywords): any key sequence that ends with underscore _ expects parameter. Undersore marks exact location where parameter begins. Command part can have %s that will be replaced with parameter.
-  This only works for internal commands. not when spawning external scripts.
-        :o _ = uri %s - user needs to type :o www.google.com
-        :O_ = uri %s - user needs to type :Owww.google.com
-* when typing command, press insert (paste X cliboard) or shift insert (paste primary selection buffer)
-* proxy, user agent and other network settings can be set in config
-* scrolling works, with configurable keys (vi-like in sample config)
-* searching:
-  /_ = search %s <-- hilight all
-  ; = search <-- jump over all hits
-* run javascript on curent page through "script" command.
-* variable replacement in user agent.
-* basic keyboard link hilighting (numbering) and following. will be improved more
-* support overriding background color of statusbar and pango markup format to customize the statusbar in terms of which variables, separators, colors, fonts, etc

diff --git a/uzbl.c b/uzbl.c
index c2a6bd9..bbc2c27 100644 (file)
--- a/uzbl.c
+++ b/uzbl.c
@@ -128,10 +128,10 @@ make_var_to_name_hash() {
 /* commandline arguments (set initial values for the state variables) */
 static GOptionEntry entries[] =
 {
-    { "uri",     'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri,           "Uri to load", "URI" },
+    { "uri",     'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri,           "Uri to load at startup (equivalent to 'set uri = URI')", "URI" },
     { "verbose", 'v', 0, G_OPTION_ARG_NONE,   &uzbl.state.verbose,       "Whether to print all messages or just errors.", "VERBOSE" },
     { "name",    'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, "Name of the current instance (defaults to Xorg window id)", "NAME" },
-    { "config",  'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file,   "Config file", "FILE" },
+    { "config",  'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file,   "Config file (this is pretty much equivalent to uzbl < FILE )", "FILE" },
     { NULL,      0, 0, 0, NULL, NULL, NULL }
 };