diff --git a/doc/src/vcs/creator-vcs-cvs.qdoc b/doc/src/vcs/creator-vcs-cvs.qdoc
index d8bb0e27e62..047caf9b750 100644
--- a/doc/src/vcs/creator-vcs-cvs.qdoc
+++ b/doc/src/vcs/creator-vcs-cvs.qdoc
@@ -39,9 +39,24 @@
 
     CVS is an open source version control system.
 
-    In addition to the standard version control system functions, you can
-    select \uicontrol Tools > \uicontrol CVS > \uicontrol Edit to open a file
-    for editing.
+    In addition to the standard version control system functions described in
+    \l {Using Common Functions}, you can select \uicontrol Tools >
+    \uicontrol CVS > \uicontrol Edit to open a file for editing.
 
     To discard the changes that you made in a file, select \uicontrol Unedit.
+
+    To specify the CVS root directory, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol {Version Control} > \uicontrol CVS, and then
+    specify the path to the directory in the \uicontrol {CVS root} field.
+
+    You can specify settings for viewing diff output in the
+    \uicontrol {Diff options} field.
+
+    By default, you are prompted to confirm that you want to submit changes.
+    To suppress the prompt, deselect the \uicontrol {Prompt on submit} check
+    box.
+
+    By default, all files that belong to the commit are annotated. To disable
+    this feature, deselect the \uicontrol {Describe all files matching commit
+    id} check box.
 */
diff --git a/doc/src/vcs/creator-vcs.qdoc b/doc/src/vcs/creator-vcs.qdoc
index 0e2a02e4ff2..a8d8d7f6f95 100644
--- a/doc/src/vcs/creator-vcs.qdoc
+++ b/doc/src/vcs/creator-vcs.qdoc
@@ -53,7 +53,7 @@
             \li
         \row
             \li \l{Using CVS}{CVS}
-            \li \l{http://www.cvshome.org}
+            \li \l{http://www.nongnu.org/cvs/}
             \li
         \row
             \li \l{Using Git}{Git}