diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm
index 287eab4..c89e416 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm
@@ -157,7 +157,7 @@
     </p>
      
 <p class="Para">You can find more information on CVS at <a
- href="http://ximbiot.com/cvs/" class="URL" target="_blank">http://ximbiot.com/cvs/</a>.
+ href="https://directory.fsf.org/wiki/CVS" class="URL" target="_blank">https://directory.fsf.org/wiki/CVS</a>.
     </p>
    </div>
         
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm
index c69e025..3e110ce 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 
  
   <meta http-equiv="Content-Type"
@@ -32,7 +32,7 @@
  
 <div class="Topic"> 
 <p class="Para"> You can find more information on CVS at <a
- href="http://ximbiot.com/cvs/" class="URL" target="_blank">http://ximbiot.com/cvs/</a>.</p>
+ href="https://directory.fsf.org/wiki/CVS" class="URL" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</p>
  </div>
    
 <p><img border="0" src="../images/ngrelc.png" alt="Related concepts"
diff --git a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm
index c24a606..4254d02 100644
--- a/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm
+++ b/bundles/org.eclipse.platform.doc.user/gettingStarted/qs-60a_setup.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
 <HEAD>
 
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -15,7 +15,7 @@
 <P CLASS="Para">
 A repository is a persistent store that coordinates multi-user access to the
 resources being developed by a team. The Workbench comes with CVS support
-built-in. The CVS server is available at <a href="http://ximbiot.com/cvs/" target="_blank">http://ximbiot.com/cvs/</a>.&nbsp;</P>
+built-in. You can find more information on CVS at <a href="https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.&nbsp;</P>
 <P CLASS="Para"> Refer to this site for information on how to install and configure 
   a CVS repository including user access and passwords.</P>
 <p>In order to continue with this tutorial, access to a CVS repository is required.</p>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm
index fe4d6a8..96f351a 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
 <HEAD>
 
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -15,7 +15,7 @@
 <DIV CLASS="Topic"> 
   <P CLASS="Para"> The Workbench is shipped with a built in client for the Concurrent 
     Versions System (CVS). With this client you can access CVS repositories.</P>
-  <P CLASS="Para"> You can find more information on CVS at&nbsp; <a href="http://ximbiot.com/cvs/" target="_blank">http://ximbiot.com/cvs/</a>.</P>
+  <P CLASS="Para"> You can find more information on CVS at&nbsp; <a href="https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</P>
   <P CLASS="Para">You can also visit the <a href="http://wiki.eclipse.org/index.php/CVS_FAQ" target="_blank">Eclipse 
     CVS FAQ</a>.</P>
 </DIV>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm
index cdcf2e5..f6f0211 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
 <HEAD>
 
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -60,7 +60,7 @@
     differs from that of the global ignore facility in that it applies only to 
     files and&nbsp; directories in the same directory as the .cvsignore file itself.&nbsp; 
     A project may contain one .cvsignore file in each directory.&nbsp; For more 
-    information, please visit&nbsp; <a href="http://ximbiot.com/cvs/" target="_blank">http://ximbiot.com/cvs/</a>.</p>
+    information, please visit&nbsp; <a href="https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</p>
   <p CLASS="Head">Resources that have not been added to CVS control can be ignored 
     by selecting <b>Team &gt; Add to .cvsignore</b> from the pop-up menu of the 
     resource in one of the navigation views. This menu option is also available 
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-103.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-103.htm
index dc92fda..f28096d 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-103.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-103.htm
@@ -2,7 +2,7 @@
 <html lang="en">
 <HEAD>
 
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -48,7 +48,7 @@
         in that uncommitted modifications in the Workbench are not replaced but 
         instead are &quot;moved&quot; to the resources from the selected tag. 
         For more details on the specifics of this operation, see the CVS documentation 
-        at <a href="http://ximbiot.com/cvs/">http://ximbiot.com/cvs/</a> relating to the 
+        at <a href="https://directory.fsf.org/wiki/CVS">https://directory.fsf.org/wiki/CVS</a> relating to the 
         use of the <em>-r </em>option with <em>cvs update</em>.</LI>
     </UL>
   </li>