merge in experimental

1 files changed, 5 insertions, 1 deletions

diff --git a/README b/README
index 95db42a..09fd240 100644
--- a/README
+++ b/README
@@ -311,7 +311,10 @@ file).
 * `fifo_dir`: location to store FIFOs.
 * `socket_dir`: location to store sockets.
 * `http_debug`: HTTP debug mode (value 0-3).
+* `scrollbars_visible`: set to 1 to have GTK scrollbars if the document
+  doesn't fit into the window (defaults to 0)
 * `shell_cmd`: Alias which will be expanded to use shell commands (eg `sh -c`).
+* `print_events`: show events on stdout
 * `proxy_url`: HTTP traffic SOCKS proxy (eg: `http://<host>:<port>`).
 * `max_conns`: Max simultaneous connections (default: 100).
 * `max_conns_host`: max simultaneous connections per hostname (default: 6)
@@ -704,10 +707,11 @@ where `arguments` and `uri` are both optional. `arguments` can be:
   uri = URI` after `uzbl` has launched.
 * `-v`, `--verbose`: Whether to print all messages or just errors.
 * `-n`, `--name=NAME`: Name of the current instance (defaults to Xorg window
-  id).
+  id or random for GtkSocket mode).
 * `-c`, `--config=FILE`: Path to config file or `-` for stdin.
 * `-s`, `--socket=SOCKET`: Xembed socket ID.
 * `--connect-socket=SOCKET`: Connect to server socket for event managing.
+* `-p`, `--print-events`: Whether to print events to stdout
 * `-g`, `--geometry=GEOMETRY`: Set window geometry (format: `WIDTHxHEIGHT+-X+-Y`
   or `maximized`).
 * `-V`, `--version`: Print the version and exit.