Skip to content

Commit 4b81f69

Browse files
carenasgitster
authored andcommitted
Documentation: cleanup git-cvsserver
Fix a few typos and alignment issues, and while at it update the example hashes to show most of the ones available in recent crypt(3). Signed-off-by: Carlo Marcelo Arenas Belón <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bffcb4d commit 4b81f69

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Documentation/git-cvsserver.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ looks like
9999

100100
------
101101

102-
Only anonymous access is provided by pserve by default. To commit you
102+
Only anonymous access is provided by pserver by default. To commit you
103103
will have to create pserver accounts, simply add a gitcvs.authdb
104104
setting in the config file of the repositories you want the cvsserver
105105
to allow writes to, for example:
@@ -114,8 +114,9 @@ The format of these files is username followed by the encrypted password,
114114
for example:
115115

116116
------
117-
myuser:$1Oyx5r9mdGZ2
118-
myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./
117+
myuser:sqkNi8zPf01HI
118+
myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/
119+
myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3
119120
------
120121
You can use the 'htpasswd' facility that comes with Apache to make these
121122
files, but only with the -d option (or -B if your system suports it).
@@ -126,7 +127,7 @@ pwhash in NetBSD) and paste it in the right location.
126127

127128
Then provide your password via the pserver method, for example:
128129
------
129-
cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>
130+
cvs -d:pserver:someuser:somepassword@server:/path/repo.git co <HEAD_name>
130131
------
131132
No special setup is needed for SSH access, other than having Git tools
132133
in the PATH. If you have clients that do not accept the CVS_SERVER
@@ -136,7 +137,7 @@ Note: Newer CVS versions (>= 1.12.11) also support specifying
136137
CVS_SERVER directly in CVSROOT like
137138

138139
------
139-
cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
140+
cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
140141
------
141142
This has the advantage that it will be saved in your 'CVS/Root' files and
142143
you don't need to worry about always setting the correct environment
@@ -184,8 +185,8 @@ allowing access over SSH.
184185
+
185186
--
186187
------
187-
export CVSROOT=:ext:user@server:/var/git/project.git
188-
export CVS_SERVER="git cvsserver"
188+
export CVSROOT=:ext:user@server:/var/git/project.git
189+
export CVS_SERVER="git cvsserver"
189190
------
190191
--
191192
4. For SSH clients that will make commits, make sure their server-side
@@ -201,7 +202,7 @@ allowing access over SSH.
201202
`project-master` directory:
202203
+
203204
------
204-
cvs co -d project-master master
205+
cvs co -d project-master master
205206
------
206207

207208
[[dbbackend]]

0 commit comments

Comments
 (0)