summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2010-09-20 23:53:27 +0000
committerSamuel Thibault <sthibault@debian.org>2010-09-20 23:53:27 +0000
commit16dc54dc8b09e8b9215c87ca55d878410d8668dc (patch)
treea067cb60219e9f27f87f9c80bfe4bbf587afb82c
parent48310375a315fece8013b22cd3bd28d997096d05 (diff)
downloadinstallation-guide-16dc54dc8b09e8b9215c87ca55d878410d8668dc.zip
Introduce new debian entity which just stands for "Debian".
-rw-r--r--build/entities/common.ent5
-rw-r--r--debian/changelog3
2 files changed, 6 insertions, 2 deletions
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 3fdfa4466..a894d07ba 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -2,8 +2,11 @@
<!-- These entries should be language independent. -->
<!-- The *first* definition of an ENTITY wins. -->
+<!-- short name to use for Debian -->
+<!ENTITY debian "Debian">
+
<!-- proper (long) name to use for Debian -->
-<!ENTITY debian-gnu "Debian GNU/&arch-kernel;">
+<!ENTITY debian-gnu "&debian; GNU/&arch-kernel;">
<!ENTITY d-i "<classname>debian-installer</classname>">
diff --git a/debian/changelog b/debian/changelog
index 903d53281..c262ec87d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,8 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
* Fix "preparing", "using-d-i", "boot-new", "post-install", "howto",
"preseed", "partitioning", and "random-bits" parts for non-Linux ports.
* Factorize os-specific parameters in build/arch-options.
- * Rename debian entity to debian-gnu.
+ * Rename debian entity to debian-gnu. Introduce new debian entity which just
+ stands for "Debian".
[ Joey Hess ]
* Update USB stick documentation to reflect isohybird mini.iso files,