merge in ex-base-config branch

1 files changed, 13 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index b65ef3c8c..3258cba2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
 installation-guide (2006XXXX) UNRELEASED; urgency=low
 
-  * 
+  [ Joey Hess ]
+  * Update preseeding docs for base-config removal.
+  * Add documentation of how to change apt-setup security source with
+    preseeding.
+  * Remove the sarge preseeding docs.
+  * Remove mentions of base-config and move base-config stuff to elsewhere.
+  * Add documentation of apt-setup, user-setup, clock-setup, tzsetup, and 
+    pkgsel.
+  * Change some references to tty3 (messages) to instead refer to tty4
+    (syslog).
+  * Change references to /var/log/debian-installer to just /var/log/installer.
+  * Remove docs for baseconfig-udeb; going away with base-config.
+  * Removed various bits of sarge cruft when it made things easier.
 
  -- Frans Pop <fjp@debian.org>  Mon,  2 Jan 2006 23:06:51 +0100