873311
From 2dbbd80a5fb80741729c7cd5027af058b9c08c2c Mon Sep 17 00:00:00 2001
873311
From: Nils Philippsen <nils@redhat.com>
873311
Date: Mon, 8 Jul 2013 17:46:06 +0200
873311
Subject: [PATCH] patch: man-page
873311
873311
Squashed commit of the following:
873311
873311
commit e1915d50b677458127a8ad1c7953ee1d2e2ce250
873311
Author: Nils Philippsen <nils@redhat.com>
873311
Date:   Mon Jul 8 17:44:26 2013 +0200
873311
873311
    xsane.man: update command line options
873311
---
873311
 doc/xsane.man | 29 ++++++++++++++++++++++++-----
873311
 1 file changed, 24 insertions(+), 5 deletions(-)
873311
873311
diff --git a/doc/xsane.man b/doc/xsane.man
873311
index ee363a8..38b453d 100644
873311
--- a/doc/xsane.man
873311
+++ b/doc/xsane.man
873311
@@ -4,6 +4,7 @@
873311
 xsane - scanner frontend for SANE
873311
 .SH SYNOPSIS
873311
 .B xsane
873311
+.RB [ --help | -h ]
873311
 .RB [ --version | -v ]
873311
 .RB [ --license | -l ]
873311
 .RB [ --device-settings
873311
@@ -13,8 +14,9 @@ xsane - scanner frontend for SANE
873311
 .RB [ --viewer | -V ]
873311
 .RB [ --save | -s ]
873311
 .RB [ --copy | -c ]
873311
+.RB [ --multipage | -m ]
873311
 .RB [ --fax | -f ]
873311
-.RB [ --mail | -m ]
873311
+.RB [ --email | -e ]
873311
 .RB [ --no-mode-selection | -n ]
873311
 .RB [ --Fixed | -F ]
873311
 .RB [ --Resizable | -R ]
873311
@@ -25,6 +27,7 @@ xsane - scanner frontend for SANE
873311
 .IR name ]
873311
 .RB [ --display
873311
 .IR d ]
873311
+.RB [ --no-xshm ]
873311
 .RB [ --sync ]
873311
 .RI [ devicename ]
873311
 .SH DESCRIPTION
873311
@@ -121,6 +124,12 @@ and
873311
 .SH OPTIONS
873311
 .PP
873311
 If the
873311
+.B --help
873311
+or
873311
+.B -h
873311
+flag is given xsane displays a short help message and exits.
873311
+.PP
873311
+If the
873311
 .B --version
873311
 or
873311
 .B -v
873311
@@ -128,7 +137,7 @@ flag is given xsane prints a version information, some
873311
 information about gtk+ and gimp version it is compiled
873311
 against and lists the supported file formats, then it exits.
873311
 .PP
873311
-when the
873311
+If the
873311
 .B --license
873311
 or
873311
 .B -l
873311
@@ -161,16 +170,22 @@ or
873311
 flag forces xsane to start in copy mode.
873311
 .PP
873311
 The
873311
+.B --multipage
873311
+or
873311
+.B -m
873311
+flag forces xsane to start in multipage mode.
873311
+.PP
873311
+The
873311
 .B --fax
873311
 or
873311
 .B -f
873311
 flag forces xsane to start in fax mode.
873311
 .PP
873311
 The
873311
-.B --mail
873311
+.B --email
873311
 or
873311
-.B -m
873311
-flag forces xsane to start in mail mode.
873311
+.B -e
873311
+flag forces xsane to start in e-mail mode.
873311
 .PP
873311
 The
873311
 .B --no-mode-selection
873311
@@ -217,6 +232,10 @@ flag selects the X11 display used to present the graphical user-interface
873311
 for details).
873311
 .PP
873311
 The
873311
+.B --no-xshm
873311
+flag forces xsane not to use shared memory images.
873311
+.PP
873311
+The
873311
 .B --sync
873311
 flag requests a synchronous connection with the X11 server.  This is for
873311
 debugging purposes only.
873311
-- 
873311
1.8.3.1
873311