Merge branch 'master' into next

[git.git] / Documentation / git-cvsserver.txt

diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index fcc49b2..19c9c51 100644 (file)
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -59,15 +59,15 @@ Eclipse CVS Client Notes
 
 To get a checkout with the Eclipse CVS client:
 
-1. Create a new project from CVS checkout, giving it repository and module 
+1. Create a new project from CVS checkout, giving it repository and module
 2. Context Menu->Team->Share Project...
 3. Enter the repository and module information again and click Finish
-4. The Synchronize view appears. Untick  "launch commit wizard" to avoid 
-committing the .project file, and select HEAD as the tag to synchronize to. 
+4. The Synchronize view appears. Untick  "launch commit wizard" to avoid
+committing the .project file, and select HEAD as the tag to synchronize to.
 Update all incoming changes.
 
-Note that most versions of Eclipse ignore CVS_SERVER (which you can set in 
-the Preferences->Team->CVS->ExtConnection pane), so you may have to 
+Note that most versions of Eclipse ignore CVS_SERVER (which you can set in
+the Preferences->Team->CVS->ExtConnection pane), so you may have to
 rename, alias or symlink git-cvsserver to 'cvs' on the server.
 
 Clients known to work