|
Lines 54-60
Link Here
|
| 54 |
|
54 |
|
| 55 |
<row> |
55 |
<row> |
| 56 |
<entry><emphasis>Main CVSROOT</emphasis></entry> |
56 |
<entry><emphasis>Main CVSROOT</emphasis></entry> |
| 57 |
<entry>/home/ncvs</entry> |
57 |
<entry><filename>/home/ncvs</filename></entry> |
| 58 |
</row> |
58 |
</row> |
| 59 |
|
59 |
|
| 60 |
<row> |
60 |
<row> |
|
Lines 288-294
Link Here
|
| 288 |
|
288 |
|
| 289 |
<listitem> |
289 |
<listitem> |
| 290 |
<para>Check out the <filename>miscfs</filename> module as it was |
290 |
<para>Check out the <filename>miscfs</filename> module as it was |
| 291 |
one week agao.</para> |
291 |
one week ago.</para> |
| 292 |
|
292 |
|
| 293 |
<screen>&prompt.user; <userinput>cvs co -D'last week' miscfs</userinput></screen> |
293 |
<screen>&prompt.user; <userinput>cvs co -D'last week' miscfs</userinput></screen> |
| 294 |
|
294 |
|
|
Lines 463-469
Link Here
|
| 463 |
change, and you run <command>cvs update</command>. CVS notices |
463 |
change, and you run <command>cvs update</command>. CVS notices |
| 464 |
that you've made local changes, and tries to merge your |
464 |
that you've made local changes, and tries to merge your |
| 465 |
changes with the changes between the version you originally |
465 |
changes with the changes between the version you originally |
| 466 |
checked out and the one you updated to. If the changed are to |
466 |
checked out and the one you updated to. If the changes are to |
| 467 |
separate portions of the file, it'll almost always work fine |
467 |
separate portions of the file, it'll almost always work fine |
| 468 |
(though the result might not be syntactically or semantically |
468 |
(though the result might not be syntactically or semantically |
| 469 |
correct).</para> |
469 |
correct).</para> |
|
Lines 733-739
Link Here
|
| 733 |
properly (tabs often look wrong in diffs because of the extra |
733 |
properly (tabs often look wrong in diffs because of the extra |
| 734 |
character in front of each line).</para> |
734 |
character in front of each line).</para> |
| 735 |
|
735 |
|
| 736 |
<para><ulink url="http://people.FreeBSD.org/~eivind/cdiff">http://people.FreeBSD.org/~eivind/cdiff</ulink></para> |
736 |
<para><ulink url="http://people.FreeBSD.org/~eivind/cdiff">http://people.FreeBSD.org/~eivind/cdiff</ulink></para> |
| 737 |
|
737 |
|
| 738 |
<para>Simply use it instead of &man.more.1; or &man.less.1;:</para> |
738 |
<para>Simply use it instead of &man.more.1; or &man.less.1;:</para> |
| 739 |
|
739 |
|
|
Lines 783-789
Link Here
|
| 783 |
<listitem> |
783 |
<listitem> |
| 784 |
<para>Add yourself to the <quote>Developers</quote> section of the |
784 |
<para>Add yourself to the <quote>Developers</quote> section of the |
| 785 |
Handbook and remove yourself from the <quote>Additional |
785 |
Handbook and remove yourself from the <quote>Additional |
| 786 |
Contributors</quote> section.</para> |
786 |
Contributors</quote> section.</para> |
| 787 |
|
787 |
|
| 788 |
<para>This is a relatively easy task, but remains a good first test of |
788 |
<para>This is a relatively easy task, but remains a good first test of |
| 789 |
your CVS skills.</para> |
789 |
your CVS skills.</para> |
|
Lines 1513-1519
Link Here
|
| 1513 |
|
1513 |
|
| 1514 |
<listitem> |
1514 |
<listitem> |
| 1515 |
<para>Any disputed change must be backed out pending |
1515 |
<para>Any disputed change must be backed out pending |
| 1516 |
resolution of the dispute if requested by a maintainer |
1516 |
resolution of the dispute if requested by a maintainer. |
| 1517 |
Security related changes may |
1517 |
Security related changes may |
| 1518 |
override a maintainer's wishes at the Security Officer's |
1518 |
override a maintainer's wishes at the Security Officer's |
| 1519 |
discretion.</para> |
1519 |
discretion.</para> |