Drop ClearCase from Manual

diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml
index 03cda0e..925890b 100644 (file)
--- a/Docs/Users/Manual/Install.xml
+++ b/Docs/Users/Manual/Install.xml
@@ -264,22 +264,6 @@
           </varlistentry>\r
 \r
           <varlistentry>\r
-            <term>Integrate with Rational ClearCase<indexterm>\r
-                <primary>ClearCase integration</primary>\r
-\r
-                <secondary>configuring during installation</secondary>\r
-              </indexterm></term>\r
-\r
-            <listitem>\r
-              <para>Sets WinMerge to be the ClearCase diff application.</para>\r
-\r
-              <para>For more information about the three integrations in this\r
-              list and related WinMerge options, see <xref\r
-              linkend="VersionControl_vcs" />.</para>\r
-            </listitem>\r
-          </varlistentry>\r
-\r
-          <varlistentry>\r
             <term>Create a Desktop shortcut</term>\r
 \r
             <listitem>\r

diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml
index 2a5b572..7fce142 100644 (file)
--- a/Docs/Users/Manual/Intro_diffs.xml
+++ b/Docs/Users/Manual/Intro_diffs.xml
@@ -270,7 +270,7 @@ Believe it or not.</screen></para>
     contributor.</para>
 
     <para>Merging can be prompted (or even initiated) by version control systems
-    like Subversion and ClearCase. For example, your version control system
+    like Subversion and Git. For example, your version control system
     might prevent you from submitting changes to its repository because of merge
     conflicts. A conflict can occur if someone else checked in a different
     version of the same file while you were working on your version, and the

diff --git a/Docs/Users/Manual/Version_control.xml b/Docs/Users/Manual/Version_control.xml
index ed97803..ec82118 100644 (file)
--- a/Docs/Users/Manual/Version_control.xml
+++ b/Docs/Users/Manual/Version_control.xml
@@ -42,7 +42,7 @@
       <para>Similarly, many GUI tools (like version control clients and IDEs)
       that include built-in diff tools enable you to configure WinMerge as their
       default diff tool, instead. The next section describes how to use WinMerge
-      this way with TortoiseSVN, TortoiseCVS, and ClearCase. For other tools,
+      this way with TortoiseSVN and Visual Studio Team Foundation Server. For other tools,
       like Eclipse and Perforce, check their documentation or search the
       Internet for details and examples.</para>
     </tip>
@@ -65,8 +65,8 @@
         <primary>TortoiseSVN integration</primary>
       </indexterm>
 
-      <para>When you compare files in TortoiseSVN, TortoiseCVS, or Rational
-      ClearCase, you can have the VCS launch WinMerge instead of its native diff
+      <para>When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGIT,
+      you can have the VCS launch WinMerge instead of its native diff
       utility. You can configure some of these integrations during <link
       linkend="Installing_usinginstaller">WinMerge installation</link>.</para>
 
@@ -74,7 +74,7 @@
         <title>Tortoise SVN integration</title>
 
         <para>Here is a sample diff operation in TortoiseSVN that uses the
-        WinMerge integration. The integrations with TortoiseCVS and ClearCase
+        WinMerge integration. The integrations with TortoiseCVS and TortoiseGIT
         are similar.</para>
 
         <orderedlist>
@@ -209,38 +209,6 @@
                
                <para>Every time you tell TFS to compare two files, it will now use WinMerge.</para>
       </example>
-         
-      <section id="VersionControl_cc">
-        <title>About the ClearCase integration</title>
-
-        <para>When you choose the integration option for Rational ClearCase
-        during WinMerge installation, the installer:</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Creates a backup copy of the ClearCase
-            <filename>map</filename> file, <filename>map.bak</filename>, in the
-            <filename><replaceable>ccase-home-dir</replaceable>\lib\mgrs</filename>
-            directory. The <filename>map</filename> file is a user-configurable
-            file that associates ClearCase methods with the programs that carry
-            them out.</para>
-          </listitem>
-
-          <listitem>
-            <para>Modifies the <guilabel>text_file_delta</guilabel> field In the
-            <filename>map</filename> file, specifying WinMerge instead of the
-            default <filename>cleardiff.exe</filename> when running the
-            <command>cleartool diff</command> command.</para>
-          </listitem>
-        </orderedlist>
-
-        <para>If you later want to disable WinMerge interactions with ClearCase,
-        replace the ClearCase <filename>map</filename> file created by the
-        WinMerge installer with the <filename>map.bak</filename> backup file.
-        Alternatively, edit the ClearCase <filename>map</filename> file to run
-        <filename>cleardiff.exe</filename> for the <command>cleartool
-        diff</command> command.</para>
-      </section>
     </section>
   </section>
 </article>

diff --git a/Docs/Users/Manual/tour/tour_sel_targets.xml b/Docs/Users/Manual/tour/tour_sel_targets.xml
index 829f069..a2a04b1 100644 (file)
--- a/Docs/Users/Manual/tour/tour_sel_targets.xml
+++ b/Docs/Users/Manual/tour/tour_sel_targets.xml
@@ -166,16 +166,9 @@
   <section>
     <title>Version control systems</title>
 
-    <para>If you run TortoiseSVN, TortoiseCVS, or Rational ClearCase, you can
+    <para>If you run TortoiseCVS, TortoiseSVN, or TortoiseGIT, you can
     configure your version control system to open WinMerge directly. That is, if
     you compare files using one of these VCS tools, WinMerge opens instead of
     the tool's native diff utility.</para>
-
-    <note>
-      <para>Another handy VCS integration automatically launches your version
-      control system's checkout dialog whenever you change a managed file in the
-      WinMerge window. This integration works with version control systems that
-      lock files, specifically ClearCase and Visual Source Safe.</para>
-    </note>
   </section>
 </article>
\ No newline at end of file