summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-02-26 21:48:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-02-26 21:48:31 +0000
commit4b304867571f3eba9040f46e9c023c5576768186 (patch)
tree5a324f6cbcfd2f68c438e36753778a3812f15e63
parent4ca942519f2c86983bf190c0227e8f6c6c3313e4 (diff)
kill some first-person wording; help from jmc
-rw-r--r--usr.bin/cvs/cvs.113
-rw-r--r--usr.bin/cvs/cvsintro.76
2 files changed, 10 insertions, 9 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1
index bcc3292e1b9..bfa6b6abe8d 100644
--- a/usr.bin/cvs/cvs.1
+++ b/usr.bin/cvs/cvs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cvs.1,v 1.120 2008/02/11 07:58:28 jmc Exp $
+.\" $OpenBSD: cvs.1,v 1.121 2008/02/26 21:48:30 deraadt Exp $
.\"
.\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
.\" Copyright (c) 2004-2008 Xavier Santolaria <xsa@openbsd.org>
@@ -24,7 +24,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: February 11 2008 $
+.Dd $Mdocdate: February 26 2008 $
.Dt CVS 1
.Os
.Sh NAME
@@ -52,7 +52,7 @@ a CVS source repository.
CVS is used to maintain version information on files that are kept in a
repository.
Although it is more commonly used to track changes in source code, there
-are no real limitations to the type of files that you can store in a
+are no real limitations to the type of files that can be stored in a
repository.
For a general introduction to CVS, see
.Xr cvsintro 7 .
@@ -593,7 +593,8 @@ The
.Ic edit
command is used to make a file that is being watched
(and therefore read-only)
-readable and writable and to inform others that you are planning to edit it.
+readable and writable and to inform others that it is in the
+process of being changed.
Notifications terminate when the
.Ic commit
command is issued.
@@ -922,7 +923,7 @@ specifies the location of the sources to be imported;
.Ar vendortag
is a tag for the entire branch;
.Ar releasetag
-is used to identify the files you created with
+is used to identify the files created with
.Ic cvs import .
.Bd -literal -offset indent
usage: cvs import [-d] [-b branch] [-I ign] [-k mode] [-m msg]
@@ -1581,7 +1582,7 @@ If the file has been modified since the
.Ic edit
command has been issued,
.Nm
-will ask if you want to go back to the previous version, and lose the
+will ask if it should go back to the previous version, and lose the
modifications done on the file, or stay in edition mode on it.
.Bd -literal -offset indent
usage: cvs unedit [-lR] [file ...]
diff --git a/usr.bin/cvs/cvsintro.7 b/usr.bin/cvs/cvsintro.7
index 49ed3cfd4ec..be157dbe0a9 100644
--- a/usr.bin/cvs/cvsintro.7
+++ b/usr.bin/cvs/cvsintro.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cvsintro.7,v 1.13 2007/05/31 19:20:09 jmc Exp $
+.\" $OpenBSD: cvsintro.7,v 1.14 2008/02/26 21:48:30 deraadt Exp $
.\"
.\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: February 26 2008 $
.Dt CVSINTRO 7
.Os
.Sh NAME
@@ -72,7 +72,7 @@ Where the source module(s) will be kept on the local machine.
In our example, the
.Ox
project, there are a large number of servers to choose from.
-It's generally better to use a server geographically closer to you
+It's generally better to use a server that is geographically closer
since this tends to be faster and less of a strain for the master server.
Utilities such as
.Xr ping 8