svn commit: r1534109 - in /apr/apr/branches/1.5.x: ./ LICENSE include/apr_network_io.h include/apr_shm.h network_io/unix/sendrecv.c

[tr...@apache.org]

Author: trawick
Date: Mon Oct 21 11:57:36 2013
New Revision: 1534109

URL: http://svn.apache.org/r1534109
Log:
Merge apr 1.x bits of r1084662 from trunk:

fix extra "the" in comments and license text

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/LICENSE
    apr/apr/branches/1.5.x/include/apr_network_io.h
    apr/apr/branches/1.5.x/include/apr_shm.h
    apr/apr/branches/1.5.x/network_io/unix/sendrecv.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1084662

Modified: apr/apr/branches/1.5.x/LICENSE
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/LICENSE?rev=1534109&r1=1534108&r2=1534109&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/LICENSE (original)
+++ apr/apr/branches/1.5.x/LICENSE Mon Oct 21 11:57:36 2013
@@ -206,8 +206,8 @@ APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
 
 The Apache Portable Runtime includes a number of subcomponents with
 separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
+code for these subcomponents is subject to the terms and conditions
+of the following licenses. 
 
 From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
 file_io/unix/mktemp.c, strings/apr_strings.c:

Modified: apr/apr/branches/1.5.x/include/apr_network_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_network_io.h?rev=1534109&r1=1534108&r2=1534109&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_network_io.h (original)
+++ apr/apr/branches/1.5.x/include/apr_network_io.h Mon Oct 21 11:57:36 2013
@@ -673,7 +673,7 @@ APR_DECLARE(apr_status_t) apr_socket_atm
 
 /**
  * Return an address associated with a socket; either the address to
- * which the socket is bound locally or the the address of the peer
+ * which the socket is bound locally or the address of the peer
  * to which the socket is connected.
  * @param sa The returned apr_sockaddr_t.
  * @param which Whether to retrieve the local or remote address

Modified: apr/apr/branches/1.5.x/include/apr_shm.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_shm.h?rev=1534109&r1=1534108&r2=1534109&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_shm.h (original)
+++ apr/apr/branches/1.5.x/include/apr_shm.h Mon Oct 21 11:57:36 2013
@@ -127,7 +127,7 @@ APR_DECLARE(apr_status_t) apr_shm_create
  * name-based shared memory segments, and will return APR_ENOTIMPL on
  * platforms without such support.  Removing the file while the shm
  * is in use is not entirely portable, caller may use this to enhance
- * obscurity of the resource, but be prepared for the the call to fail,
+ * obscurity of the resource, but be prepared for the call to fail,
  * and for concurrent attempts to create a resource of the same name
  * to also fail.  The pool cleanup of apr_shm_create (apr_shm_destroy)
  * also removes the named resource.

Modified: apr/apr/branches/1.5.x/network_io/unix/sendrecv.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/network_io/unix/sendrecv.c?rev=1534109&r1=1534108&r2=1534109&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/network_io/unix/sendrecv.c (original)
+++ apr/apr/branches/1.5.x/network_io/unix/sendrecv.c Mon Oct 21 11:57:36 2013
@@ -552,7 +552,7 @@ apr_status_t apr_socket_sendfile(apr_soc
 
         /* On early versions of FreeBSD sendfile, the number of bytes to send 
          * must include the length of the headers.  Don't look at the man page 
-         * for this :(  Instead, look at the the logic in 
+         * for this :(  Instead, look at the logic in 
          * src/sys/kern/uipc_syscalls::sendfile().
          *
          * This was fixed in the middle of 4.6-STABLE