Merge pull request #1324 from matthiasbeyer/minor

Minor patches

doc/src/09010-contributing.md

@@ -83,6 +83,11 @@ Do not change document and code in one commit, always separate them.
 If your changes are user-visible (new commandline flags, other semantics in the
 commandline, etc), make sure to add a note in the `CHANGELOG.md` file (in the
 same commit if it is a simple change).
+**If it is a bugfix**, do add the changelog entry in a new commit (best would
+be: one commit for a testcase which shows the bug, one commit for the fix, more
+if the fix is complicated, and one commit for the changelog entry).
+Changelog entries for bug fixes should be extra commits, because backporting
+bugfixes gets simpler this way.
 
 We do not follow some official Rust styleguide for our codebase, but we try to
 write minimal and readable code. 100 characters per line, as few lines as

doc/src/09020-changelog.md

@@ -68,6 +68,28 @@ This section contains the changelog from the last release to the next release.
       `std::str::Lines` iterator takes empty lines as no lines.
 
 
+## 0.6.3
+
+Bugfix release for fixing:
+
+* `libimagstore` got another fix with the file parsing, as the
+  `std::str::Lines` iterator takes empty lines as no lines.
+
+
+## 0.6.2
+
+Bugfix release for fixing:
+
+* `imag-diary` did not recognize the "-d DIARY" setting.
+* A parsing error in `libimagstore`, which caused the parsing of entries
+  with a line "---" in the content part to fail, was fixed.
+* The bugfix above introduced another bug which caused entries to be rewritten
+  in one line when accessing them. This was fixed.
+* `imag-diary` did not properly set "minute" and "second" when creating "hourly"
+  or "minutely" entries.
+* Version numbers for all crates as well as in the docs were updated to "0.6.2".
+
+
 ## 0.6.1
 
 Bugfix release for fixing two severe bugs in `imag-init`:

lib/core/libimagstore/src/store.rs

@@ -494,7 +494,7 @@ impl Store {
         debug!("Writing Entry");
         se.write_entry(&entry.entry)?;
         if modify_presence {
-            debug!("Modifying ppresence of {} -> Present", entry.get_location());
+            debug!("Modifying presence of {} -> Present", entry.get_location());
             se.status = StoreEntryStatus::Present;
         }