Merge branch 'feature/upstream' into develop

1 files changed, 3 insertions, 5 deletions

diff --git a/backend/genesys/gl843.cpp b/backend/genesys/gl843.cpp
index 8233bde..e768ac0 100644
--- a/backend/genesys/gl843.cpp
+++ b/backend/genesys/gl843.cpp
@@ -16,9 +16,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.
@@ -781,7 +779,7 @@ static void gl843_init_motor_regs_scan(Genesys_Device* dev,
         reg->set8(REG_0x80, vref);
     }
 
-  /* substract acceleration distance from feedl */
+  /* subtract acceleration distance from feedl */
   feedl=feed_steps;
     feedl <<= static_cast<unsigned>(motor_profile.step_type);
 
@@ -872,7 +870,7 @@ static void gl843_init_motor_regs_scan(Genesys_Device* dev,
  *        scan's one
  * @param start logical start pixel coordinate
  * @param pixels logical number of pixels to use
- * @param channels number of color channles used (1 or 3)
+ * @param channels number of color channels used (1 or 3)
  * @param depth bit depth of the scan (1, 8 or 16 bits)
  * @param color_filter to choose the color channel used in gray scans
  * @param flags to drive specific settings such no calibration, XPA use ...