Revision: 52549
http://brlcad.svn.sourceforge.net/brlcad/?rev=52549&view=rev
Author: carlmoore
Date: 2012-09-26 14:43:06 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
fix spelling of 'committed'
Modified Paths:
--------------
brlcad/trunk/doc/cvs.txt
Modified: brlcad/trunk/doc/cvs.txt
===================================================================
--- brlcad/trunk/doc/cvs.txt 2012-09-26 14:37:19 UTC (rev 52548)
+++ brlcad/trunk/doc/cvs.txt 2012-09-26 14:43:06 UTC (rev 52549)
@@ -546,14 +546,14 @@
Regardless if the branch is a maintenance branch or the STABLE
branch, the fundamental "action" in performing a merge is called a
- CVS join. You can join code commited to one branch revision into
+ CVS join. You can join code committed to one branch revision into
another branch revision by passing the "-j" option to the cvs
update command. It's important to note that joins occur from code
that is already committed.
Once the code is joined, it may be committed to CVS. If you have
- changes on a branch that have not yet been commited, they should
- first be commited before attempting the join.
+ changes on a branch that have not yet been committed, they should
+ first be committed before attempting the join.
MERGING A BRANCH INTO HEAD:
@@ -583,7 +583,7 @@
If there are any conflicts, they would of course need to be
manually resolved. Once any conflicts are resolved and the
sources are tested for functionality, the changes could then be
- commited to HEAD. Be careful to notice any file additions or
+ committed to HEAD. Be careful to notice any file additions or
deletions as CVS, generally speaking, will not manage those for
you until they are committed.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
