* various: merge changes made in gramps20 up until R2_0_9 tag.

svn: r5544

doc/gramps-manual/fr/Makefile.am

@@ -11,6 +11,7 @@ entities = legal.xml\
 	keybind.xml\
 	filtref.xml\
 	cmdline.xml \
+	cmdplug.xml \
 	authors.xml \
 	bugs.xml \
 	preface.xml

doc/gramps-manual/fr/cmdline.xml

@@ -249,6 +249,7 @@
 
       </sect1>
 
+      &cmdplug;
 
       <sect1 id="cmdline-operation">
       <title>Opération</title>

doc/gramps-manual/fr/gramps-manual.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?yelp:chunk-depth 3?>
 <!--
 	  User Manual for Gramps - a GTK+/GNOME based genealogy program
@@ -50,6 +50,7 @@
   <!ENTITY keybind SYSTEM "keybind.xml">
   <!ENTITY filtref SYSTEM "filtref.xml">
   <!ENTITY cmdline SYSTEM "cmdline.xml">
+  <!ENTITY cmdplug SYSTEM "cmdplug.xml">
   <!ENTITY bugs SYSTEM "bugs.xml">
   <!ENTITY authors SYSTEM "authors.xml">
 ]>