Merge branch 'portable-filenames' into 'master'

Rename doc/*/template.desc. for Windows compatibility

See merge request sane-project/backends!711

doc/Makefile.am

@@ -186,7 +186,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/umax1220u.desc descriptions/umax.desc \
   descriptions/umax_pp.desc  descriptions/unsupported.desc \
   descriptions/v4l.desc descriptions/xerox_mfp.desc
-EXTRA_DIST += $(DESC_FILES) descriptions/template.desc.
+EXTRA_DIST += $(DESC_FILES) descriptions/template.desc
 
 DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/brother.desc \
@@ -210,7 +210,7 @@ DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/utsushi.desc \
   descriptions-external/v4l2.desc \
   descriptions-external/viceo.desc
-EXTRA_DIST += $(DESC_EXT_FILES) descriptions-external/template.desc.
+EXTRA_DIST += $(DESC_EXT_FILES) descriptions-external/template.desc
 
 install-data-local: install-beman5
 

doc/backend-writing.txt

@@ -420,7 +420,7 @@ DOCUMENTATION
   "doc/descriptions-external" (for included and external backends).
 
 * "doc/descriptions.txt" describes the format of the ".desc" files. There is
-  also a template for new .desc files: "template.desc.". The format of the
+  also a template for new .desc files: "template.desc". The format of the
   files in the two directories is very similar.  If you'd like to try parsing
   your creation to recreate the sane-backends webpages, cd into "tools/" and
   enter "make sane-desc". You can either use sane-desc directly (try