[smb4k/2.1] doc: Updated handbook.

[Alexander Reinholdt]

Git commit d32fcea4318a5127e17bf8bd6a07169da14dc591 by Alexander Reinholdt.
Committed on 22/02/2018 at 19:40.
Pushed by areinholdt into branch '2.1'.

Updated handbook.

(cherry picked from commit 77700d29198b24738af8b2a894d6fa0083e8aeb5)

M  +4    -0    doc/index.docbook
M  +-    --    doc/systemtray_bookmarks_menu.png
D  +-    --    doc/systemtray_location.png
D  +-    --    doc/systemtray_mounted_shares_menu.png
M  +-    --    doc/systemtray_profiles_menu.png

https://commits.kde.org/smb4k/d32fcea4318a5127e17bf8bd6a07169da14dc591

diff --git a/doc/index.docbook b/doc/index.docbook
index 659e347..22030a0 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -27,7 +27,11 @@
     <holder>Alexander Reinholdt</holder>
   </copyright>
   <legalnotice>&underFDL;</legalnotice>
+<<<<<<< HEAD
   <date>2018-01-07</date>
+=======
+  <date>2018-02-22</date>
+>>>>>>> 77700d2... Updated handbook.
   <releaseinfo>&smb4k; 2.1.0</releaseinfo><!--FIXME change releaseinfo number-->
   <abstract>
     <para>&smb4k; is an advanced network neighborhood browser and Samba share mounting utility.</para>
diff --git a/doc/systemtray_bookmarks_menu.png b/doc/systemtray_bookmarks_menu.png
index 7101c8d..b2f87a3 100644
Binary files a/doc/systemtray_bookmarks_menu.png and b/doc/systemtray_bookmarks_menu.png differ
diff --git a/doc/systemtray_location.png b/doc/systemtray_location.png
deleted file mode 100644
index a56fb1b..0000000
Binary files a/doc/systemtray_location.png and /dev/null differ
diff --git a/doc/systemtray_mounted_shares_menu.png b/doc/systemtray_mounted_shares_menu.png
deleted file mode 100644
index 19ea2fd..0000000
Binary files a/doc/systemtray_mounted_shares_menu.png and /dev/null differ
diff --git a/doc/systemtray_profiles_menu.png b/doc/systemtray_profiles_menu.png
index 6f5eab5..1111db6 100644
Binary files a/doc/systemtray_profiles_menu.png and b/doc/systemtray_profiles_menu.png differ