Merge branch 'master' of git.kde.org:dolphin

3 files changed, 48 insertions, 61 deletions

diff --git a/doc/index.docbook b/doc/index.docbook
index 3749831ab..535f41949 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1,7 +1,5 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-  <!ENTITY dolphin "<application>Dolphin</application>">
-  <!ENTITY kappname "&dolphin;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
 ]>
@@ -72,12 +70,12 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2015-08-02</date>
-<releaseinfo>Applications 15.08</releaseinfo>
+<date>2016-06-01</date>
+<releaseinfo>Applications 16.04</releaseinfo>
 
 <abstract>
 <para>
-&dolphin; is the default file manager for &kde;, designed with usability as a primary focus.
+&dolphin; is the default file manager by &kde;, designed with usability as a primary focus.
 </para>
 </abstract>
 
@@ -95,7 +93,7 @@
 <title>Introduction</title>
 
 <para>
-&dolphin; is &kde;'s default file manager. It aims to improve usability at the
+&dolphin; is &plasma;'s default file manager. It aims to improve usability at the
 user interface level. &dolphin; focuses only on being a file manager whereas
 &konqueror;, which was &kde;'s default file manager in &kde; 3 and can still be
 used for file management, is a universal viewer for many file types.
@@ -357,12 +355,12 @@ the extension is replaced by <quote>...</quote>
 the <guilabel>Name</guilabel> header, which is always the first column in this view.
 </para>
 <para>
-The details view allows you to view the current directory
+The details view allows you to view the current folder
 in a tree-like fashion if <link linkend="preferences-dialog-viewmodes-details">
-<guilabel>Expandable folders</guilabel></link> are enabled: 
+<guilabel>Expandable folders</guilabel></link> are enabled:
 Each subfolder of the current folder can be
-<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon>&gt;</guiicon>
-or <guiicon>v</guiicon> icon next to it.</para></listitem>
+<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon>+</guiicon>
+or <guiicon>-</guiicon> icon next to it.</para></listitem>
 </itemizedlist>
 </para>
 
@@ -386,7 +384,7 @@ in <menuchoice><guimenu>View</guimenu><guisubmenu>Sort by</guisubmenu></menuchoi
 <sect3 id="dolphin-view-information">
 <title>Information in the View</title>
 <para>
-In all view modes &kappname; shows at least an icon and a name for each item. 
+In all view modes &dolphin; shows at least an icon and a name for each item. 
 Using <guisubmenu>Additional Information</guisubmenu> in the <guimenu>View</guimenu> 
 menu or the context menu of the header in <guilabel>Details</guilabel> mode, you can select
 more information for each item to be shown:
@@ -776,6 +774,7 @@ current folder, &RMB; click in the work space and click
 <sect2 id="finding-searching-in-file">
 <title>Finding Files and Searching in Files</title>
 <!-- FIXME search in hidden files + folders View -> Show Hidden Files has to be enabled ? -->
+<!-- https://bugs.kde.org/show_bug.cgi?id=361557 No clear way to open configuration dialog for Baloo search engine -->
 <para>
 &dolphin; is capable of searching for files and for content in files. If <keycombo action="simul">
 &Ctrl;<keycap>F</keycap></keycombo> is pressed or <menuchoice> <guimenu>Edit</guimenu> 
@@ -1146,16 +1145,9 @@ structure and in archives works.
 <itemizedlist>
 
 <listitem><para>
-&dolphin; can be configured to open items with a single mouse click
-(<guilabel>Single-click to open files and folders</guilabel>) or a double mouse
-click (<guilabel>Double-click to open files and folders</guilabel>). In the
-latter case, a single mouse click will select the file or folder.
-</para>
-<note>
-<para>This is a system wide setting and can be changed in the &systemsettings; in the
-<menuchoice><guimenu>Input Devices</guimenu> <guimenuitem>Mouse</guimenuitem></menuchoice> 
-module as well.</para>
-</note>
+The option to open items with a single or double mouse click is a system wide setting and can be
+changed in the &systemsettings; in the <menuchoice><guimenu>Input Devices</guimenu>
+<guimenuitem>Mouse</guimenuitem></menuchoice> module.</para>
 </listitem>
 
 <listitem><para>
@@ -1295,28 +1287,18 @@ In the <guilabel>View</guilabel> section, you can configure whether the
 <link linkend="view-properties"> view properties</link> are stored for each
 folder or if common view properties are to be used for all folders.
 </para></listitem>
-<listitem><para>
-When hovering over a file or folder with the mouse, a small window with relevant
-information is shown if <guilabel>Show tooltips</guilabel> is enabled.
-</para></listitem>
 
 <listitem><para>
-<guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton>
-or <guibutton>-</guibutton> button above an item's icon if the item is hovered over
-with the mouse. These can be used to select or deselect the item.
-</para></listitem>
-
-<listitem><para>
-<guilabel>Natural sorting of items</guilabel> controls how items are sorted in
-the view. If this option is enabled, the sort order of three example files
+<guilabel>Sorting Mode</guilabel> controls how items are sorted in
+the view. If <guilabel>Natural sorting</guilabel> is enabled, the sort order of three example files
 will be
 <orderedlist>
 <listitem><para>File1,</para></listitem>
 <listitem><para>File2,</para></listitem>
 <listitem><para>File10.</para></listitem>
 </orderedlist>
-If this option is disabled, the normal alphabetical sorting will be used, which
-leads to the sort order
+If this option is disabled, the normal alphabetical sorting case sensitive or case insensitive
+will be used, which leads to the sort order
 <orderedlist>
 <listitem><para>File1,</para></listitem>
 <listitem><para>File10,</para></listitem>
@@ -1325,7 +1307,18 @@ leads to the sort order
 </para></listitem>
 
 <listitem><para>
-Enable <guilabel>Rename inline</guilabel> to use this mode if only one item is currently selected. 
+When hovering over a file or folder with the mouse, a small window with relevant
+information is shown if <guilabel>Show tooltips</guilabel> is enabled.
+</para></listitem>
+
+<listitem><para>
+<guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton>
+or <guibutton>-</guibutton> button above an item's icon if the item is hovered over
+with the mouse. These can be used to select or deselect the item.
+</para></listitem>
+
+<listitem><para>
+Enable <guilabel>Rename inline</guilabel> to use this mode if only one item is currently selected.
 If this option is disabled or several items are selected, a dialog will be displayed for renaming.
 </para></listitem>
 
@@ -1381,11 +1374,6 @@ A bar that shows how much space is free on the current drive.
 </itemizedlist>
 
 </para>
-<note><para>
-Since &dolphin; 4.9 the <guimenuitem>Delete</guimenuitem>,
-<guimenuitem>Copy To</guimenuitem>, and <guimenuitem>Move To</guimenuitem>
-commands of the context menu have to be enabled on the Services page.
-</para></note>
 
 </sect3>
 
@@ -1398,7 +1386,7 @@ commands of the context menu have to be enabled on the Services page.
 
 <para>
 The following settings control how the contents of a folder are displayed in the
-&kappname; view, and are stored on a per-folder basis by default:
+&dolphin; view, and are stored on a per-folder basis by default:
 </para>
 <itemizedlist>
 
@@ -1419,7 +1407,7 @@ Sorting of folders and files &ndash; are folders shown first or not?
 <listitem><para>
 Previews &ndash; are they shown instead of icons (based on the settings made in
 <link linkend="preferences-dialog-general-previews"><guilabel>Previews</guilabel>
-tab of &kappname;'s General settings</link>) or not?
+tab of &dolphin;'s General settings</link>) or not?
 </para></listitem>
 
 <listitem><para>
@@ -1539,6 +1527,17 @@ folder.</action></para>
 <varlistentry>
 <term><menuchoice>
 <shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Undo close tab</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Reopens the last closed tab.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
 <keycombo action="simul"><keycap>F2</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
@@ -1584,7 +1583,7 @@ to the trash and cannot be restored.</action></para></listitem>
 <listitem><para><action>Shows the properties dialog for the currently selected
 item(s).</action></para></listitem>
 </varlistentry>
-
+<!--FIXME http://www.aelog.org/checksums-made-easy in fundamentals? -->
 <varlistentry>
 <term><menuchoice>
 <shortcut>
@@ -1644,7 +1643,10 @@ item(s).</action></para></listitem>
 <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu>
-<guimenuitem>Paste Clipboard Contents...</guimenuitem>
+<guimenuitem>Paste Clipboard Contents...</guimenuitem></menuchoice> or
+<menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste one File</guimenuitem></menuchoice> or
+<menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste one Folder</guimenuitem></menuchoice> or
+<menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste x Items</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Pastes the currently copied/cut items to the current
 folder. If the clipboard does not contain files or folders, the clipboard
@@ -1778,7 +1780,7 @@ current folder grouped by the option selected in <guimenuitem>Sort By</guimenuit
 <keycombo action="simul">&Alt;<keycap>.</keycap></keycombo>
 </shortcut>
 <guimenu>View</guimenu>
-<guimenuitem>Show Hidden Files</guimenuitem>
+<guimenuitem>Hidden Files</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Shows all the hidden files and sub-folders within the current
 folder.</action></para></listitem>
@@ -2102,21 +2104,6 @@ Documentation copyright 2009 Frank Reininghaus <email>[email protected]</
 
 </chapter>
 
-<appendix id="installation">
-<title>How to get &dolphin;</title>
-
-&install.intro.documentation;
-
-<para>For instructions on acquiring &kde; please see <ulink
-url="http://www.kde.org">http://www.kde.org</ulink> or read the chapter 
-<ulink url="help:/fundamentals/install.html">Installing &kde;</ulink> 
-in the &kde; Fundamentals.</para>
-
-<para>For further information about &dolphin; you might want to visit
-<ulink url="http://userbase.kde.org/Dolphin">http://userbase.kde.org/Dolphin</ulink>.</para>
-
-</appendix>
-
 &documentation.index;
 </book>
 
diff --git a/doc/preferences-general-behavior.png b/doc/preferences-general-behavior.png
index 164d1e38f..713d06049 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 795e52d0f..32e2ef312 100644
--- a/doc/preferences-navigation.png
+++ b/doc/preferences-navigation.png