Update

2 files changed, 40 insertions, 63 deletions

diff --git a/fr/appendix/gpl.xml b/fr/appendix/gpl.xml
index 5b007bc1d..d295a25cb 100644
--- a/fr/appendix/gpl.xml
+++ b/fr/appendix/gpl.xml
@@ -1,26 +1,24 @@
-
-<!-- original version: 36843 -->
+<!-- original version: 36857 -->
 <!-- pas besoin de traduire -->
 
+
 <appendix id="appendix-gpl"><title>GNU General Public License</title>
 
 <para>
 
 Version 2, June 1991
 
-</para><para>
-
+<informalexample><screen>
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-&mdash;
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-</para><para>
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
+</screen></informalexample>
 
 </para>
 
- <sect1><title>Preamble</title>
+ <simplesect><title>Preamble</title>
 <para>
 
 The licenses for most software are designed to take away your freedom
@@ -88,9 +86,9 @@ The precise terms and conditions for copying, distribution and
 modification follow.
 
 </para>
- </sect1>
+ </simplesect>
 
- <sect1><title>GNU GENERAL PUBLIC LICENSE</title>
+ <simplesect><title>GNU GENERAL PUBLIC LICENSE</title>
 <para>
 
 <emphasis role="bold">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
@@ -406,9 +404,9 @@ SUCH DAMAGES.
 <emphasis role="bold">END OF TERMS AND CONDITIONS</emphasis>
 
 </para>
- </sect1>
+ </simplesect>
 
- <sect1><title>How to Apply These Terms to Your New Programs</title>
+ <simplesect><title>How to Apply These Terms to Your New Programs</title>
 <para>
 
 If you develop a new program, and you want it to be of the greatest
@@ -423,35 +421,24 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-</para><para>
-
-one line to give the program's name and a brief idea of what it
-does.
-
-</para><para>
-
-Copyright (C) year name of author
-
-</para><para>
+<informalexample><screen>
+<replaceable>one line to give the program's name and a brief idea of what it does.</replaceable>
+Copyright (C) <replaceable>year  name of author</replaceable>
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the gnu General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
 
-</para><para>
-
-This program is distributed in the hope that it will be useful, but
-without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose. See the gnu
-General Public License for more details.
-
-</para><para>
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
 
-You should have received a copy of the gnu General Public License
+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., 51 Franklin Street, Fifth Floor, Boston,
-MA  02110-1301, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+</screen></informalexample>
 
 </para><para>
 
@@ -463,19 +450,13 @@ mail.
 If the program is interactive, make it output a short notice like
 this when it starts in an interactive mode:
 
-</para><para>
-
-Gnomovision version 69, Copyright (C) year name of author
-
-</para><para>
-
-Gnomovision comes with absolutely no warranty; for details type `show
-w'.
-
-</para><para>
-
-This is free software, and you are welcome to redistribute it under
-certain conditions; type `show c' for details.
+<informalexample><screen>
+Gnomovision version 69, Copyright (C) <replaceable>year name of author</replaceable>
+Gnomovision comes with absolutely no warranty; for details
+type `show w'. This is free software, and you are welcome
+to redistribute it under certain conditions; type `show c'
+for details.
+</screen></informalexample>
 
 </para><para>
 
@@ -491,19 +472,14 @@ You should also get your employer (if you work as a programmer) or
 your school, if any, to sign a "copyright disclaimer" for the
 program, if necessary. Here is a sample; alter the names:
 
-</para><para>
-
+<informalexample><screen>
 Yoyodyne, Inc., hereby disclaims all copyright interest in the
-program `Gnomovision' (which makes passes at compilers) written by
-James Hacker.
-
-</para><para>
-
-signature of Ty Coon, 1 April 1989
-
-</para><para>
+program `Gnomovision' (which makes passes at compilers) written
+by James Hacker.
 
+<replaceable>signature of Ty Coon</replaceable>, 1 April 1989
 Ty Coon, President of Vice
+</screen></informalexample>
 
 </para><para>
 
@@ -511,9 +487,9 @@ This General Public License does not permit incorporating your
 program into proprietary programs. If your program is a subroutine
 library, you may consider it more useful to permit linking
 proprietary applications with the library. If this is what you want
-to do, use the gnu Library General Public License instead of this
+to do, use the GNU Lesser General Public License instead of this
 License.
 
 </para>
- </sect1>
+ </simplesect>
 </appendix>
diff --git a/fr/howto/installation-howto.xml b/fr/howto/installation-howto.xml
index 23b8ec946..9ef85deb6 100644
--- a/fr/howto/installation-howto.xml
+++ b/fr/howto/installation-howto.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 36744 -->
+<!-- original version: 36859 -->
 
 <appendix id="installation-howto">
 <title>Guide de l'installation</title>
@@ -283,7 +283,8 @@ voulue.
 L'écran suivant montre la table des partitions, avec les systèmes de fichiers
 et les points de montage. Choisissez une partition que vous voulez modifier
 ou détruire. Si vous aviez choisi le partitionnement automatique, il vous 
-suffira de sélectionner <guimenuitem>Terminer le partitionnement</guimenuitem> dans le
+suffira de sélectionner
+<guimenuitem>Terminer le partitionnement et appliquer les changements</guimenuitem> dans le
 menu pour accepter ce qui a été fait. N'oubliez pas qu'il vous faut au moins 
 une partition d'échange et une partition racine montée sur
 <filename>/</filename>. D'autres informations sur le partitionnement se