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