From ca17db26a529867716e406a69a55d16e6314381d Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 19 Jul 2009 10:50:41 +0200 Subject: usage output fixes --- README | 5 ++--- uzbl.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README b/README index f1f483f..d73bab1 100644 --- a/README +++ b/README @@ -402,10 +402,10 @@ Copying the Uzbl object and creating public functions should be taken with care ### COMMAND LINE ARGUMENTS uzbl [ uri ] - -u, --uri=URI alternative way to load uri on start. (equivalent to 'set uri = URI') + -u, --uri=URI Uri to load at startup (equivalent to 'uzbl ' 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 id) - -c, --config=FILE Config file (or `-` to use stdin) + -c, --config=FILE Path to config file or '-' for stdin -s, --socket=SOCKET Socket ID -g, --geometry=GEOMETRY Set window geometry (format: WIDTHxHEIGHT+-X+-Y) -V, --version Print the version and exit @@ -415,6 +415,5 @@ Copying the Uzbl object and creating public functions should be taken with care - ### BUGS Please report new issues @ uzbl.org/bugs diff --git a/uzbl.c b/uzbl.c index d9fac3a..ccecd7d 100644 --- a/uzbl.c +++ b/uzbl.c @@ -64,13 +64,13 @@ const GOptionEntry entries[] = { { "uri", 'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri, - "Uri to load at startup (equivalent to 'set uri = URI')", "URI" }, + "Uri to load at startup (equivalent to 'uzbl ' or 'set uri = URI' after uzbl has launched)", "URI" }, { "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 (this is pretty much equivalent to uzbl < FILE )", "FILE" }, + "Path to config file or '-' for stdin", "FILE" }, { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, "Socket ID", "SOCKET" }, { "geometry", 'g', 0, G_OPTION_ARG_STRING, &uzbl.gui.geometry, -- cgit v1.2.3