[SCM] wiki-content branch, master, updated. 69db5b508d64cc26878b259cca44983aab36406c

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 69db5b508d64cc26878b259cca44983aab36406c
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 21 21:54:54 2010 +0100

    Updatin live-manual todo page.

diff --git a/devel/live-manual/todo.mdwn b/devel/live-manual/todo.mdwn
index a2c19dc..8face89 100644
--- a/devel/live-manual/todo.mdwn
+++ b/devel/live-manual/todo.mdwn
@@ -3,6 +3,7 @@
   * put every volatile content (such as temporary hacks, wishlists etc) to ikiwiki on live.d.n.
   * put every 'more or less stable' documentation stuff into live-manual
   * wipe wiki.d.o/DebianLive/*
-  * have w.d.o/DL pointing to l.d.n or something like that
-  * mop up all links on wiki.d.o to current DL wiki pages, mostly linking to live-manual
+  * have wiki.d.o/DebianLive pointing to live.d.n or something like that
+  * merge debian-live.alioth.d.o into live.d.n
+  * mop up all links on wiki.d.o/DebianLive to their new location
   * look everywhere to update links pointing to alioth mailinglist to the debian mailinglist.

-- 
wiki-content