From d615ad41395e560b71d38d2d74cd78a4e5427ff1 Mon Sep 17 00:00:00 2001 From: Philippe Batailler Date: Mon, 1 May 2006 12:31:00 +0000 Subject: Update --- fr/appendix/gpl.xml | 98 ++++++++++++++++------------------------- fr/howto/installation-howto.xml | 5 ++- 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 @@ - - + + GNU General Public License Version 2, June 1991 - - + Copyright (C) 1989, 1991 Free Software Foundation, Inc. -— 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + - Preamble + Preamble 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. - + - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION @@ -406,9 +404,9 @@ SUCH DAMAGES. END OF TERMS AND CONDITIONS - + - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs 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. - - -one line to give the program's name and a brief idea of what it -does. - - - -Copyright (C) year name of author - - + +one line to give the program's name and a brief idea of what it does. +Copyright (C) year name of author -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. - - -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. - - +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. + @@ -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: - - -Gnomovision version 69, Copyright (C) year name of author - - - -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. + +Gnomovision version 69, Copyright (C) year name of author +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. + @@ -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: - - + Yoyodyne, Inc., hereby disclaims all copyright interest in the -program `Gnomovision' (which makes passes at compilers) written by -James Hacker. - - - -signature of Ty Coon, 1 April 1989 - - +program `Gnomovision' (which makes passes at compilers) written +by James Hacker. +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice + @@ -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. - + 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 @@ - + Guide de l'installation @@ -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 Terminer le partitionnement dans le +suffira de sélectionner +Terminer le partitionnement et appliquer les changements 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 /. D'autres informations sur le partitionnement se -- cgit v1.2.3