Module Name: src
Committed By: wiz
Date: Tue Jan 29 09:30:11 UTC 2013
Modified Files:
src/usr.bin/patch: patch.1 pch.c
Log Message:
Add comma after i.e.
>From Bug Hunting.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/patch/patch.1
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/patch/pch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/patch/patch.1
diff -u src/usr.bin/patch/patch.1:1.15 src/usr.bin/patch/patch.1:1.16
--- src/usr.bin/patch/patch.1:1.15 Sun Apr 8 22:00:39 2012
+++ src/usr.bin/patch/patch.1 Tue Jan 29 09:30:11 2013
@@ -1,6 +1,6 @@
.\" $OpenBSD: patch.1,v 1.22 2008/06/06 20:44:00 jmc Exp $
.\" $DragonFly: src/usr.bin/patch/patch.1,v 1.10 2008/08/18 19:15:55 joerg Exp $
-.\" $NetBSD: patch.1,v 1.15 2012/04/08 22:00:39 wiz Exp $
+.\" $NetBSD: patch.1,v 1.16 2013/01/29 09:30:11 wiz Exp $
.\" Copyright 1986, Larry Wall
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -158,7 +158,7 @@ This option does not suppress commentary
for that.
.It Fl i Ar patchfile , Fl Fl input Ar patchfile
Causes the next argument to be interpreted as the input file name
-(i.e. a patchfile).
+(i.e., a patchfile).
This option may be specified multiple times.
.It Fl l , Fl Fl ignore-whitespace
Causes the pattern matching to be done loosely, in case the tabs and
@@ -240,7 +240,7 @@ If it can, you will be asked if you want
option set.
If it can't, the patch will continue to be applied normally.
(Note: this method cannot detect a reversed patch if it is a normal diff
-and if the first command is an append (i.e. it should have been a delete)
+and if the first command is an append (i.e., it should have been a delete)
since appends always succeed, due to the fact that a null context will match
anywhere.
Luckily, most patches add or change lines rather than delete them, so most
Index: src/usr.bin/patch/pch.c
diff -u src/usr.bin/patch/pch.c:1.24 src/usr.bin/patch/pch.c:1.25
--- src/usr.bin/patch/pch.c:1.24 Tue Sep 6 18:25:14 2011
+++ src/usr.bin/patch/pch.c Tue Jan 29 09:30:11 2013
@@ -1,7 +1,7 @@
/*
* $OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $
* $DragonFly: src/usr.bin/patch/pch.c,v 1.6 2008/08/10 23:35:40 joerg Exp $
- * $NetBSD: pch.c,v 1.24 2011/09/06 18:25:14 joerg Exp $
+ * $NetBSD: pch.c,v 1.25 2013/01/29 09:30:11 wiz Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: pch.c,v 1.24 2011/09/06 18:25:14 joerg Exp $");
+__RCSID("$NetBSD: pch.c,v 1.25 2013/01/29 09:30:11 wiz Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -456,7 +456,7 @@ malformed(void)
}
/*
- * True if the line has been discarded (i.e. it is a line saying
+ * True if the line has been discarded (i.e., it is a line saying
* "\ No newline at end of file".)
*/
static bool
