summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2007-05-22 16:47:23 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2007-05-22 16:47:23 +0000
commit077f74a35dade487c63ea467188e173cb71425d0 (patch)
tree6e75a4bba0717808344a823d9e91ced775ab96d6 /usr.bin/cvs
parent6da110cd77d1fb6b653fe65df46bc1adfd68831b (diff)
Note that the global -x option is kept for compatibility (for now) and has
no effect.
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/cvs.17
-rw-r--r--usr.bin/cvs/cvs.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1
index 29433b03b16..721ec137f18 100644
--- a/usr.bin/cvs/cvs.1
+++ b/usr.bin/cvs/cvs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cvs.1,v 1.109 2007/04/30 16:09:43 xsa Exp $
+.\" $OpenBSD: cvs.1,v 1.110 2007/05/22 16:47:22 xsa Exp $
.\"
.\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
.\" Copyright (c) 2004-2007 Xavier Santolaria <xsa@openbsd.org>
@@ -1769,6 +1769,11 @@ such as
.Xr rcs 1 ,
.Xr cvs 5 ,
.Xr cvsintro 7
+.Sh STANDARDS
+The flag
+.Op Fl x
+has no effect and is provided
+for compatibility only.
.Sh HISTORY
The OpenCVS project is a BSD-licensed rewrite of the original
Concurrent Versioning System written by Jean-Francois Brousseau.
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index a5f291d4adb..52ebdaf61f3 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.c,v 1.122 2007/05/09 07:04:57 xsa Exp $ */
+/* $OpenBSD: cvs.c,v 1.123 2007/05/22 16:47:22 xsa Exp $ */
/*
* Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -117,7 +117,7 @@ __dead void
usage(void)
{
(void)fprintf(stderr,
- "usage: %s [-flnQqRrtVvwx] [-d root] [-e editor] [-s var=val]\n"
+ "usage: %s [-flnQqRrtVvw] [-d root] [-e editor] [-s var=val]\n"
" [-T tmpdir] [-z level] command [...]\n", __progname);
exit(1);
}