PERFORCE change 1198647 for review

[John-Mark Gurney]

http://p4web.freebsd.org/@@1198647?ac=10

Change 1198647 by jmg at jmg_carbon2 on 2014/08/13 04:45:06

	sync up w/ head...

Affected files ...

.. //depot/projects/opencrypto/share/man/man3/pthread.3#2 integrate
.. //depot/projects/opencrypto/share/man/man9/vm_page_busy.9#2 integrate

Differences ...

==== //depot/projects/opencrypto/share/man/man3/pthread.3#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man3/pthread.3 235286 2012-05-11 20:06:46Z gjb $
+.\" $FreeBSD: head/share/man/man3/pthread.3 269871 2014-08-12 12:44:52Z gavin $
 .\"
-.Dd January 8, 2010
+.Dd August 12, 2014
 .Dt PTHREAD 3
 .Os
 .Sh NAME
@@ -344,13 +344,13 @@
 .Fa "const struct timespec *abstime"
 .Fc
 .Xc
-Wait no longer than the specified time for a condition
-and lock the specified mutex.
+Unlock the specified mutex, wait no longer than the specified time for
+a condition, and then relock the mutex.
 .It Xo
 .Ft int
 .Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
 .Xc
-Wait for a condition and lock the specified mutex.
+Unlock the specified mutex, wait for a condition, and relock the mutex.
 .El
 .Ss Read/Write Lock Routines
 .Bl -tag -width indent

==== //depot/projects/opencrypto/share/man/man9/vm_page_busy.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/vm_page_busy.9 254174 2013-08-10 06:37:53Z joel $
+.\" $FreeBSD: head/share/man/man9/vm_page_busy.9 269824 2014-08-11 18:26:57Z jhb $
 .Dd August 07, 2013
 .Dt VM_PAGE_BUSY 9
 .Os
@@ -95,7 +95,7 @@
 For example, when a thread wants to access or update page contents
 without a lock held the page is shared busied.
 .Pp
-Before busing a page the vm_object lock must be held.
+Before busying a page the vm_object lock must be held.
 The same rule applies when a page is unbusied.
 This makes the vm_object lock a real busy interlock.
 .Pp