aboutsummaryrefslogtreecommitdiff
path: root/bin/cp
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>1999-05-08 10:22:15 +0000
committerKris Kennaway <kris@FreeBSD.org>1999-05-08 10:22:15 +0000
commit46be34b90213ebd9037cb2c24aec0009d7f2f5c1 (patch)
tree00d4f7b7c93cf85a8b324bbb69d0c039b6a3367f /bin/cp
parentc578efe575dc0b2020cf21aaae2c34b12a12a430 (diff)
downloadsrc-46be34b90213ebd9037cb2c24aec0009d7f2f5c1.tar.gz
src-46be34b90213ebd9037cb2c24aec0009d7f2f5c1.zip
Various spelling/formatting changes.
Submitted by: Philippe Charnier <charnier@xp11.frmug.org>
Notes
Notes: svn path=/head/; revision=46684
Diffstat (limited to 'bin/cp')
-rw-r--r--bin/cp/cp.19
-rw-r--r--bin/cp/cp.c4
-rw-r--r--bin/cp/utils.c4
3 files changed, 9 insertions, 8 deletions
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 000f2cab3676..b9d047e1175a 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
-.\" $Id: cp.1,v 1.10 1998/05/06 06:50:19 charnier Exp $
+.\" $Id: cp.1,v 1.11 1998/10/13 08:52:29 jkoshy Exp $
.\"
.Dd April 18, 1994
.Dt CP 1
@@ -197,9 +197,10 @@ options are ignored unless the
option is specified.
In addition, these options override each other and the
command's actions are determined by the last one specified.
-.Pp
-.Nm Cp
-exits 0 on success, >0 if an error occurred.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
.Sh COMPATIBILITY
Historic versions of the
.Nm
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index e3ddbfa80bc4..e873d4d74c1d 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -45,7 +45,7 @@ static char const copyright[] =
static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94";
#endif
static const char rcsid[] =
- "$Id: cp.c,v 1.17 1998/06/09 13:42:51 dt Exp $";
+ "$Id: cp.c,v 1.18 1999/04/25 21:13:32 imp Exp $";
#endif /* not lint */
/*
@@ -286,7 +286,7 @@ copy(argv, type, fts_options)
* is the case where the target exists.
*
* Also, check for "..". This is for correct path
- * concatentation for paths ending in "..", e.g.
+ * concatenation for paths ending in "..", e.g.
* cp -R .. /tmp
* Paths ending in ".." are changed to ".". This is
* tricky, but seems the easiest way to fix the problem.
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 9118efcc32f0..162a4464ce71 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#endif
static const char rcsid[] =
- "$Id: utils.c,v 1.21 1998/11/18 11:47:45 bde Exp $";
+ "$Id: utils.c,v 1.22 1999/04/25 21:13:32 imp Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -171,7 +171,7 @@ copy_file(entp, dne)
/*
* Don't remove the target even after an error. The target might
* not be a regular file, or its attributes might be important,
- * or its contents might be irreplacable. It would only be safe
+ * or its contents might be irreplaceable. It would only be safe
* to remove it if we created it and its length is 0.
*/