Git commit 3d56552d5d2eea19e2181ea5daef327db0bfc16e by Yuri Chornoivan. Committed on 26/02/2013 at 18:33. Pushed by yurchor into branch 'master'.
Document the Synchronizer removal from the default installation M +5 -0 doc-extras/ChangeLog M +2 -2 doc/advanced-functions.docbook M +1 -1 doc/basic-functions.docbook M +1 -1 doc/bookmarks.docbook M +1 -1 doc/compare.docbook M +4 -4 doc/features.docbook M +6 -12 doc/keyboard-commands.docbook M +2 -2 doc/konfigurator.docbook M +1 -1 doc/menu-commands.docbook M +1 -1 doc/profiles.docbook M +6 -1 doc/synchronizer.docbook M +1 -1 doc/useraction-xml.docbook M +1 -1 doc/vfs.docbook http://commits.kde.org/krusader/3d56552d5d2eea19e2181ea5daef327db0bfc16e diff --git a/doc-extras/ChangeLog b/doc-extras/ChangeLog index 89c9d34..1d088a7 100644 --- a/doc-extras/ChangeLog +++ b/doc-extras/ChangeLog @@ -1,6 +1,11 @@ The Krusader Handbook ChangeLog ------------------------------- +2.4.0 "" +========================== + +Add information on removal of Synchronizer and on how to reenable it. + 2.4.0-beta3 "Single Step" ========================== Date: 2012-10-20 diff --git a/doc/advanced-functions.docbook b/doc/advanced-functions.docbook index 8b5ccb7..34a8bdb 100644 --- a/doc/advanced-functions.docbook +++ b/doc/advanced-functions.docbook @@ -49,7 +49,7 @@ <para> <link linkend="gloss-acl">ACL permissions</link> are fully supported when using properties, preserve attributes and the - synchronizer. To view/modify the ACL permissions, select a file + synchronizer (disabled at the compilation time by default). To view/modify the ACL permissions, select a file and use the <link linkend="context-menu">Context Menu</link>: <menuchoice> <guimenu>Properties</guimenu> @@ -57,6 +57,6 @@ <guimenuitem>Advanced permissions</guimenuitem> </menuchoice>. At Copy/Move, the ACL - permissions are also copied. The synchronizer keeps the ACL + permissions are also copied. The synchronizer (disabled at the compilation time by default) keeps the ACL permissions as well.</para> </sect1></chapter> diff --git a/doc/basic-functions.docbook b/doc/basic-functions.docbook index 1bece62..25ad83b 100644 --- a/doc/basic-functions.docbook +++ b/doc/basic-functions.docbook @@ -295,7 +295,7 @@ format...)</para> </listitem> <listitem> - <para><link linkend="synchronizer">Synchronize Directories</link> File List</para> + <para><link linkend="synchronizer">Synchronize Directories</link> File List (disabled at the compilation time by default)</para> </listitem> <listitem> <para><link linkend="useractions">UserActions</link></para> diff --git a/doc/bookmarks.docbook b/doc/bookmarks.docbook index 757f7cc..495ed21 100644 --- a/doc/bookmarks.docbook +++ b/doc/bookmarks.docbook @@ -188,7 +188,7 @@ container for &URL;s from different file systems. It is used for ⪚ the <guilabel>Feed to Listbox</guilabel> feature of the search - module and the synchronizer. The location toolbar will + module and the synchronizer (disabled at the compilation time by default). The location toolbar will display ⪚ <filename>virt:/Search results 1</filename> or <filename>virt:/Synchronise results 1</filename>.</para> diff --git a/doc/compare.docbook b/doc/compare.docbook index ebe94df..c533eab 100644 --- a/doc/compare.docbook +++ b/doc/compare.docbook @@ -4,7 +4,7 @@ <guimenuitem>Compare by Content</guimenuitem>, <guimenuitem>Compare Directories</guimenuitem> and the <link linkend="synchronizer">Synchronizer</link> compare - function.</para> + function (the latter is disabled at the compilation time by default).</para> <sect2 id="compare-content"> <title>Compare by Content</title> <indexterm> diff --git a/doc/features.docbook b/doc/features.docbook index 9096f50..5cc1ecb 100644 --- a/doc/features.docbook +++ b/doc/features.docbook @@ -50,7 +50,7 @@ <para><link linkend="vfs">Virtual file systems (VFS)</link> ⪚ for <link linkend="remote-connections">Remote Connections</link>, <link linkend="archives">archives</link>, search results, - synchronizer.</para> + synchronizer (disabled at the compilation time by default).</para> </listitem> <listitem> <para>Powerful internal @@ -82,7 +82,7 @@ <para><link linkend="locate">Locate</link> &GUI; frontend</para> </listitem> <listitem> - <para><link linkend="synchronizer">Synchronize Directories</link></para> + <para><link linkend="synchronizer">Synchronize Directories</link> (disabled at the compilation time by default)</para> </listitem> <listitem> <para> @@ -165,7 +165,7 @@ <listitem> <para> <link linkend="krusearcher">Selection - filters</link> used in ⪚ Synchronizer and + filters</link> used in ⪚ Synchronizer (disabled at the compilation time by default) and KruSearcher.</para> </listitem> <listitem> @@ -355,7 +355,7 @@ </listitem> <listitem> <para><link linkend="synchronizer">Synchronizer</link> enhancements and parallel threads for slow - &FTP; servers.</para> + &FTP; servers (now disabled at the compilation time by default).</para> </listitem> <listitem> <para> diff --git a/doc/keyboard-commands.docbook b/doc/keyboard-commands.docbook index 55549e6..c8d6bc2 100644 --- a/doc/keyboard-commands.docbook +++ b/doc/keyboard-commands.docbook @@ -644,17 +644,6 @@ </para> </entry> </row> - <row> - <entry> - <para> - <keycombo action="simul">&Alt;&Shift; - <keycap>Y</keycap></keycombo> - </para> - </entry> - <entry> - <para><link linkend="synchronizer">Synchronize Directory changes</link>.</para> - </entry> - </row> </tbody> </tgroup> </informaltable> @@ -893,7 +882,7 @@ </para> </entry> <entry> - <para><link linkend="synchronizer">Synchronize Directories</link>.</para> + <para><link linkend="synchronizer">Synchronize Directories</link> (this feature is disabled at the compilation time by default).</para> </entry> </row> <row> @@ -1778,6 +1767,11 @@ <para id="synchronizer_keybindings"> <emphasis role="bold">Synchronizer</emphasis> </para> + <note> + <para> + This feature is disabled at the compilation time by default. See <link linkend="synchronizer">the corresponding chapter of this manual</link> for the instructions on how to enable it. + </para> + </note> <para><link linkend="synchronizer">Synchronizer</link> keybindings.</para> <informaltable> <tgroup cols="2"> diff --git a/doc/konfigurator.docbook b/doc/konfigurator.docbook index c0ad75b..c980f18 100644 --- a/doc/konfigurator.docbook +++ b/doc/konfigurator.docbook @@ -731,7 +731,7 @@ <title>Colors</title> <para>This page configures the colors of the <link linkend="list_panel">List Panel</link> and the - <link linkend="synchronizer">Synchronizer</link>. The + <link linkend="synchronizer">Synchronizer</link> (disabled at the compilation time by default). The <guilabel>KDE default colors</guilabel> is the default color configuration.</para> @@ -859,7 +859,7 @@ </listitem> </itemizedlist> <para>The following items of the - <link linkend="synchronizer">Synchronizer</link> can be configured:</para> + <link linkend="synchronizer">Synchronizer</link> (disabled at the compilation time by default) can be configured:</para> <itemizedlist> <listitem> <para> diff --git a/doc/menu-commands.docbook b/doc/menu-commands.docbook index 1185d8f..50ae179 100644 --- a/doc/menu-commands.docbook +++ b/doc/menu-commands.docbook @@ -1221,7 +1221,7 @@ left and right panels and shows the differences between them. After the compare function, you can move files/directories so that they can be - synchronized.</para> + synchronized. This feature is disabled at the compilation time by default. See the link above for the instructions on how to enable it.</para> </listitem> </varlistentry> <varlistentry> diff --git a/doc/profiles.docbook b/doc/profiles.docbook index 3304ada..7b5d1a0 100644 --- a/doc/profiles.docbook +++ b/doc/profiles.docbook @@ -52,6 +52,6 @@ <para>If you regularly perform the same synchronize operation, you can save the synchronize settings in a <link linkend="synchronizer">Synchronizer - Profile</link>.</para> + Profile</link>. The Synchronizer is disabled at the compilation time by default.</para> </sect2> </sect1> diff --git a/doc/synchronizer.docbook b/doc/synchronizer.docbook index 02cfc8f..eaf97f2 100644 --- a/doc/synchronizer.docbook +++ b/doc/synchronizer.docbook @@ -5,7 +5,12 @@ </indexterm> <sect2 id="synchronizer_introduction"> - <title>Introduction</title> + <title>Introduction</title> + <important> + <para> + This feature is disabled at the compilation time by default. Use <userinput>-DENABLE_SYNCHRONIZER=true</userinput> compilation switch to <application>cmake</application> to enable it, then <link linkend="kde4_lin_install">recompile and install &krusader;</link>. + </para> + </important> <para>This function compares two directories with all subdirectories and shows the differences between them. After selecting some options and the <guilabel>Compare</guilabel> function you can synchronize the diff --git a/doc/useraction-xml.docbook b/doc/useraction-xml.docbook index 16cfdc5..71b0bfc 100644 --- a/doc/useraction-xml.docbook +++ b/doc/useraction-xml.docbook @@ -203,7 +203,7 @@ </KrusaderUserActions></programlisting> </para></listitem> - <listitem><para>Opens <link linkend="synchronizer">Synchronizer</link>: + <listitem><para>Opens <link linkend="synchronizer">Synchronizer (disabled at the compilation time by default)</link>: <programlisting> <!DOCTYPE KrusaderUserActions> <KrusaderUserActions> diff --git a/doc/vfs.docbook b/doc/vfs.docbook index de02fc1..3998de4 100644 --- a/doc/vfs.docbook +++ b/doc/vfs.docbook @@ -37,7 +37,7 @@ <listitem> <para> <link linkend="synchronizer">Synchronizer VFS</link>: places - the synchronizer results in VFS.</para> + the synchronizer results in VFS (disabled at the compilation time by default).</para> </listitem> </itemizedlist> <para>Actions you perform on the files in VFS are
