Merge branch 'experimental' into bf2

Conflicts:
	examples/config/uzbl/config

1 files changed, 6 insertions, 0 deletions

diff --git a/README b/README
index b36293c..5aa6998 100644
--- a/README
+++ b/README
@@ -200,6 +200,7 @@ Besides the builtin variables you can also define your own ones and use them in
   - download_handler
   - cookie_handler
   - new_window: handler to execute to invoke new uzbl window (TODO better name)
+  - scheme_handler: handler to execute for each URI navigated to - the navigation request will be ignored if handler prints "USED\n"
   - fifo_dir: location to store fifo's
   - socket_dir: location to store sockets
   - http_debug: http debug mode (value 0-3)
@@ -364,6 +365,7 @@ The script specific arguments are this:
 * download:
 
     $8 url of item to download
+    $9 url of http proxy (optional)
 
 * cookie handler
 
@@ -373,6 +375,10 @@ The script specific arguments are this:
     $11 request address path
     $12 cookie (only with PUT requests)
 
+* scheme handler:
+
+    $8 URI of the page to be navigated to
+
 
 Custom, userdefined scripts (`spawn foo bar`) get first the arguments as specified in the config and then the above 7 are added at the end.