More changes to the GPL

1 files changed, 27 insertions, 49 deletions

diff --git a/en/appendix/gpl.xml b/en/appendix/gpl.xml
index 4e8f8bb35..e0e6c69e4 100644
--- a/en/appendix/gpl.xml
+++ b/en/appendix/gpl.xml
@@ -422,35 +422,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.
+<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>
 
-</para><para>
+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.
 
-Copyright (C) year name of author
+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 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>
-
-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>
 
@@ -462,19 +451,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>
 
@@ -490,19 +473,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>
 
@@ -510,7 +488,7 @@ 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>