From: Jim Jagielski <jim@apache.org>
Date: Thu, 4 Oct 2012 13:59:28 +0000 (+0000)
Subject: update xforms
X-Git-Tag: 2.5.0-alpha~6236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=250323fb2cf907bb08c2c6edc114b120e35f461a;p=thirdparty%2Fapache%2Fhttpd.git

update xforms


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1394080 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_slotmem_plain.html.en b/docs/manual/mod/mod_slotmem_plain.html.en
index fe8a749e772..2a85e07f897 100644
--- a/docs/manual/mod/mod_slotmem_plain.html.en
+++ b/docs/manual/mod/mod_slotmem_plain.html.en
@@ -71,10 +71,10 @@
       <dd>return the total data size, in bytes, of a slot in the segment</dd>
 
       <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int *item_id);</dt>
-      <dd>grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+      <dd>grab or allocate the first free slot and mark as in-use (does not do any data copying)</dd>
 
       <dt>apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
-      <dd>forced grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+      <dd>forced grab or allocate the specified slot and mark as in-use (does not do any data copying)</dd>
         
      <dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
       <dd>release or free a slot and mark as not in-use (does not do any data copying)</dd>
diff --git a/docs/manual/mod/mod_slotmem_shm.html.en b/docs/manual/mod/mod_slotmem_shm.html.en
index 0adb9de2038..bb8eae86cc3 100644
--- a/docs/manual/mod/mod_slotmem_shm.html.en
+++ b/docs/manual/mod/mod_slotmem_shm.html.en
@@ -84,10 +84,10 @@
       <dd>return the total data size, in bytes, of a slot in the segment</dd>
 
       <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int *item_id);</dt>
-      <dd>grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+      <dd>grab or allocate the first free slot and mark as in-use (does not do any data copying)</dd>
 
-      <dt>apr_status_t grab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
-      <dd>forced grab or allocate a slot and mark as in-use (does not do any data copying)</dd>
+      <dt>apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
+      <dd>forced grab or allocate the specified slot and mark as in-use (does not do any data copying)</dd>
 
       <dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
       <dd>release or free a slot and mark as not in-use (does not do any data copying)</dd>