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