Merge branch 'dieter/experimental' into experimental

Conflicts:
	uzbl.c

1 files changed, 19 insertions, 3 deletions

diff --git a/README b/README
index bc5baca..a43e0cd 100644
--- 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
@@ -77,7 +83,7 @@ TODO
 ### VARIABLE REPLACEMENT
 Some of the variables are interpreted:
 
-* title bar: variable replacement (not yet actually)
+* title bar: variable replacement (long and short version, depending if statusbar is visible or not)
 * user agent: variable replacement
 * statusbar: variable replacement + pango markup
 
@@ -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            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: