Git commit 273d68e0e578fe1255cedf91f52a3dea8c8b34ad by Yuri Chornoivan. Committed on 14/09/2016 at 16:22. Pushed by yurchor into branch 'master'.
Add information on the alternative locations of config files M +1 -1 doc/basic-functions.docbook M +5 -0 doc/bookmarks.docbook M +4 -4 doc/configuration-files.docbook M +5 -0 doc/faq.docbook M +6 -3 doc/man-krusader.1.docbook M +2 -2 doc/useraction-xml.docbook M +1 -1 doc/useractions.docbook http://commits.kde.org/krusader/273d68e0e578fe1255cedf91f52a3dea8c8b34ad diff --git a/doc/basic-functions.docbook b/doc/basic-functions.docbook index 785ed2b..1d00830 100644 --- a/doc/basic-functions.docbook +++ b/doc/basic-functions.docbook @@ -380,7 +380,7 @@ By <link linkend="konfig-general">default</link> it will be moved to &kde;'s Trash. You can open the &kde; Trash with the Trash icon in the <link linkend="main_toolbar">Main Toolbar</link> or with the <filename>trash:/</filename> KIO slave. - Physically &kde; Trash is located in <filename>~/.local/share/Trash/</filename>. + Physically &kde; Trash is located in <filename>~/.local/share/Trash/</filename> or <filename>Trash</filename> in the subdirectory in user home directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command. <keycombo action="simul">&Shift; <keycap>Delete</keycap></keycombo> will delete the file permanently. A dialog will ask for your confirmation and will diff --git a/doc/bookmarks.docbook b/doc/bookmarks.docbook index f00bc58..77cc9d8 100644 --- a/doc/bookmarks.docbook +++ b/doc/bookmarks.docbook @@ -224,6 +224,11 @@ bookmarks are stored in <filename> ~/.local/share/krusader/krbookmarks.xml</filename>.</para> + <note> + <para> + The default folder for the bookmarks file <filename>krusader/krbookmarks.xml</filename> is <filename class="directory">~/.local/share</filename>. You can determine the needed folder in your system using the <userinput>qtpaths --paths GenericDataLocation</userinput> command in terminal. + </para> + </note> <para>You can import bookmarks from <application>IE</application>, <application>Opera</application>, diff --git a/doc/configuration-files.docbook b/doc/configuration-files.docbook index 1a87218..e520614 100644 --- a/doc/configuration-files.docbook +++ b/doc/configuration-files.docbook @@ -33,9 +33,9 @@ <link linkend="faqi_missing_menus">krusaderui.rc &FAQ;</link>.</para> <para>Location: - <filename>$KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename> or + <filename>$KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename>, or <filename> - ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename></para> + ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename>, or <filename>kxmlgui5/krusader/krusaderui.rc</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para> <para> <emphasis role="bold">krusaderrc</emphasis> </para> @@ -125,7 +125,7 @@ uses the <ulink url="http://grail.sourceforge.net/info/xbel.html";>XBEL standard</ulink>.</para> <para>Location: <filename> - ~/.local/share/krusader/krbookmarks.xml</filename></para> + ~/.local/share/krusader/krbookmarks.xml</filename> or <filename>krusader/krbookmarks.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para> <para> <emphasis role="bold">useractions.xml</emphasis> </para> @@ -133,7 +133,7 @@ configuration.</para> <para>Location: <filename> - ~/.local/share/krusader/useractions.xml</filename></para> + ~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useractions.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para> <para> <emphasis role="bold">useraction-examples.xml</emphasis> </para> diff --git a/doc/faq.docbook b/doc/faq.docbook index 52a17db..09449b1 100644 --- a/doc/faq.docbook +++ b/doc/faq.docbook @@ -363,6 +363,11 @@ wrong directory, only the <guimenu>Help</guimenu> menu appears, please read the previous question.</para> + <note> + <para> + The default folder for the local configuration file <filename>kxmlgui5/krusaderui.rc</filename> is <filename class="directory">~/.local/share</filename>. You can determine the needed folder in your system using the <userinput>qtpaths --paths GenericDataLocation</userinput> command in terminal. + </para> + </note> <para></para> <!-- Empty line to make it more readable --> </answer> diff --git a/doc/man-krusader.1.docbook b/doc/man-krusader.1.docbook index cff0d6e..4a72d5b 100644 --- a/doc/man-krusader.1.docbook +++ b/doc/man-krusader.1.docbook @@ -108,11 +108,14 @@ panel</para> <para><filename>~/.config/krusaderrc</filename></para> -<para><filename>~/.local/share/krusader/krbookmarks.xml</filename></para> +<para><filename>~/.local/share/krusader/krbookmarks.xml</filename> or <filename>krusader/krbookmarks.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para> -<para><filename>$KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename> or</para> +<para><filename>~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useractions.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para> -<para><filename>~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename></para> +<para><filename>$KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename></para> + +<para><filename>~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename> or <filename>kxmlgui5/krusader/krusaderui.rc</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para> +</para> </refsect1> diff --git a/doc/useraction-xml.docbook b/doc/useraction-xml.docbook index b6d4440..8f15445 100644 --- a/doc/useraction-xml.docbook +++ b/doc/useraction-xml.docbook @@ -19,9 +19,9 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, * * MA 02111-1307, USA. * *********************************************************************** --> - <title>useraction.xml</title> + <title>useractions.xml</title> <para>This appendix gives several examples of - <filename>useraction.xml</filename> files. With this you can begin + <filename>useractions.xml</filename> files. With this you can begin to discover the power of the <link linkend="useractions">UserActions</link> and start learning how to use them. Once you understand how to write UserActions you will find that &krusader; is an even diff --git a/doc/useractions.docbook b/doc/useractions.docbook index 8501b2a..490fa17 100644 --- a/doc/useractions.docbook +++ b/doc/useractions.docbook @@ -34,7 +34,7 @@ standard Edit Toolbar and Edit Shortcut dialogs will show UserActions, too. The UserActions are stored in <filename> - ~/.local/share/krusader/useraction.xml</filename>. + ~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useraction.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command. Several <link linkend="useraction-xml">examples</link> are included in the documentation. UserActions can be edited / added / imported /
