Update of /cvsroot/win32forth/win32forth/Help/html
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5144
Modified Files:
w32f-CVS.htm
Log Message:
gah: Minor corrections
Index: w32f-CVS.htm
===================================================================
RCS file: /cvsroot/win32forth/win32forth/Help/html/w32f-CVS.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** w32f-CVS.htm 28 May 2008 04:01:08 -0000 1.1
--- w32f-CVS.htm 28 May 2008 21:25:35 -0000 1.2
***************
*** 9,13 ****
<h1>CVS (Concurrent Versions System) use</span></h1>
! <p>This document is of interest only for the Win32Forth developpers.</p>
--- 9,13 ----
<h1>CVS (Concurrent Versions System) use</span></h1>
! <p>This document is of interest only for the Win32Forth developers.</p>
***************
*** 30,34 ****
files.</p>
! <p>The Concurrent Versionning System used is named "Tortoise".</p>
--- 30,35 ----
files.</p>
! <p>The preferred Concurrent Versions System Client used is named "TortoiseCVS" (though
! there are alternatives available).</p>
***************
*** 52,56 ****
<p>Once initial installation has been done, subsequent connexions are much simpler :</p>
<ul>
! <li>Start your internet connexion</li>
<li>Start pageant.exe. If no key is there, then give it your private key (not
your public one !)</li>
--- 53,57 ----
<p>Once initial installation has been done, subsequent connexions are much simpler :</p>
<ul>
! <li>Start your internet connexion (if not a permanent connexion).</li>
<li>Start pageant.exe. If no key is there, then give it your private key (not
your public one !)</li>
***************
*** 108,112 ****
parts to be added. Run some old demos too, to check if everything is still ok.</p>
! <p>Before committing, Tortoise will ask you for a comment. Think to this comment
before committing so that you can make it meaningful.</p>
--- 109,113 ----
parts to be added. Run some old demos too, to check if everything is still ok.</p>
! <p>Before committing, Tortoise will ask you for a comment. Think about this comment
before committing so that you can make it meaningful.</p>
***************
*** 118,125 ****
<h4>Conflicts</h4>
! <p>A conflict occurs when two different people committed the same line in the same file.
Conflicts are usually rare but when they happen, the developpers themselves must resolve
! the conflict. Some tools are proposed to compare files but the simplest way to
! resolve conflict is probably to post messages on the Win32Forth Yahoo Group.</p>
--- 119,128 ----
<h4>Conflicts</h4>
! <p>A conflict occurs when two or more different people have committed the same line,
! or contiguous lines in the same file.
Conflicts are usually rare but when they happen, the developpers themselves must resolve
! the conflict. Some tools are proposed to compare and merge files but the simplest way to
! resolve conflict is probably to post messages on the Win32Forth Yahoo Group (unless the
! conflict is obvious).</p>
|
