From owner-svn-src-all@FreeBSD.ORG Sat Sep 11 10:49:57 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1392F1065674; Sat, 11 Sep 2010 10:49:57 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 00A4A8FC08; Sat, 11 Sep 2010 10:49:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8BAnuIw083799; Sat, 11 Sep 2010 10:49:56 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8BAnu3s083789; Sat, 11 Sep 2010 10:49:56 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201009111049.o8BAnu3s083789@svn.freebsd.org> From: Bruce Cran Date: Sat, 11 Sep 2010 10:49:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212463 - in head: bin/test lib/libc/net lib/libc/stdio lib/libc/stdlib secure/lib/libcrypto/man share/man/man4 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Sep 2010 10:49:57 -0000 Author: brucec Date: Sat Sep 11 10:49:56 2010 New Revision: 212463 URL: http://svn.freebsd.org/changeset/base/212463 Log: Revert changes of 'assure' to 'ensure' made in r211936. Approved by: rrs (mentor) Modified: head/bin/test/test.1 head/lib/libc/net/sctp_send.3 head/lib/libc/net/sctp_sendmsg.3 head/lib/libc/stdio/printf.3 head/lib/libc/stdlib/malloc.3 head/secure/lib/libcrypto/man/BIO_s_bio.3 head/share/man/man4/ata.4 head/share/man/man4/ng_hci.4 Modified: head/bin/test/test.1 ============================================================================== --- head/bin/test/test.1 Sat Sep 11 10:16:15 2010 (r212462) +++ head/bin/test/test.1 Sat Sep 11 10:49:56 2010 (r212463) @@ -302,7 +302,7 @@ manual page. The .Nm grammar is inherently ambiguous. -In order to ensure a degree of consistency, +In order to assure a degree of consistency, the cases described in the .St -p1003.2 , section D11.2/4.62.4, standard Modified: head/lib/libc/net/sctp_send.3 ============================================================================== --- head/lib/libc/net/sctp_send.3 Sat Sep 11 10:16:15 2010 (r212462) +++ head/lib/libc/net/sctp_send.3 Sat Sep 11 10:49:56 2010 (r212463) @@ -191,7 +191,7 @@ If that many milliseconds elapse and the peer has not acknowledged the data, the data will be skipped and no longer transmitted. Note that this policy does -not even ensure that the data will ever be sent. +not even assure that the data will ever be sent. In times of a congestion with large amounts of data being queued, the .Fa sinfo->sinfo_timetolive @@ -218,7 +218,7 @@ policy transforms the .Fa sinfo->sinfo_timetolive into a number of retransmissions to allow. This policy -always ensures that at a minimum one send attempt is +always assures that at a minimum one send attempt is made of the data. After which no more than .Fa sinfo->sinfo_timetolive Modified: head/lib/libc/net/sctp_sendmsg.3 ============================================================================== --- head/lib/libc/net/sctp_sendmsg.3 Sat Sep 11 10:16:15 2010 (r212462) +++ head/lib/libc/net/sctp_sendmsg.3 Sat Sep 11 10:49:56 2010 (r212463) @@ -203,7 +203,7 @@ If that many milliseconds elapse and the peer has not acknowledged the data, the data will be skipped and no longer transmitted. Note that this policy does -not even ensure that the data will ever be sent. +not even assure that the data will ever be sent. In times of a congestion with large amounts of data being queued, the .Fa timetolive @@ -230,7 +230,7 @@ policy transforms the .Fa timetolive into a number of retransmissions to allow. This policy -always ensures that at a minimum one send attempt is +always assures that at a minimum one send attempt is made of the data. After which no more than .Fa timetolive Modified: head/lib/libc/stdio/printf.3 ============================================================================== --- head/lib/libc/stdio/printf.3 Sat Sep 11 10:16:15 2010 (r212462) +++ head/lib/libc/stdio/printf.3 Sat Sep 11 10:49:56 2010 (r212463) @@ -849,7 +849,7 @@ and .Fn vsprintf assume an infinitely long string, callers must be careful not to overflow the actual space; -this is often hard to ensure. +this is often hard to assure. For safety, programmers should use the .Fn snprintf interface instead. Modified: head/lib/libc/stdlib/malloc.3 ============================================================================== --- head/lib/libc/stdlib/malloc.3 Sat Sep 11 10:16:15 2010 (r212462) +++ head/lib/libc/stdlib/malloc.3 Sat Sep 11 10:49:56 2010 (r212463) @@ -266,7 +266,7 @@ options are enabled, the allocator prefe but allocation only fails if memory cannot be acquired via either method. If neither option is enabled, then the .Dq M -option is implicitly enabled in order to ensure that there is a method for +option is implicitly enabled in order to assure that there is a method for acquiring memory. .It N Double/halve the number of arenas. @@ -437,7 +437,7 @@ rounded up to the nearest multiple of th .Pp Allocations are packed tightly together, which can be an issue for multi-threaded applications. -If you need to ensure that allocations do not suffer from cacheline sharing, +If you need to assure that allocations do not suffer from cacheline sharing, round your allocation requests up to the nearest multiple of the cacheline size. .Sh DEBUGGING MALLOC PROBLEMS Modified: head/secure/lib/libcrypto/man/BIO_s_bio.3 ============================================================================== --- head/secure/lib/libcrypto/man/BIO_s_bio.3 Sat Sep 11 10:16:15 2010 (r212462) +++ head/secure/lib/libcrypto/man/BIO_s_bio.3 Sat Sep 11 10:49:56 2010 (r212463) @@ -317,7 +317,7 @@ find out, how many bytes must be written .IX Header "WARNING" As the data is buffered, \fISSL_operation()\fR may return with a \s-1ERROR_SSL_WANT_READ\s0 condition, but there is still data in the write buffer. An application must -not rely on the error value of \fISSL_operation()\fR but must ensure that the +not rely on the error value of \fISSL_operation()\fR but must assure that the write buffer is always flushed first. Otherwise a deadlock may occur as the peer might be waiting for the data before being able to continue. .SH "SEE ALSO" Modified: head/share/man/man4/ata.4 ============================================================================== --- head/share/man/man4/ata.4 Sat Sep 11 10:16:15 2010 (r212462) +++ head/share/man/man4/ata.4 Sat Sep 11 10:49:56 2010 (r212463) @@ -243,7 +243,7 @@ based systems Please remember that in order to use UDMA4/ATA66 and above modes you .Em must use 80 conductor cables. -Please ensure that ribbon cables are no longer than 45cm. +Please assure that ribbon cables are no longer than 45cm. In case of rounded ATA cables, the length depends on the quality of the cables. SATA cables can be up to 1m long according to the specification. Modified: head/share/man/man4/ng_hci.4 ============================================================================== --- head/share/man/man4/ng_hci.4 Sat Sep 11 10:16:15 2010 (r212462) +++ head/share/man/man4/ng_hci.4 Sat Sep 11 10:49:56 2010 (r212463) @@ -108,7 +108,7 @@ piconet. Both asynchronous and isochronous services are supported. Between a master and a slave only a single ACL link can exist. For most ACL packets, -packet retransmission is applied to ensure data integrity. +packet retransmission is applied to assure data integrity. .Sh HOST CONTROLLER INTERFACE (HCI) The HCI provides a command interface to the baseband controller and link manager, and access to hardware status and control registers.