Git commit 1679ce5b7e086ae9e7ae2592fed28fcc50481e4f by Yuri Chornoivan. Committed on 06/08/2015 at 07:53. Pushed by yurchor into branch 'master'.
Fix paths to configuration files for KF5 M +1 -1 doc/bookmarks.docbook M +8 -8 doc/configuration-files.docbook M +9 -9 doc/faq.docbook M +2 -2 doc/installation.docbook M +1 -1 doc/konfigurator.docbook M +4 -4 doc/man-krusader.1.docbook M +1 -1 doc/menu-commands.docbook M +2 -2 doc/useractions.docbook http://commits.kde.org/krusader/1679ce5b7e086ae9e7ae2592fed28fcc50481e4f diff --git a/doc/bookmarks.docbook b/doc/bookmarks.docbook index 4e795fc..f00bc58 100644 --- a/doc/bookmarks.docbook +++ b/doc/bookmarks.docbook @@ -223,7 +223,7 @@ <ulink url="http://grail.sourceforge.net/info/xbel.html";>XBEL standard</ulink> for the bookmark format. The bookmarks are stored in <filename> - ~/.kde/share/apps/krusader/krbookmarks.xml</filename>.</para> + ~/.local/share/krusader/krbookmarks.xml</filename>.</para> <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 00326e1..4be0832 100644 --- a/doc/configuration-files.docbook +++ b/doc/configuration-files.docbook @@ -33,16 +33,16 @@ <link linkend="faqi_missing_menus">krusaderui.rc &FAQ;</link>.</para> <para>Location: - <filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename> or + <filename>$KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename> or <filename> - ~/.kde/share/apps/krusader/krusaderui.rc</filename></para> + ~/.kde/share/kxmlgui5/krusader/krusaderui.rc</filename></para> <para> <emphasis role="bold">krusaderrc</emphasis> </para> <para>This file stores the &krusader; configuration.</para> <para>Location: - <filename>~/.kde/share/config/krusaderrc</filename></para> + <filename>~/.config/krusaderrc</filename></para> <para>The following settings are ⪚ stored:</para> <itemizedlist> <listitem> @@ -125,7 +125,7 @@ uses the <ulink url="http://grail.sourceforge.net/info/xbel.html";>XBEL standard</ulink>.</para> <para>Location: <filename> - ~/.kde/share/apps/krusader/krbookmarks.xml</filename></para> + ~/.local/share/krusader/krbookmarks.xml</filename></para> <para> <emphasis role="bold">useractions.xml</emphasis> </para> @@ -134,7 +134,7 @@ Doxygen headers of UserActionXML.</para> <para>Location: <filename> - ~/.kde/share/apps/krusader/useractions.xml</filename></para> + ~/.local/share/krusader/useractions.xml</filename></para> <para> <emphasis role="bold">useraction-examples.xml</emphasis> </para> @@ -143,7 +143,7 @@ UserActionXML.</para> <para>Location: <filename> - $KDEDIR/share/apps/krusader/useraction-examples.xml</filename></para> + $KDEDIR/share/krusader/useraction-examples.xml</filename></para> <para> <emphasis role="bold">foo.keymap</emphasis> </para> @@ -154,12 +154,12 @@ legacy binary format.</para> <para>Location: <filename> - $KDEDIR/share/apps/krusader/foo.keymap</filename></para> + $KDEDIR/share/krusader/foo.keymap</filename></para> <para> <emphasis role="bold">foo.color</emphasis> </para> <para>This is a binary file that holds the <link linkend="konfig-color">Color Scheme</link>.</para> <para>Location: - <filename>$KDEDIR/share/apps/krusader/foo.color</filename></para> + <filename>$KDEDIR/share/krusader/foo.color</filename></para> </appendix> diff --git a/doc/faq.docbook b/doc/faq.docbook index 22bbaaa..5cbafb4 100644 --- a/doc/faq.docbook +++ b/doc/faq.docbook @@ -317,16 +317,16 @@ <para>The <filename>krusaderui.rc</filename> file is stored in <filename> - $KDEDIR/share/apps/krusader/krusaderui.rc</filename>. + $KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename>. When you change the <guilabel>Toolbar</guilabel>, &kde; makes a copy of that file in the home folder at <filename> - ~/.kde/share/apps/krusader/krusaderui.rc</filename>. If + ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename>. If &krusader; was previously installed on your computer, and you install a newer &krusader; version the <filename> - ~/.kde/share/apps/krusader/krusaderui.rc</filename> file + ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename> file must be replaced with the newer version. Note: this will also reset all your changes on toolbars and shortcuts!</para> @@ -336,7 +336,7 @@ version, &kde; will automatically replace the old <filename> - ~/.kde/share/apps/krusader/krusaderui.rc</filename> with + ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename> with the newer version when starting the new &krusader; for the first time (&kde; will detect the newer version number in @@ -350,11 +350,11 @@ <userinput> <command>rm</command> <option> - ~/.kde/share/apps/krusader/krusaderui.rc</option> + ~/.local/share/kxmlgui5/krusader/krusaderui.rc</option> </userinput></para> <para>If the <filename> - ~/.kde/share/apps/krusader/krusaderui.rc</filename> file + ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename> file is older, then the new menu elements will not be shown. Read the previous question for information on how to update the @@ -708,7 +708,7 @@ Check the <link linkend="konfig-protocols">Konfigurator Protocol page</link> - If it does not work, backup your <filename>~/.kde/share/config/krusaderrc</filename> configuration file and remove it from this location. + If it does not work, backup your <filename><envar>XDG_CONFIG_HOME</envar>/krusaderrc</filename> (default is <filename>$<envar>HOME</envar>/.config/krusaderc</filename>) configuration file and remove it from this location. Restart &krusader;, &krusader; will now start the first start configuration wizard, follow these guidelines. </para> @@ -936,9 +936,9 @@ <para>Presuming that the current setup is the good configuration, you can copy the configuration to the other user. - <screen><prompt>#</prompt> <userinput><command>cp ~/.kde/share/config/krusaderrc /home/foo_user/.kde/share/config</command></userinput></screen> + <screen><prompt>#</prompt> <userinput><command>cp ~/.config/krusaderrc /home/foo_user/.config</command></userinput></screen> And when the other user is Root use: - <screen><prompt>#</prompt> <userinput><command>cp ~/.kde/share/config/krusaderrc /root/.kde/share/config</command></userinput></screen> + <screen><prompt>#</prompt> <userinput><command>cp ~/.config/krusaderrc /root/.config</command></userinput></screen> </para> <para></para> <!-- Empty line to make it more readable --> diff --git a/doc/installation.docbook b/doc/installation.docbook index 9122d2a..8ab51cf 100644 --- a/doc/installation.docbook +++ b/doc/installation.docbook @@ -439,7 +439,7 @@ <title>Installation on KDE4.x</title> --> <sect1 id="compilation"> - <title>Krusader installation instructions on KDE4.x</title> + <title>Krusader installation instructions</title> <note> <para>Please read the <ulink url="https://projects.kde.org/projects/extragear/utils/krusader/repository/revisions/master/entry/INSTALL";><filename>INSTALL</filename></ulink> @@ -450,7 +450,7 @@ <para>From version &krusader;-2.0.0 and higher is &kde;-4 only.</para> </note> -<para><filename>krusader_kde4.tar.gz</filename> is the supposed name of the krusader tarball (it will be probably a different one ;)</para> + <para><filename>krusader_<replaceable>version</replaceable>.tar.gz</filename> is the supposed name of the krusader tarball (it will be probably a different one ;)</para> <para>You can download the latest available &krusader;-2.x <link linkend="krusader_git">from Git</link>.</para> diff --git a/doc/konfigurator.docbook b/doc/konfigurator.docbook index 73ffe4a..eaa8fbd 100644 --- a/doc/konfigurator.docbook +++ b/doc/konfigurator.docbook @@ -935,7 +935,7 @@ &krusader; to use <trademark class="copyright">Total Commander</trademark>, <application>Midnight Commander</application>, foo-commander or your own custom color profile. The Color Schemes are stored in - <filename>$KDEDIR/share/apps/krusader</filename>, the + <filename>$KDEDIR/share/krusader</filename>, the <filename>foo.color</filename> is a binary file that holds the color scheme.</para> <tip> diff --git a/doc/man-krusader.1.docbook b/doc/man-krusader.1.docbook index 782a8d8..4d02355 100644 --- a/doc/man-krusader.1.docbook +++ b/doc/man-krusader.1.docbook @@ -132,13 +132,13 @@ panel</para> <refsect1><title>Files</title> <para>Configuration files:</para> -<para><filename>~/.kde/share/config/krusaderrc</filename></para> +<para><filename>~/.config/krusaderrc</filename></para> -<para><filename>~/.kde/share/apps/krusader/krbookmarks.xml</filename></para> +<para><filename>~/.local/share/krusader/krbookmarks.xml</filename></para> -<para><filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename> or</para> +<para><filename>$KDEDIR/share/kxmlgui5/krusader/krusaderui.rc</filename> or</para> -<para><filename>~/.kde/share/apps/krusader/krusaderui.rc</filename></para> +<para><filename>~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename></para> </refsect1> diff --git a/doc/menu-commands.docbook b/doc/menu-commands.docbook index 50ae179..6bb1644 100644 --- a/doc/menu-commands.docbook +++ b/doc/menu-commands.docbook @@ -1788,7 +1788,7 @@ &krusader; key-bindings can not be changed yet, as well as some features in foo-commander that we either do not have or need. The Key-bindings are stored in - <filename>$KDEDIR/share/apps/krusader</filename>, + <filename>$KDEDIR/share/krusader</filename>, <filename>foo.keymap.info</filename> contains a description, <filename>foo.keymap</filename> is an ini file that holds diff --git a/doc/useractions.docbook b/doc/useractions.docbook index 8bcbfb8..98c76f4 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> - ~/.kde/share/apps/krusader/useraction.xml</filename> (the file + ~/.local/share/krusader/useraction.xml</filename> (the file structure is documentated in doxygen headers of UserActionXML). Several <link linkend="useraction-xml">examples</link> are included in the @@ -42,7 +42,7 @@ exported by using ActionMan. The default UserActions are stored in <filename> - ~/.kde/share/apps/krusader/useraction-examples.xml</filename>. + /usr/share/krusader/useraction-examples.xml</filename>. UserActions can appear nearly everywhere where "normal" KActions can be placed. The actions can even be placed in the menu bar, but for that the <filename>krusaderui.rc</filename> file must be edited. A few _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
