Bug 121490

Summary: [patch] Multiple typos ("in in") in /usr/src files
Product: Documentation Reporter: Anatoly Borodin <anatoly.borodin>
Component: Books & ArticlesAssignee: Bruce Cran <brucec>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Anatoly Borodin 2008-03-08 09:40:01 UTC
Many files in /usr/src, both source code and manuals, contain "in in" typo. English is not my native language, so I attach a patch file with proposed fixes for review and implementation, because some of fixes are obvious and some are not.

Fix: Patch attached with submission follows:
Comment 1 Christian Brueffer freebsd_committer freebsd_triage 2008-03-21 21:07:48 UTC
Responsible Changed
From-To: freebsd-doc->brueffer

Hi Anatoly, 

many of these occurences (the ones in contrib/ files) are relative to 
3rd party vendor sources.  Please bring this up with the respetive 
projects, so the fixes will automatically be imported with the next 
update. 
I will fix the ones related to our own sources.  Thanks!
Comment 2 dfilter service freebsd_committer freebsd_triage 2008-03-26 07:32:15 UTC
brueffer    2008-03-26 07:32:08 UTC

  FreeBSD src repository

  Modified files:
    lib/libc/yp          xdryp.c 
    lib/libc_r/uthread   uthread_sig.c 
    lib/libelf           libelf_convert.m4 
    lib/libkse/thread    thr_sig.c 
    libexec/talkd        announce.c 
    share/man/man7       security.7 
    sys/boot/i386/cdboot cdboot.s 
    sys/boot/pc98/cdboot cdboot.s 
    sys/dev/ti           if_ti.c 
    sys/i386/isa         vesa.c 
    usr.bin/checknr      checknr.c 
    usr.bin/xlint/lint1  lint1.h 
  Log:
  Fix some "in in" typos in comments.
  
  PR:             121490
  Submitted by:   Anatoly Borodin <anatoly.borodin@gmail.com>
  Approved by:    rwatson (mentor), jkoshy
  MFC after:      3 days
  
  Revision  Changes    Path
  1.15      +1 -1      src/lib/libc/yp/xdryp.c
  1.50      +1 -1      src/lib/libc_r/uthread/uthread_sig.c
  1.4       +1 -1      src/lib/libelf/libelf_convert.m4
  1.89      +1 -1      src/lib/libkse/thread/thr_sig.c
  1.17      +1 -1      src/libexec/talkd/announce.c
  1.49      +1 -1      src/share/man/man7/security.7
  1.19      +1 -1      src/sys/boot/i386/cdboot/cdboot.s
  1.4       +1 -1      src/sys/boot/pc98/cdboot/cdboot.s
  1.132     +1 -1      src/sys/dev/ti/if_ti.c
  1.54      +1 -1      src/sys/i386/isa/vesa.c
  1.10      +1 -1      src/usr.bin/checknr/checknr.c
  1.3       +1 -1      src/usr.bin/xlint/lint1/lint1.h
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 3 Christian Brueffer freebsd_committer freebsd_triage 2008-03-26 07:34:05 UTC
State Changed
From-To: open->closed
Comment 4 Christian Brueffer freebsd_committer freebsd_triage 2008-03-26 07:34:33 UTC
State Changed
From-To: closed->patched

Bah, mistyped the previous change.  Committed to CURRENT, 
MFC pending.
Comment 5 Rebecca Cran freebsd_committer freebsd_triage 2011-02-28 08:41:04 UTC
We need to be really careful with these sorts of automated changes: this was a 
regression in several places. For example:

 to your security because it will not close off the hole the attacker used to
-break in in the first place.
+break in the first place.

Likewise with:

-        snuck back in in the gcc2 merge.
+        snuck back in the gcc2 merge.

-# we have to read it in in 64k chunks.
+# we have to read it in 64k chunks

-- 
Bruce Cran
Comment 6 dfilter service freebsd_committer freebsd_triage 2011-03-05 03:46:36 UTC
Author: brucec
Date: Sat Mar  5 03:46:24 2011
New Revision: 219291
URL: http://svn.freebsd.org/changeset/base/219291

Log:
  MFC r219096, r219126:
  
  r177626 broke some sentences. Reword them to avoid the duplicate "in".
  
  PR:	121490

Modified:
  stable/8/share/man/man7/security.7
  stable/8/usr.bin/checknr/checknr.c
Directory Properties:
  stable/8/share/man/man7/   (props changed)
  stable/8/usr.bin/checknr/   (props changed)

Modified: stable/8/share/man/man7/security.7
==============================================================================
--- stable/8/share/man/man7/security.7	Sat Mar  5 03:42:03 2011	(r219290)
+++ stable/8/share/man/man7/security.7	Sat Mar  5 03:46:24 2011	(r219291)
@@ -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 originally.
 .Pp
 Security remedies should always be implemented with a multi-layered
 .Dq onion peel

Modified: stable/8/usr.bin/checknr/checknr.c
==============================================================================
--- stable/8/usr.bin/checknr/checknr.c	Sat Mar  5 03:42:03 2011	(r219290)
+++ stable/8/usr.bin/checknr/checknr.c	Sat Mar  5 03:46:24 2011	(r219291)
@@ -83,7 +83,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 */
 } stk[MAXSTK];
 int stktop;
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 7 dfilter service freebsd_committer freebsd_triage 2011-03-05 04:11:16 UTC
Author: brucec
Date: Sat Mar  5 04:11:06 2011
New Revision: 219296
URL: http://svn.freebsd.org/changeset/base/219296

Log:
  MFC r177626, r219096, r219126:
  
  Fix some "in in" typos in comments.
  
  PR:		121490
  Submitted by:	Anatoly Borodin <anatoly.borodin at gmail.com>

Modified:
  stable/7/lib/libc/yp/xdryp.c
  stable/7/lib/libkse/thread/thr_sig.c
  stable/7/libexec/talkd/announce.c
  stable/7/share/man/man7/security.7
  stable/7/sys/boot/i386/cdboot/cdboot.s
  stable/7/sys/boot/pc98/cdboot/cdboot.s
  stable/7/sys/dev/ti/if_ti.c
  stable/7/sys/i386/isa/vesa.c
  stable/7/usr.bin/checknr/checknr.c
  stable/7/usr.bin/xlint/lint1/lint1.h
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)
  stable/7/lib/libkse/   (props changed)
  stable/7/libexec/talkd/   (props changed)
  stable/7/share/man/man7/   (props changed)
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/usr.bin/checknr/   (props changed)
  stable/7/usr.bin/xlint/   (props changed)

Modified: stable/7/lib/libc/yp/xdryp.c
==============================================================================
--- stable/7/lib/libc/yp/xdryp.c	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/lib/libc/yp/xdryp.c	Sat Mar  5 04:11:06 2011	(r219296)
@@ -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 in case somebody goes looking for it.
+ * leave it in case somebody goes looking for it.
  */
 typedef struct {
 	char *dptr;

Modified: stable/7/lib/libkse/thread/thr_sig.c
==============================================================================
--- stable/7/lib/libkse/thread/thr_sig.c	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/lib/libkse/thread/thr_sig.c	Sat Mar  5 04:11:06 2011	(r219296)
@@ -663,7 +663,7 @@ thr_sig_find(struct kse *curkse, int sig
 	 * Enter a loop to look for threads that have the signal
 	 * unmasked.  POSIX specifies that a thread in a sigwait
 	 * will get the signal over any other threads.  Second
-	 * preference will be threads in in a sigsuspend.  Third
+	 * preference will be threads in a sigsuspend.  Third
 	 * preference will be the current thread.  If none of the
 	 * above, then the signal is delivered to the first thread
 	 * that is found.  Note that if a custom handler is not

Modified: stable/7/libexec/talkd/announce.c
==============================================================================
--- stable/7/libexec/talkd/announce.c	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/libexec/talkd/announce.c	Sat Mar  5 04:11:06 2011	(r219296)
@@ -91,7 +91,7 @@ announce(CTL_MSG *request, const char *r
  * Build a block of characters containing the message.
  * It is sent blank filled and in a single block to
  * try to keep the message in one piece if the recipient
- * in in vi at the time
+ * in vi at the time
  */
 int
 print_mesg(const char *tty, CTL_MSG *request,

Modified: stable/7/share/man/man7/security.7
==============================================================================
--- stable/7/share/man/man7/security.7	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/share/man/man7/security.7	Sat Mar  5 04:11:06 2011	(r219296)
@@ -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 in the first place.
+break in originally.
 .Pp
 Security remedies should always be implemented with a multi-layered
 .Dq onion peel

Modified: stable/7/sys/boot/i386/cdboot/cdboot.s
==============================================================================
--- stable/7/sys/boot/i386/cdboot/cdboot.s	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/sys/boot/i386/cdboot/cdboot.s	Sat Mar  5 04:11:06 2011	(r219296)
@@ -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 in 64k chunks.
+# we have to read it in 64k chunks.
 #
 		mov DIR_SIZE(%bx),%eax		# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors

Modified: stable/7/sys/boot/pc98/cdboot/cdboot.s
==============================================================================
--- stable/7/sys/boot/pc98/cdboot/cdboot.s	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/sys/boot/pc98/cdboot/cdboot.s	Sat Mar  5 04:11:06 2011	(r219296)
@@ -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 in 64k chunks.
+# we have to read it in 64k chunks.
 #
 		mov %es:DIR_SIZE(%bx),%eax	# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors

Modified: stable/7/sys/dev/ti/if_ti.c
==============================================================================
--- stable/7/sys/dev/ti/if_ti.c	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/sys/dev/ti/if_ti.c	Sat Mar  5 04:11:06 2011	(r219296)
@@ -3685,7 +3685,7 @@ ti_ioctl2(struct cdev *dev, u_long cmd, 
 		 * to the Tigon board you're interested in.  This seems
 		 * like a not-so-good way to do things, since unless you
 		 * subsequently specify the unit number of the device
-		 * you're interested in in every ioctl, you'll only be
+		 * you're interested in every ioctl, you'll only be
 		 * able to debug one board at a time.
 		 */
 		error = 0;

Modified: stable/7/sys/i386/isa/vesa.c
==============================================================================
--- stable/7/sys/i386/isa/vesa.c	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/sys/i386/isa/vesa.c	Sat Mar  5 04:11:06 2011	(r219296)
@@ -1392,7 +1392,7 @@ get_palette(video_adapter_t *adp, int ba
 	}
 	free(r, M_DEVBUF);
 
-	/* if error && bits != 6 at this point, we are in in trouble... XXX */
+	/* if error && bits != 6 at this point, we are in trouble... XXX */
 	return error;
 }
 

Modified: stable/7/usr.bin/checknr/checknr.c
==============================================================================
--- stable/7/usr.bin/checknr/checknr.c	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/usr.bin/checknr/checknr.c	Sat Mar  5 04:11:06 2011	(r219296)
@@ -83,7 +83,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 in */
+	int lno;	/* line number */
 } stk[MAXSTK];
 int stktop;
 

Modified: stable/7/usr.bin/xlint/lint1/lint1.h
==============================================================================
--- stable/7/usr.bin/xlint/lint1/lint1.h	Sat Mar  5 04:08:07 2011	(r219295)
+++ stable/7/usr.bin/xlint/lint1/lint1.h	Sat Mar  5 04:11:06 2011	(r219296)
@@ -325,7 +325,7 @@ typedef	struct dinfo {
 	u_int	d_mscl : 1;	/* multiple storage classes */
 	u_int	d_terr : 1;	/* invalid type combination */
 	u_int	d_nedecl : 1;	/* 1 if at least a tag is declared */
-	u_int	d_vararg : 1;	/* ... in in current function decl. */
+	u_int	d_vararg : 1;	/* ... in current function decl. */
 	u_int	d_proto : 1;	/* current funct. decl. is prototype */
 	u_int	d_notyp : 1;	/* set if no type specifier was present */
 	u_int	d_asm : 1;	/* set if d_ctx == AUTO and asm() present */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 8 Bruce Cran freebsd_committer freebsd_triage 2011-03-05 04:11:19 UTC
State Changed
From-To: patched->closed

Merged to stable/7 and stable/8. 


Comment 9 Bruce Cran freebsd_committer freebsd_triage 2011-03-05 04:11:19 UTC
Responsible Changed
From-To: brueffer->brucec

Grab.