From 388aef832aa8d6c73c82d2c0b65711c209e01d03 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 10 Feb 2010 16:51:59 +0100 Subject: Fix some more options' documentation --- feh.1 | 5 ++++- src/options.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/feh.1 b/feh.1 index e627c92..00f8daf 100644 --- a/feh.1 +++ b/feh.1 @@ -292,7 +292,7 @@ multiple times to add multiple paths, e.g \-\-fontpath /path/a \-\-fontpath .B --menu-style FILE Use FILE as the style descriptor for menu text. .TP 5 -.B --menu-bg BG +.B -), --menu-bg BG Use BG for the background image in menus. .TP 5 .B --menu-border INT @@ -323,6 +323,9 @@ Use CTRL+Button B to activate the menu in any mode. Set to 0 to use any button. This option is disabled if the \-N or \-\-no\-menus option is set (defaults to 3, usually the right button). .TP 5 +.B -5, --menu-ctrl-mask +Require CTRL+Button for menu activation in any mode (default=off). +.TP 5 .B -6, --rotate-button B Use CTRL+Button B to rotate the current image in any mode (default=2). .TP 5 diff --git a/src/options.c b/src/options.c index 14d52b7..763e1e8 100644 --- a/src/options.c +++ b/src/options.c @@ -1005,7 +1005,7 @@ show_usage(void) " can be used multiple times to add multiple paths.\n" " -M, --menu-font FONT Use FONT for the font in menus.\n" " --menu-style FILE Use FILE as the style descriptor for menu text.\n" -" --menu-bg BG Use BG for the background image in menus.\n" +" -), --menu-bg BG Use BG for the background image in menus.\n" " --menu-border INT Specify number of pixels that define the menu\n" " background's border. Borders are not stretched\n" " when images are scaled.\n" @@ -1086,7 +1086,7 @@ show_usage(void) " -O, --output-only FILE Just save the created montage to FILE\n" " WITHOUT displaying it (use in scripts)\n" " INDEX MODE OPTIONS\n" -" -e FONT Use FONT to print the information under each\n" +" -e, --font FONT Use FONT to print the information under each\n" " thumbnail. FONT should be defined in the form\n" " fontname/size(points). eg -e myfont/12\n" " -@, --title-font FONT Use FONT to print a title on the index, if no\n" -- cgit v1.2.3