summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2006-05-04 19:47:43 +0000
committerFrans Pop <elendil@planet.nl>2006-05-04 19:47:43 +0000
commite207b5c917af8144860f95d02d8bb3be77d81073 (patch)
treee150cf035cca05ff724d043b6f21ceea9b114f39
parentb225cf6f94880e5306d14e928880b4eedbadd18f (diff)
downloadinstallation-guide-e207b5c917af8144860f95d02d8bb3be77d81073.zip
Update of original English documents
-rw-r--r--nl/appendix/gpl.xml28
-rw-r--r--nl/hardware/hardware-supported.xml4
-rw-r--r--nl/hardware/supported/arm.xml15
3 files changed, 17 insertions, 30 deletions
diff --git a/nl/appendix/gpl.xml b/nl/appendix/gpl.xml
index 232007b59..413a31e0a 100644
--- a/nl/appendix/gpl.xml
+++ b/nl/appendix/gpl.xml
@@ -1,21 +1,8 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36879 untranslated -->
+<!-- original version: 36893 untranslated -->
<appendix id="appendix-gpl"><title>GNU General Public License</title>
-<para>
-
-Version 2, June 1991
-
-<informalexample><screen>
-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.
-</screen></informalexample>
-
-</para>
<note condition="gpl-unofficial"><para>
[[This note, consisting of two paragraphs, should only be included in your
@@ -47,6 +34,19 @@ hope that this translation will help {language} speakers understand the
GNU GPL better.
</para></note>
+<para>
+
+Version 2, June 1991
+
+<informalexample><screen>
+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.
+</screen></informalexample>
+
+</para>
<simplesect><title>Preamble</title>
<para>
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index d05839f16..48c9f2acb 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36733 untranslated -->
+<!-- original version: 36908 untranslated -->
<sect1 id="hardware-supported">
<title>Supported Hardware</title>
@@ -99,7 +99,7 @@ variations of each architecture known as <quote>flavors</quote>.
<entry>Linksys NSLU2</entry>
<entry>nslu2</entry>
</row><row>
- <entry>RiscPC and Riscstation</entry>
+ <entry>RiscPC</entry>
<entry>riscpc</entry>
</row>
diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml
index e15f41c20..7c412ed5b 100644
--- a/nl/hardware/supported/arm.xml
+++ b/nl/hardware/supported/arm.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 35328 untranslated -->
+<!-- original version: 36908 untranslated -->
<sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title>
@@ -68,19 +68,6 @@ configuration, several of these modules have Linux drivers.
</para></listitem>
</varlistentry>
-<varlistentry>
-<term>Riscstation</term>
-<listitem><para>
-
-This is an inexpensive 56MHz 7500FE based machine with
-integrated video, IDE, PS/2 keyboard and mouse and two serial
-ports. Its lack of processing power was made up for by its price. It
-may be found in two configurations one with RISC OS and one with a
-simple bootloader.
-
-</para></listitem>
-</varlistentry>
-
</variablelist>
</para>