8 files changed, 50 insertions, 13 deletions
diff --git a/doc/index.docbook b/doc/index.docbook
index 79989c762..cb99abaa9 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -70,8 +70,8 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2020-12-29</date>
-<releaseinfo>Applications 21.04</releaseinfo>
+<date>2021-04-08</date>
+<releaseinfo>Applications 21.08</releaseinfo>
 
 <abstract>
 <para>
@@ -853,7 +853,10 @@ bar. This provides a very comfortable way for
 the user to shrink the number of search results.</para>
 <para>To start a search select one or more file types (<guilabel>Documents</guilabel>, 
 <guilabel>Audio</guilabel>, <guilabel>Video</guilabel>, <guilabel>Images</guilabel>),
-  a time period and rating<!--FIXME readd when again implemented: and tag, if you have defined any.--></para>
+a time period, rating, and tag, if you have defined any via
+<userinput>tag:<replaceable>foo</replaceable></userinput> in the input box.</para>
+ 
+ <para>It is possible to clear selection using the <guibutton>Clear Selection</guibutton> button.</para>
 
 <para>Alternatively you can use these options in the <guilabel>Places</guilabel> panel 
 together with the <guilabel>Filter</guilabel> bar to find files using Baloo or limit 
@@ -862,11 +865,10 @@ the search to files matching the filter expression.</para>
 <para>Use the Save icon to save a search to the <guilabel>Search For</guilabel>
 section in the <guilabel>Places</guilabel> panel to quickly access it again in the future.
 </para>
-<!--FIXME 16.12
-https://git.reviewboard.kde.org/r/123883/
-Add prototype of a "More search tools..." button
--->
 
+<para>
+Use the <guilabel>More Search Tools</guilabel> drop-down list to select other search tools than Baloo.
+</para>
 </sect2>
 
 <sect2 id="mounting-storage-media">
@@ -1107,11 +1109,15 @@ the status bar is wide enough:
 <itemizedlist>
 
 <listitem><para>
-A <guilabel>zoom slider</guilabel> which can be used to change the icon size quickly.
+The <guilabel>Show status bar</guilabel> item can be used for toggling status bar visibility.
+</para></listitem>
+
+<listitem><para>
+The <guilabel>Show zoom slider</guilabel> item allows switching visibility of the icon size widget.
 </para></listitem>
 
 <listitem><para>
-A bar that shows how much space is free on the current drive.
+The <guilabel>Show space information</guilabel> item can be used to switch on and off a bar that shows how much space is free on the current drive.
 </para></listitem>
 
 </itemizedlist>
@@ -1360,7 +1366,7 @@ several levels deeper in the folder hierarchy.
 </sect2>
 
 <sect2 id="preferences-dialog-context-menu">
-<title>Context Menu</title>
+<title>Services</title>
 
 <para>
 This group offers a selection of services that can be shown in the
@@ -1369,15 +1375,15 @@ appears when clicking a file or folder with the &RMB;.
 </para>
 
 <screenshot>
-<screeninfo>Screenshot of the Context Menu settings in &dolphin;'s preferences dialog</screeninfo>
+<screeninfo>Screenshot of the Services Menu settings in &dolphin;'s preferences dialog</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="preferences-context-menu.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>Context Menu Settings.</phrase>
+<phrase>Services Settings.</phrase>
 </textobject>
-<caption><para>Context Menu Settings in &dolphin;'s Preferences Dialog.</para></caption>
+<caption><para>Services Settings in &dolphin;'s Preferences Dialog.</para></caption>
 </mediaobject>
 </screenshot>
 
@@ -1445,6 +1451,37 @@ largest files can be deleted automatically.
 
 </sect2>
 
+<sect2 id="preferences-user-feedback">
+<title>Trash</title>
+
+<para>
+This group contains settings which control your contributing information on the &dolphin; usage to its developers.
+
+<screenshot>
+<screeninfo>Screenshot of the User Feedback settings in &dolphin;'s preferences dialog</screeninfo>
+<mediaobject>
+<imageobject>
+<imagedata fileref="preferences-user-feedback.png" format="PNG"/>
+</imageobject>
+<textobject>
+<phrase>User Feedback Settings.</phrase>
+</textobject>
+<caption><para>User Feedback Settings in &dolphin;'s Preferences Dialog.</para></caption>
+</mediaobject>
+</screenshot>
+
+<itemizedlist>
+
+<listitem><para>
+You can contribute some feedback on &dolphin; if you wish. Use sliders to configure your level of participation.
+</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</sect2>
+
 </sect1>
 <!-- begin copy to konqueror filemanager.docbook -->
 <sect1 id="view-properties">
diff --git a/doc/preferences-context-menu.png b/doc/preferences-context-menu.png
index 5b42fa394..16c46d913 100644
--- a/doc/preferences-context-menu.png
+++ b/doc/preferences-context-menu.png
diff --git a/doc/preferences-general-behavior.png b/doc/preferences-general-behavior.png
index f3f68c4f0..e26d453d2 100644
--- a/doc/preferences-general-behavior.png
+++ b/doc/preferences-general-behavior.png
diff --git a/doc/preferences-navigation.png b/doc/preferences-navigation.png
index dd74d813c..59f9605dc 100644
--- a/doc/preferences-navigation.png
+++ b/doc/preferences-navigation.png
diff --git a/doc/preferences-startup.png b/doc/preferences-startup.png
index 192efe193..7ac228059 100644
--- a/doc/preferences-startup.png
+++ b/doc/preferences-startup.png
diff --git a/doc/preferences-trash.png b/doc/preferences-trash.png
index d9e0a1513..bc4c92a62 100644
--- a/doc/preferences-trash.png
+++ b/doc/preferences-trash.png
diff --git a/doc/preferences-user-feedback.png b/doc/preferences-user-feedback.png
new file mode 100644
index 000000000..5a2d45678
--- /dev/null
+++ b/doc/preferences-user-feedback.png
diff --git a/doc/preferences-viewmodes-icons.png b/doc/preferences-viewmodes-icons.png
index b2a219ab4..ff5dd0b97 100644
--- a/doc/preferences-viewmodes-icons.png
+++ b/doc/preferences-viewmodes-icons.png