Revert sync for bug #86914. Yeah... I need to pay more attention sometimes.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@680 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 0f641bb54f7a1c30e5127a4ab006e84afbee877a..0d0e59bfbcede512a59426ab6b3552a49c47e630 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.268 2005/06/09 17:42:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.269 2005/06/09 21:09:08 wolf31o2 Exp $
+
+  09 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/minimal.motd.txt, livecd/files/universal.motd.txt:
+  Revert sync for bug #86914.  Yeah... I need to pay more attention sometimes.
 
   09 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   -livecd/files/README.txt, -livecd/files/environmental.motd.txt,

diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt
index 5b3f909d67cdbb3c1ef5135dac84881d87d50b30..1f702fcf3d1595af374e33cc5aefe2481445caf3 100644 (file)
--- a/livecd/files/minimal.motd.txt
+++ b/livecd/files/minimal.motd.txt
@@ -1,12 +1,10 @@
+The latest version of the Handbook is always available from the Gentoo web
+site by typing "links http://www.gentoo.org/doc/en/handbook/handbook.xml".
 
 To start an ssh server on this system, type "/etc/init.d/sshd start".  If you
 need to log in remotely as root, type "passwd root" to reset root's password 
 to a known value.
 
-View installation instructions by typing "links /mnt/cdrom/docs/handbook/html/index.html" 
-or "links http://www.gentoo.org/doc/en/handbook/handbook.xml"
-for the latest version from the gentoo.org web site.
-
 Please report any bugs you find to http://bugs.gentoo.org. Be sure to include
 detailed information about how to reproduce the bug you are reporting.
 Thank you for using Gentoo Linux!

diff --git a/livecd/files/universal.motd.txt b/livecd/files/universal.motd.txt
index 51b2fde8fadb9593a915508252274a902967f44a..403b87298728dfa774fc399efed5ac18abc4d956 100644 (file)
--- a/livecd/files/universal.motd.txt
+++ b/livecd/files/universal.motd.txt
@@ -1,3 +1,5 @@
 
 Stage tarball(s), distfiles and packages can be found in /mnt/cdrom/.
 
+You can view the networkless installation instructions for this release by
+typing "links /mnt/cdrom/docs/handbook/html".