svn commit: r218909 - in head: bin/df bin/sh lib/libc/arm/gen lib/libc/ia64/gen lib/libc/mips/gen lib/libc/powerpc/gen lib/libc/powerpc64/gen lib/libpkg lib/libstand lib/msun/src sys/amd64/amd64 sy...

[John Baldwin]

On Monday, February 21, 2011 4:01:34 am Bruce Cran wrote:
> Author: brucec
> Date: Mon Feb 21 09:01:34 2011
> New Revision: 218909
> URL: http://svn.freebsd.org/changeset/base/218909
> 
> Log:
>   Fix typos - remove duplicate "the".
>   
>   PR:	bin/154928
>   Submitted by:	Eitan Adler <lists at eitanadler.com>
>   MFC after: 	3 days

A few of these weren't just duplicates but were actually using 'the' when
they should have been using some other word instead:

> Modified: head/lib/libpkg/version.c
> ==============================================================================
> --- head/lib/libpkg/version.c	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/lib/libpkg/version.c	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -76,7 +76,7 @@ split_version(const char *pkgname, const
>      if (pkgname == NULL)
>  	errx(2, "%s: Passed NULL pkgname.", __func__);
>  
> -    /* Look for the last '-' the the pkgname */
> +    /* Look for the last '-' the pkgname */
>      ch = strrchr(pkgname, '-');
>      /* Cheat if we are just passed a version, not a valid package name */
>      versionstr = ch ? ch + 1 : pkgname;

This is not a double the, it should be "Look for the last '-' in the pkgname".

> Modified: head/sys/dev/drm/r300_reg.h
> ==============================================================================
> --- head/sys/dev/drm/r300_reg.h	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/sys/dev/drm/r300_reg.h	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -353,7 +353,7 @@ __FBSDID("$FreeBSD$");
>  #       define R300_PVS_CNTL_1_PROGRAM_START_SHIFT   0
>  #       define R300_PVS_CNTL_1_POS_END_SHIFT         10
>  #       define R300_PVS_CNTL_1_PROGRAM_END_SHIFT     20
> -/* Addresses are relative the the vertex program parameters area. */
> +/* Addresses are relative the vertex program parameters area. */
>  #define R300_VAP_PVS_CNTL_2                 0x22D4
>  #       define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0
>  #       define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT  16

I think this should be "Addresses are relative to the vertex ...".

> Modified: head/sys/dev/ep/if_epreg.h
> ==============================================================================
> --- head/sys/dev/ep/if_epreg.h	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/sys/dev/ep/if_epreg.h	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -113,7 +113,7 @@
>  /**************************************************************************
>   *									  *
>   * These are the registers for the 3Com 3c509 and their bit patterns when *
> - * applicable.  They have been taken out the the "EtherLink III Parallel  *
> + * applicable.  They have been taken out the "EtherLink III Parallel  *
>   * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual *
>   * from 3com.								  *
>   *									  *

I think this should be 'Then have been taken out of the "Etherlink III...'

> Modified: head/sys/dev/vx/if_vxreg.h
> ==============================================================================
> --- head/sys/dev/vx/if_vxreg.h	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/sys/dev/vx/if_vxreg.h	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -112,7 +112,7 @@
>  
>  /**************************************************************************
>   * These are the registers for the 3Com 3c509 and their bit patterns when *
> - * applicable.  They have been taken out the the "EtherLink III Parallel  *
> + * applicable.  They have been taken out the "EtherLink III Parallel  *
>   * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual *
>   * from 3com.								  *
>   **************************************************************************/

Same as above.  "out of the" rather than "out the"

> Modified: head/sys/gnu/fs/xfs/xfs_dir_leaf.c
> ==============================================================================
> --- head/sys/gnu/fs/xfs/xfs_dir_leaf.c	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/sys/gnu/fs/xfs/xfs_dir_leaf.c	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -2153,7 +2153,7 @@ xfs_dir_leaf_getdents_int(
>  }
>  
>  /*
> - * Format a dirent64 structure and copy it out the the user's buffer.
> + * Format a dirent64 structure and copy it out the user's buffer.
>   */
>  int
>  xfs_dir_put_dirent64_direct(xfs_dir_put_args_t *pa)
> @@ -2185,7 +2185,7 @@ xfs_dir_put_dirent64_direct(xfs_dir_put_
>  }
>  
>  /*
> - * Format a dirent64 structure and copy it out the the user's buffer.
> + * Format a dirent64 structure and copy it out the user's buffer.
>   */
>  int
>  xfs_dir_put_dirent64_uio(xfs_dir_put_args_t *pa)

I think these should both be "out to the user's buffer".


> Modified: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
> ==============================================================================
> --- head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -560,7 +560,7 @@ ng_btsocket_rfcomm_connect(struct socket
>  		soclose(l2so); /* we don't need new L2CAP socket */
>  
>  	/*
> -	 * Check if we already have the same DLCI the the same session
> +	 * Check if we already have the same DLCI the same session
>  	 */
>  
>  	mtx_lock(&s->session_mtx);

Not 100% sure, but I think the first "the" here should have been changed to
something else like "within", "in", "from", etc.  emax@ might be the best
person to ask.

> Modified: head/usr.bin/make/lst.c
> ==============================================================================
> --- head/usr.bin/make/lst.c	Mon Feb 21 05:10:34 2011	(r218908)
> +++ head/usr.bin/make/lst.c	Mon Feb 21 09:01:34 2011	(r218909)
> @@ -98,7 +98,7 @@ Lst_Append(Lst *list, LstNode *ln, void 
>   *		LST_CONCLINK if should just be relinked
>   *
>   * Side Effects:
> - *	New elements are created and appended the the first list.
> + *	New elements are created and appended the first list.
>   */
>  void
>  Lst_Concat(Lst *list1, Lst *list2, int flags)

I think this should be "appended to the first list"

-- 
John Baldwin