Man page fix (make guess_url, status{s,h} respect the alphabetical

order).

Made rs[] (runtime settings) more readable, by indenting it.

download_dir = ~/downloads rather than ~downloads in config.

ok marco@

3 files changed, 54 insertions, 54 deletions

diff --git a/xxxterm.1 b/xxxterm.1
index 33b3b53..a4cf46a 100644
--- a/xxxterm.1
+++ b/xxxterm.1
@@ -262,7 +262,7 @@ Highlight all links and prefix them with a number.
 Commands to exit the browser.
 .Pp
 .Bl -tag -width Ds -offset indent -compact
-.It Cm C-Q
+.It Cm C-q
 Quit
 .El
 .Sh COMMAND MODE
@@ -389,6 +389,10 @@ session_name.
 .It Cm stats
 Show blocked cookie statistics.
 These statistics vary based on settings and are not persistent.
+.It Cm statushide , statush
+Hide status bar.
+.It Cm statusshow , statuss
+Show status bar.
 .It Cm tabclose , tabc
 Close current tab.
 .It Cm tabhide , tabh
@@ -405,10 +409,6 @@ Show tabs.
 Hide url entry and tool bar.
 .It Cm urlshow , urls
 Show url entry and tool bar.
-.It Cm statushide , statush
-Hide status bar.
-.It Cm statusshow , statuss
-Show status bar.
 .It Cm w
 Save open tabs to current session.
 The tabs will be restored next time
@@ -522,7 +522,7 @@ as the last tab.
 .It Cm browser_mode
 The
 .Nm
-browser has 2 default operating modes: 
+browser has 2 default operating modes:
 .Pa normal
 (the default) or
 .Pa whitelist.
@@ -596,6 +596,14 @@ Enables a backward, forward, and stop button to the toolbar.
 Additionally if
 .Cm search_string
 is set it'll enable an entry box for searches.
+.It Cm guess_search
+When enabled
+.Nm
+will try to guess if the string you entered, in the URI entry widget or
+the command widget, is term you want to search for using search_string
+(see above). If the string does not contain a dot nor a slash, is not a
+path to a local file and does not resolves to an IP then it is assumed
+to be a search term.
 .It Cm home
 Homepage in URL format.
 .It Cm http_proxy
@@ -671,14 +679,6 @@ Enable or disable showing tabs.
 Enable or disable showing the url and toolbar.
 .It Cm show_statusbar
 Enable or disable showing the status bar.
-.It Cm guess_search
-When enabled
-.Nm
-will try to guess if the string you entered, in the URI entry widget or
-the command widget, is term you want to search for using search_string
-(see above). If the string does not contain a dot nor a slash, is not a
-path to a local file and does not resolves to an IP then it is assumed
-to be a search term.
 .It Cm single_instance
 If set only one
 .Nm
diff --git a/xxxterm.c b/xxxterm.c
index 97dbbb8..a594df6 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -565,47 +565,47 @@ struct settings {
 	char		**sval;
 	struct special	*s;
 } rs[] = {
-	{ "append_next", XT_S_INT, 0 , &append_next, NULL, NULL },
-	{ "allow_volatile_cookies", XT_S_INT, 0 , &allow_volatile_cookies, NULL, NULL },
-	{ "browser_mode", XT_S_INT, 0 , NULL, NULL, &s_browser_mode },
-	{ "cookie_policy", XT_S_INT, 0 , NULL, NULL, &s_cookie },
-	{ "cookies_enabled", XT_S_INT, 0 , &cookies_enabled, NULL, NULL },
-	{ "ctrl_click_focus", XT_S_INT, 0 , &ctrl_click_focus, NULL, NULL },
-	{ "default_font_size", XT_S_INT, 0 , &default_font_size, NULL, NULL },
-	{ "download_dir", XT_S_STR, 0 , NULL, NULL, &s_download_dir },
-	{ "enable_cookie_whitelist", XT_S_INT, 0 , &enable_cookie_whitelist, NULL, NULL },
-	{ "enable_js_whitelist", XT_S_INT, 0 , &enable_js_whitelist, NULL, NULL },
-	{ "enable_plugins", XT_S_INT, 0 , &enable_plugins, NULL, NULL },
-	{ "enable_scripts", XT_S_INT, 0 , &enable_scripts, NULL, NULL },
-	{ "enable_socket", XT_S_INT, XT_SF_RESTART , &enable_socket, NULL, NULL },
-	{ "fancy_bar", XT_S_INT, XT_SF_RESTART , &fancy_bar, NULL, NULL },
-	{ "home", XT_S_STR, 0 , NULL, &home, NULL },
-	{ "http_proxy", XT_S_STR, 0 , NULL, &http_proxy, NULL },
-	{ "icon_size", XT_S_INT, 0 , &icon_size, NULL, NULL },
-	{ "read_only_cookies", XT_S_INT, 0 , &read_only_cookies, NULL, NULL },
-	{ "refresh_interval", XT_S_INT, 0 , &refresh_interval, NULL, NULL },
-	{ "resource_dir", XT_S_STR, 0 , NULL, &resource_dir, NULL },
-	{ "search_string", XT_S_STR, 0 , NULL, &search_string, NULL },
-	{ "save_global_history", XT_S_INT, XT_SF_RESTART , &save_global_history, NULL, NULL },
-	{ "save_rejected_cookies", XT_S_INT, XT_SF_RESTART , &save_rejected_cookies, NULL, NULL },
-	{ "session_timeout", XT_S_INT, 0 , &session_timeout, NULL, NULL },
-	{ "session_autosave", XT_S_INT, 0 , &session_autosave, NULL, NULL },
-	{ "single_instance", XT_S_INT, XT_SF_RESTART , &single_instance, NULL, NULL },
-	{ "show_tabs", XT_S_INT, 0, &show_tabs, NULL, NULL },
-	{ "show_url", XT_S_INT, 0, &show_url, NULL, NULL },
-	{ "guess_search", XT_S_INT, 0, &guess_search, NULL, NULL },
-	{ "show_statusbar", XT_S_INT, 0, &show_statusbar, NULL, NULL },
-	{ "ssl_ca_file", XT_S_STR, 0 , NULL, &ssl_ca_file, NULL },
-	{ "ssl_strict_certs", XT_S_INT, 0 , &ssl_strict_certs, NULL, NULL },
-	{ "user_agent", XT_S_STR, 0 , NULL, &user_agent, NULL },
-	{ "window_height", XT_S_INT, 0 , &window_height, NULL, NULL },
-	{ "window_width", XT_S_INT, 0 , &window_width, NULL, NULL },
+	{ "append_next",		XT_S_INT, 0,		&append_next, NULL, NULL },
+	{ "allow_volatile_cookies",	XT_S_INT, 0,		&allow_volatile_cookies, NULL, NULL },
+	{ "browser_mode",		XT_S_INT, 0, NULL, NULL,&s_browser_mode },
+	{ "cookie_policy",		XT_S_INT, 0, NULL, NULL,&s_cookie },
+	{ "cookies_enabled",		XT_S_INT, 0,		&cookies_enabled, NULL, NULL },
+	{ "ctrl_click_focus",		XT_S_INT, 0,		&ctrl_click_focus, NULL, NULL },
+	{ "default_font_size",		XT_S_INT, 0,		&default_font_size, NULL, NULL },
+	{ "download_dir",		XT_S_STR, 0, NULL, NULL,&s_download_dir },
+	{ "enable_cookie_whitelist",	XT_S_INT, 0,		&enable_cookie_whitelist, NULL, NULL },
+	{ "enable_js_whitelist",	XT_S_INT, 0,		&enable_js_whitelist, NULL, NULL },
+	{ "enable_plugins",		XT_S_INT, 0,		&enable_plugins, NULL, NULL },
+	{ "enable_scripts",		XT_S_INT, 0,		&enable_scripts, NULL, NULL },
+	{ "enable_socket",		XT_S_INT, XT_SF_RESTART,&enable_socket, NULL, NULL },
+	{ "fancy_bar",			XT_S_INT, XT_SF_RESTART,&fancy_bar, NULL, NULL },
+	{ "home",			XT_S_STR, 0, NULL, 	&home, NULL },
+	{ "http_proxy", 		XT_S_STR, 0, NULL, 	&http_proxy, NULL },
+	{ "icon_size",			XT_S_INT, 0,		&icon_size, NULL, NULL },
+	{ "read_only_cookies",		XT_S_INT, 0,		&read_only_cookies, NULL, NULL },
+	{ "refresh_interval",		XT_S_INT, 0,		&refresh_interval, NULL, NULL },
+	{ "resource_dir",		XT_S_STR, 0, NULL,	&resource_dir, NULL },
+	{ "search_string",		XT_S_STR, 0, NULL,	&search_string, NULL },
+	{ "save_global_history",	XT_S_INT, XT_SF_RESTART,&save_global_history, NULL, NULL },
+	{ "save_rejected_cookies",	XT_S_INT, XT_SF_RESTART,&save_rejected_cookies, NULL, NULL },
+	{ "session_timeout",		XT_S_INT, 0,		&session_timeout, NULL, NULL },
+	{ "session_autosave",		XT_S_INT, 0,		&session_autosave, NULL, NULL },
+	{ "single_instance",		XT_S_INT, XT_SF_RESTART,&single_instance, NULL, NULL },
+	{ "show_tabs",			XT_S_INT, 0,		&show_tabs, NULL, NULL },
+	{ "show_url",			XT_S_INT, 0,		&show_url, NULL, NULL },
+	{ "guess_search",		XT_S_INT, 0,		&guess_search, NULL, NULL },
+	{ "show_statusbar",		XT_S_INT, 0,		&show_statusbar, NULL, NULL },
+	{ "ssl_ca_file",		XT_S_STR, 0, NULL,	&ssl_ca_file, NULL },
+	{ "ssl_strict_certs",		XT_S_INT, 0,		&ssl_strict_certs, NULL, NULL },
+	{ "user_agent", 		XT_S_STR, 0, NULL,	&user_agent, NULL },
+	{ "window_height",		XT_S_INT, 0,		&window_height, NULL, NULL },
+	{ "window_width",		XT_S_INT, 0,		&window_width, NULL, NULL },
 
 	/* runtime settings */
-	{ "alias", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_alias },
-	{ "cookie_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_cookie_wl },
-	{ "js_wl", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_js },
-	{ "mime_type", XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_mime },
+	{ "alias",			XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_alias },
+	{ "cookie_wl",			XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_cookie_wl },
+	{ "js_wl",			XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_js },
+	{ "mime_type",			XT_S_STR, XT_SF_RUNTIME, NULL, NULL, &s_mime },
 };
 
 /* globals */
diff --git a/xxxterm.conf b/xxxterm.conf
index 383a682..e40163e 100644
--- a/xxxterm.conf
+++ b/xxxterm.conf
@@ -11,7 +11,7 @@
 # home			= http://www.peereboom.us
 # ctrl_click_focus	= 0
 # append_next		= 1
-# download_dir		= ~downloads
+# download_dir		= ~/downloads
 # default_font_size	= 12
 # fancy_bar		= 1
 # refresh_interval	= 10