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