summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2011-01-09 13:14:31 +0000
committerSamuel Thibault <sthibault@debian.org>2011-01-09 13:14:31 +0000
commit11e1973ce85e08fb0e69d1dd4b9afbddc2e6dd73 (patch)
tree987272cc3ec9152ecc4a0700049508b088da4abc
parentdb5725dfba4414e3cf5f6b19483bf31947749b40 (diff)
downloadinstallation-guide-11e1973ce85e08fb0e69d1dd4b9afbddc2e6dd73.zip
Reword i386 and amd64 arch names to be consistent with the corresponding release-notes change: Intel x86 → 32-bit PC, AMD64 → 64-bit PC.
-rw-r--r--build/entities/common.ent2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 23f344d12..aac1d6787 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -20,7 +20,7 @@
<!-- proper nouns for architectures -->
<!ENTITY arch-title
- "<phrase arch='any-amd64'>AMD64</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='any-i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
+ "<phrase arch='any-amd64'>64-bit PC</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='any-i386'>32-bit PC</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
<!-- general things from installer -->
<!ENTITY enterkey "<keycap>Enter</keycap>">
diff --git a/debian/changelog b/debian/changelog
index e630da922..d6257e65b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
* Fix default tftp directory from /var/lib/tftpboot to /srv/tftp, thanks
Charles Plessy (Closes: Bug#606725).
* Enable Spanish and Swedish translations (almost up-to-date).
+ * Reword i386 and amd64 arch names to be consistent with the corresponding
+ release-notes change: Intel x86 → 32-bit PC, AMD64 → 64-bit PC.
[ Joey Hess ]
* Update USB stick documentation to reflect isohybird mini.iso files,