Merge branch 'maint'

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

diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index cd0685ea67deaff81bcd997ff6ea4ae623c7a027..3310ae25ff75c302e6b9088a0807aee340ad69c7 100644 (file)
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -41,10 +41,13 @@ Don't allow recursing into subdirectories
 Don't check for `gitcvs.enabled` in config. You also have to specify a list
 of allowed directories (see below) if you want to use this option.
 
 Don't check for `gitcvs.enabled` in config. You also have to specify a list
 of allowed directories (see below) if you want to use this option.
 

---version, -V::
+-V::
+--version::

 Print version information and exit
 
 Print version information and exit
 

---help, -h, -H::
+-h::
+-H::
+--help::

 Print usage information and exit
 
 <directory>::
 Print usage information and exit
 
 <directory>::


@@ -302,7 +305,7 @@ Legacy monitoring operations are not supported (edit, watch and related).
 Exports and tagging (tags and branches) are not supported at this stage.
 
 CRLF Line Ending Conversions
 Exports and tagging (tags and branches) are not supported at this stage.
 
 CRLF Line Ending Conversions

-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 
 By default the server leaves the '-k' mode blank for all files,
 which causes the cvs client to treat them as a text files, subject
 
 By default the server leaves the '-k' mode blank for all files,
 which causes the cvs client to treat them as a text files, subject


@@ -352,4 +355,4 @@ Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@
 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite