aboutsummaryrefslogtreecommitdiffhomepage
path: root/README
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-04-14 20:59:39 -0600
committerGravatar Brendan Taylor <whateley@gmail.com>2011-04-14 20:59:39 -0600
commitff92073acfb8029dde8c92ab5b70e3abde32e147 (patch)
tree27a174315595a9cc1d96c13314bba56d22c325c5 /README
parent76f8d42568b7985de3c256f10d6d40ebd0dfd697 (diff)
parent05b7422a9fcbb1cadf1beaff5ec0cea8b5b7a828 (diff)
Merge remote-tracking branch 'mathstuf/dev/fix-clashing-long-option' into experimental
Conflicts: README
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 57c7397..c5d353b 100644
--- a/README
+++ b/README
@@ -104,7 +104,7 @@ There are several interfaces to interact with Uzbl:
When `uzbl` forks a new instance (eg "open in new window") it will use the same
command line arguments (eg the same `--config <file>`), except `--uri` and
-`--name`. If you made changes to the configuration at runtime, these are not
+`--named`. If you made changes to the configuration at runtime, these are not
passed on to the child.
#### Uzbl-browser
@@ -804,7 +804,7 @@ where `arguments` and `uri` are both optional. `arguments` can be:
* `-u`, `--uri=URI`: URI to load at startup. Equivalent to `uzbl <uri>` or `set
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
+* `-n`, `--named=NAME`: Name of the current instance (defaults to Xorg window
id or random for GtkSocket mode).
* `-c`, `--config=FILE`: Path to config file or `-` for stdin.
* `-s`, `--socket=SOCKET`: Xembed socket ID.