Merge branch 'master' of github.com:deajan/obackup

Conflicts: obackup.sh
2013-07-11 19:59:01 +02:00 · 2013-07-11 19:59:01 +02:00 · 6da89c4654
parent bf551a5b9f fcd10edeb5
commit 6da89c4654
5 changed files with 1248 additions and 1093 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,7 @@
 ## Latest changelog

+- Uploaded first documentation
+- Fixed an issue with RotateBackups
 - Updated obackup to log failed ssh command results
 - Updated ssh command filter to log failed commands
 - Updated ssh command filter to accept personalized commands
--- a/DOCUMENTATION.txt
+++ b/DOCUMENTATION.txt
@ -1 +0,0 @@
-## Documentation is being worked on... really... !
--- a/TODO.md
+++ b/TODO.md
@ -1,13 +1,9 @@
-## Main version 1.83
-
-Upcomming features:
-
- Write proper documentation
+## Main version 1.84

 Bugs not yet addressed that will be done a bit later:

 - Recursive task creation doesn't include files in root directory but only subdirectories
- Disk usage check doesn't calculate excluded directories
+- Disk usage check doesn't honor excluded directories

 Future plans:

--- a/documentation.html
+++ b/documentation.html
--- a/obackup.sh
+++ b/obackup.sh
				`@ -1 +0,0 @@`
				`## Documentation is being worked on... really... !`