Merge branch 'experimental'

3 files changed, 27 insertions, 15 deletions

diff --git a/README b/README
index 4f394bd..b8fd50e 100644
--- a/README
+++ b/README
@@ -104,14 +104,13 @@ The following commands are recognized:
        * `<string>` ends with an asterisk: similar behavior as with an underscore, but also makes the binding incremental (i.e. the command will be invoked on every keystroke).
        * `<string>` ends on a different character: you need to type the full string, which will trigger the command immediately, without pressing enter/return.
    - examples:
-
-        # uzbl will load the url when you type: 'o <url><enter>'
-        bind o _ = uri %s
-        # a search command which is called on every character typed after the slash, letting you see the search narrow down while typing.
-        #  Hitting return, enter or esc will terminate the search.
-        bind /*  = search %s
-        # when you type `ZZ` and nothing else, the exit command will be triggered immediately.
-        bind ZZ  = exit
+       * `bind o _ = uri %s`
+         - uzbl will load the url when you type: 'o <url><enter>'
+       * `bind /*  = search %s`
+         - a search command which is called on every character typed after the slash, letting you see the search narrow down while typing.
+         - Hitting return, enter or esc will terminate the search.
+       * `bind ZZ  = exit`
+         - When you type `ZZ` and nothing else, the exit command will be triggered immediately.
 
 * `back`
 * `forward`
diff --git a/docs/TODO b/docs/TODO
index 0bd238b..dcee01b 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,12 +1,11 @@
 More or less in order of importance/urgency
 
-* cookie handler.  storing seems to work, but not yet sending
+* improve cookie handler.
 * a variable that holds the page state: loading, pending, seen. this can be shown in titlebar/statusbar and used for multiple instances management
 * allow to tag , to group instances together
 * store uri/tag/name/state in xorg window properties
 * split up uzbl.c into multiple files
 * shortcuts to focus other instances (see docs/multiple-instances-management)
-* password handler (manager)
 
 * recognize -h with GOption?
 * implement a vimperator-like link following scheme.
@@ -43,6 +42,18 @@ More or less in order of importance/urgency
 * let users attach handlers to the most common events/signals in uzbl.
   great use case: automatically calling formfiller for certain sites
 * write little script to open new urls with the urxvt url thing +document.
+* document:
+  stylesheet overridding
+  formfiller
+  link following
+  webkit inspector usage
+  scroll commands can take %s, eg scroll 100% for pages
+  chaining of actions, dump_config, print (and other actions that aren't documented yet)
+  overriding variables (such as -u)
+  variable expansion (@var, @{var}, where do they get expanded? can users have their own vars?, should we merge this with the replacement we do for useragent/window title etc?)
+  how %s works for the js command
+* consider switching to CMAKE. (someone already ported the makefile etc)
+  
 
 SOMEDAY:
 figure out caching with webkit and in general how we can speed up everything
diff --git a/examples/scripts/cookies.sh b/examples/scripts/cookies.sh
index c0c37db..bbb0e88 100755
--- a/examples/scripts/cookies.sh
+++ b/examples/scripts/cookies.sh
@@ -35,14 +35,16 @@
 [ -z "$cookie_data" ] && exit 1
 
 
-#notifier=
+notifier=
 #notifier=notify-send
-notify_wrapper () {
-	echo "$@" >> $HOME/cookielog
-}
+#notify_wrapper () {
+#	echo "$@" >> $HOME/cookielog
+#}
+#notifier=notifier_wrapper
 
 # if this variable is set, we will use it to inform you when and which cookies we store, and when/which we send.
-notifier=notify_wrapper
+# it's primarily used for debugging
+notifier=
 which zenity &>/dev/null || exit 2
 
 # Example cookie: