Merge branch 'feature/upstream' into develop

1 files changed, 11 insertions, 13 deletions

diff --git a/backend/snapscan.c b/backend/snapscan.c
index b93f1f7..1298858 100644
--- a/backend/snapscan.c
+++ b/backend/snapscan.c
@@ -19,9 +19,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -45,11 +43,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-
-/* $Id$
-   SANE SnapScan backend */
+/*
+   SANE SnapScan backend
+*/
 
 #include "../include/sane/config.h"
 
@@ -1977,7 +1976,6 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 }
 
 /*
- * $Log$
  * Revision 1.73  2008/11/26 21:21:29  kitno-guest
  * * backend/ *.[ch]: nearly every backend used V_MAJOR
  * instead of SANE_CURRENT_MAJOR in sane_init()
@@ -2155,7 +2153,7 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
  * Set backend version to 1.4.14
  *
  * Revision 1.46  2002/06/06 20:40:01  oliverschwartz
- * Changed default scan area for transparancy unit of SnapScan e50
+ * Changed default scan area for transparency unit of SnapScan e50
  *
  * Revision 1.45  2002/05/02 18:29:34  oliverschwartz
  * - Added ADF support
@@ -2247,7 +2245,7 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
  *
  * Revision 1.20  2001/09/18 15:01:07  oliverschwartz
  * - Read scanner id string again after firmware upload
- *   to indentify correct model
+ *   to identify correct model
  * - Make firmware upload work for AGFA scanners
  * - Change copyright notice
  *
@@ -2311,7 +2309,7 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
  * changes.
  *
  * Revision 1.4  2000/10/13 03:50:27  cbagwell
- * Updating to source from SANE 1.0.3.  Calling this versin 1.1
+ * Updating to source from SANE 1.0.3.  Calling this version 1.1
  *
  * Revision 1.3  2000/08/12 15:09:35  pere
  * Merge devel (v1.0.3) into head branch.
@@ -2550,13 +2548,13 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
  * Revision 1.16  1998/01/23  07:40:23  charter
  * Reindented using GNU convention at David Mosberger-Tang's request.
  * Also applied David's patch fixing problems on 64-bit architectures.
- * Now using scanner's reported speed to guage amount of data to request
+ * Now using scanner's reported speed to gauge amount of data to request
  * in a read on the scsi fd---nonblocking mode operates better now.
  * Fixed stupid bug I introduced in preview mode data transfer.
  *
  * Revision 1.15  1998/01/22  06:18:57  charter
  * Raised the priority of a couple of DBG messages in reserve_unit()
- * and release_unit(), and got rid of some unecessary ones.
+ * and release_unit(), and got rid of some unnecessary ones.
  *
  * Revision 1.14  1998/01/22  05:15:35  charter
  * Have replaced the bit depth option with a mode option; various