svn commit: r219096 - in head: lib/libc/yp lib/libelf share/man/man7 sys/boot/i386/cdboot sys/boot/pc98/cdboot usr.bin/checknr

[Bruce Cran]

Author: brucec
Date: Mon Feb 28 10:03:48 2011
New Revision: 219096
URL: http://svn.freebsd.org/changeset/base/219096

Log:
  Revert some of r177626. "in in" is valid in certain sentences.
  
  PR:		121490
  MFC after:	3 days

Modified:
  head/lib/libc/yp/xdryp.c
  head/lib/libelf/libelf_convert.m4
  head/share/man/man7/security.7
  head/sys/boot/i386/cdboot/cdboot.s
  head/sys/boot/pc98/cdboot/cdboot.s
  head/usr.bin/checknr/checknr.c

Modified: head/lib/libc/yp/xdryp.c
==============================================================================
--- head/lib/libc/yp/xdryp.c	Mon Feb 28 09:11:46 2011	(r219095)
+++ head/lib/libc/yp/xdryp.c	Mon Feb 28 10:03:48 2011	(r219096)
@@ -42,7 +42,7 @@ extern void *ypresp_data;
  * I'm leaving the xdr_datum() function in purely for backwards
  * compatibility. yplib.c doesn't actually use it, but it's listed
  * in yp_prot.h as being available, so it's probably a good idea to
- * leave it in case somebody goes looking for it.
+ * leave it in in case somebody goes looking for it.
  */
 typedef struct {
 	char *dptr;

Modified: head/lib/libelf/libelf_convert.m4
==============================================================================
--- head/lib/libelf/libelf_convert.m4	Mon Feb 28 09:11:46 2011	(r219095)
+++ head/lib/libelf/libelf_convert.m4	Mon Feb 28 10:03:48 2011	(r219096)
@@ -136,7 +136,7 @@ __FBSDID("$FreeBSD$");
 
 /*
  * Read in various integral values.  The source pointer could be
- * unaligned.  Values are read in native byte order.  The source
+ * unaligned.  Values are read in in native byte order.  The source
  * pointer is incremented appropriately.
  */
 

Modified: head/share/man/man7/security.7
==============================================================================
--- head/share/man/man7/security.7	Mon Feb 28 09:11:46 2011	(r219095)
+++ head/share/man/man7/security.7	Mon Feb 28 10:03:48 2011	(r219096)
@@ -138,7 +138,7 @@ This gives you a convenient way to detec
 Making
 it impossible for an attacker to install a backdoor may actually be detrimental
 to your security because it will not close off the hole the attacker used to
-break in the first place.
+break in in the first place.
 .Pp
 Security remedies should always be implemented with a multi-layered
 .Dq onion peel

Modified: head/sys/boot/i386/cdboot/cdboot.s
==============================================================================
--- head/sys/boot/i386/cdboot/cdboot.s	Mon Feb 28 09:11:46 2011	(r219095)
+++ head/sys/boot/i386/cdboot/cdboot.s	Mon Feb 28 10:03:48 2011	(r219096)
@@ -174,7 +174,7 @@ lookup_path:	push %si			# Save file name
 lookup_found:					# Found a loader file
 #
 # Load the binary into the buffer.  Due to real mode addressing limitations
-# we have to read it in 64k chunks.
+# we have to read it in in 64k chunks.
 #
 		mov DIR_SIZE(%bx),%eax		# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors

Modified: head/sys/boot/pc98/cdboot/cdboot.s
==============================================================================
--- head/sys/boot/pc98/cdboot/cdboot.s	Mon Feb 28 09:11:46 2011	(r219095)
+++ head/sys/boot/pc98/cdboot/cdboot.s	Mon Feb 28 10:03:48 2011	(r219096)
@@ -415,7 +415,7 @@ lookup_path:	push %si			# Save file name
 lookup_found:					# Found a loader file
 #
 # Load the binary into the buffer.  Due to real mode addressing limitations
-# we have to read it in 64k chunks.
+# we have to read it in in 64k chunks.
 #
 		mov %es:DIR_SIZE(%bx),%eax	# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors

Modified: head/usr.bin/checknr/checknr.c
==============================================================================
--- head/usr.bin/checknr/checknr.c	Mon Feb 28 09:11:46 2011	(r219095)
+++ head/usr.bin/checknr/checknr.c	Mon Feb 28 10:03:48 2011	(r219096)
@@ -79,7 +79,7 @@ struct stkstr {
 	int opno;	/* number of opening bracket */
 	int pl;		/* '+', '-', ' ' for \s, 1 for \f, 0 for .ft */
 	int parm;	/* parm to size, font, etc */
-	int lno;	/* line number the thing came in */
+	int lno;	/* line number the thing came in in */
 } stk[MAXSTK];
 int stktop;