Merge branch 'feature/upstream' into develop

1 files changed, 9 insertions, 15 deletions

diff --git a/doc/sane-plustek.man b/doc/sane-plustek.man
index a6bb993..2df85b6 100644
--- a/doc/sane-plustek.man
+++ b/doc/sane-plustek.man
@@ -1,4 +1,4 @@
-.TH sane\-plustek 5 "13 Feb 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-plustek 5 "03 Nov 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-plustek
 .SH NAME
 sane\-plustek \- SANE backend for LM983[1/2/3] based
@@ -241,7 +241,7 @@ The Options:
 option warmup t
 .RS
 .I t
-specifies the warmup period in seconds, if set to \-1, the 
+specifies the warmup period in seconds, if set to \-1, the
 automatic warmup function will be used
 .RE
 .PP
@@ -468,8 +468,6 @@ export SANE_DEBUG_PLUSTEK=10
 .BR sane\-gt68xx (5),
 .br
 .I @DOCDIR@/plustek/Plustek-USB.changes
-.br
-.I http://www.gjaeger.de/scanner/plustek/
 
 .SH "CONTACT AND BUG-REPORTS"
 Please send any information and bug-reports to:
@@ -482,16 +480,12 @@ Mailing-List archive at:
 .br
 .B http://www.sane\-project.org/mailing\-lists.html
 .PP
-or directly from the projects' homepage at:
-.br
-.B http://www.gjaeger.de/scanner/plustek/
-.PP
 To obtain debug messages from the backend, please set the
 environment-variable
 .I SANE_DEBUG_PLUSTEK
-before calling your favorite scan-frontend (i.e. xscanimage).
+before calling your favorite scan-frontend (i.e. scanimage).
 .br
-.B i.e.: export SANE_DEBUG_PLUSTEK=20 ; xscanimage
+.B i.e.: export SANE_DEBUG_PLUSTEK=20 ; scanimage
 .PP
 The value controls the verbosity of the backend. Please note, that
 values greater than 24 force the backend to output raw data files,
@@ -505,13 +499,13 @@ For problem reports it should be enough the set the verbosity to
 * The driver does not support these manic scalings up
 to 16 times the physical resolution. The only scaling
 is done on resolutions between the physical resolution
-of the CCD-/CIS-sensor and the stepper motor i.e. you 
-have a 600x1200 dpi scanner and you are scanning using 
-800dpi, so scaling is necessary, because the sensor only 
-delivers 600dpi but the motor is capable to perform 
+of the CCD-/CIS-sensor and the stepper motor i.e. you
+have a 600x1200 dpi scanner and you are scanning using
+800dpi, so scaling is necessary, because the sensor only
+delivers 600dpi but the motor is capable to perform
 1200dpi steps.
 .PP
-* Plusteks' model policy is somewhat inconsistent. They 
+* Plusteks' model policy is somewhat inconsistent. They
 sell technically different devices under the
 same product name. Therefore it is possible that some
 devices like the UT12 or U12 won't work \- please check