summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2009-11-06 04:52:14 +0000
committerFrans Pop <elendil@planet.nl>2009-11-06 04:52:14 +0000
commit9f4d37f0329f780cee9089bdcb04f21469079919 (patch)
treecc1521fb2dfb506c884401a31b8bd237efc8ecda
parent88d37fb71895491bdb5208522e5b175a139fb062 (diff)
downloadinstallation-guide-9f4d37f0329f780cee9089bdcb04f21469079919.zip
Add link to www.kernel.org and remove www.kerneltraffic.org
www.kernel.org is the official website for the kernel. www.kerneltraffic.org no longer has any content related to the kernel. Thanks to Alex Brotman and Philippe Batailler for reporting this.
-rw-r--r--build/entities/urls.ent2
-rw-r--r--debian/changelog2
-rw-r--r--en/welcome/what-is-linux.xml7
3 files changed, 7 insertions, 4 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index eb5d33186..f558d6788 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -125,7 +125,9 @@
<!ENTITY url-gnu-copyleft "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">
<!-- Linux Kernel entities -->
+<!ENTITY url-kernel-org "http://www.kernel.org/">
<!ENTITY url-linux-kernel-list-faq "http://www.tux.org/lkml/">
+<!-- Next entity is no longer used; delete when translations are updated -->
<!ENTITY url-kernel-traffic "http://www.kerneltraffic.org/kernel-traffic/index.html">
<!-- Linux History page -->
diff --git a/debian/changelog b/debian/changelog
index 37b67e1d1..76b3e3274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ installation-guide (2009xxxx) UNRELEASED; urgency=low
that.
* x86 USB boot: two improvements suggested by Timo Juhani Lindfors and one
by Samuel Thibault. Closes: #532437, #532440, #548534.
+ * welcome: add a link to www.kernel.org and remove the no longer valid link
+ to www.kerneltraffic.org. Closes: #331523.
-- Frans Pop <fjp@debian.org> Tue, 01 Sep 2009 19:01:59 +0200
diff --git a/en/welcome/what-is-linux.xml b/en/welcome/what-is-linux.xml
index 374266dca..64a99fa9b 100644
--- a/en/welcome/what-is-linux.xml
+++ b/en/welcome/what-is-linux.xml
@@ -66,10 +66,9 @@ Linux International's
</para><para>
Linus Torvalds continues to coordinate the work of several hundred
-developers with the help of a few trusty deputies. An excellent
-weekly summary of discussions on the
-<userinput>linux-kernel</userinput> mailing list is
-<ulink url="&url-kernel-traffic;">Kernel Traffic</ulink>.
+developers with the help of a number of subsystem maintainers.
+There is an <ulink url="&url-kernel-org;">official website</ulink> for the
+Linux kernel.
More information about the <userinput>linux-kernel</userinput> mailing
list can be found on the
<ulink url="&url-linux-kernel-list-faq;">linux-kernel mailing list FAQ</ulink>.