Merge branch 'dieter/experimental' into experimental

Conflicts:
	uzbl.c

diff --cc README
index bc5baca,927cd76..a43e0cd
--- 1/README
--- 2/README
+++ b/README
@@@ -129,6 -135,16 +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.
++    -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:
  

diff --cc uzbl.c
index 3a6e178,bbc2c27..3fac242
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -126,10 -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" },
 +    { "verbose", 'v', 0, G_OPTION_ARG_NONE,   &uzbl.state.verbose,       "Whether to print all messages or just errors.", NULL },
      { "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 }
  };