X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=changelog;h=8f408e98fb8784ac44f56fe77d64e628e067a391;hb=809f26574fae75124cad1cfa9eb955ec1f52a814;hp=06ae2d99929f9f327004a56523415de965ef91a7;hpb=d87e87882fa8946be61740636208fd8a6457816a;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/changelog b/changelog
index 06ae2d9..8f408e9 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,9 @@
 version 0.7 -- July 3 2005
-    added ninjahelper: a dialog based wizard for creating backupninja configs.
-    considerably improved and changed the log file output.
-        
+	added ninjahelper: a dialog based wizard for creating backupninja configs.
+	considerably improved and changed the log file output.
+	you can now disable actions with .disabled (this is new preferred method).
+	added makecd handler and example.makecd for backing up to cd/dvd
+
 version 0.6 -- June 16 2005
 	ldap handler has new options: backup method to use (ldapsearch or
 		slapcat), restart, passwordfile and binddn. Default backup method
@@ -28,10 +30,11 @@ version 0.6 -- June 16 2005
 	added configfile option to mysql handler
 		the default is /etc/mysql/debian.cnf. with this, 
 		sqldump doesn't need dbusername. (hotcopy still does).
-    fixed bug in mysql handler which caused some passwords to not work.
-        (.my.cnf files now have double quotes around password)
-    can now pass options to hwinfo and sfdisk in sys handler.
+	fixed bug in mysql handler which caused some passwords to not work.
+	 	(.my.cnf files now have double quotes around password)
+	can now pass options to hwinfo and sfdisk in sys handler.
 
+>>>>>>> .r129
 version 0.5 -- April 12 2005
 	rdiff handler works when remote sshd has a banner
 	rdiff handler supports local dest