Final changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1306 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 6ebe117daa6b0b1927aac9ae7b2318885d67ba35..34db384b9153fd257715d105936a28636b87f4d2 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -43,6 +43,8 @@ For 1.33 Testing/Documentation:
 
 
 For version 1.35:
+- When unmarking a directory check if all files below are unmarked and
+  then remove the + flag -- in the restore tree.
 - Possibly implement: Action = Unmount Device="TapeDrive1" in Admin jobs.
 - Setup lrrd graphs: (http://www.linpro.no/projects/lrrd/) Mike Acar.
 - Revisit the question of multiple Volumes (disk) on a single device.

diff --git a/bacula/src/win32/winbacula.nsi.in b/bacula/src/win32/winbacula.nsi.in
index 98358b60780eea07dc1c694f542331ae4b0ea6be..34086b3136b09a126e789a1c5c6428e3138f93fb 100755 (executable)
--- a/bacula/src/win32/winbacula.nsi.in
+++ b/bacula/src/win32/winbacula.nsi.in
@@ -193,7 +193,7 @@ SectionEnd
   LangString DESC_SecService ${LANG_ENGLISH} "Install Bacula client on this system."
   LangString DESC_SecConsole ${LANG_ENGLISH} "Install Console program on this system."
   LangString DESC_SecWxConsole ${LANG_ENGLISH} "Install graphical console program on this system."
-  LangString DESC_SecDoc ${LANG_ENGLISH} "Install Documenation on this system."
+  LangString DESC_SecDoc ${LANG_ENGLISH} "Install Documentation on this system."
 
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService)