From 257d5ff83cb03af4fae226220517b0c7d8f14da5 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 27 Jul 2007 08:08:51 +0200
Subject: [PATCH] --- yaml --- r: 63075 b: refs/heads/master c:
 79685b8deea4541d18882d8c07d0e99e788292ab h: refs/heads/master i:   63073:
 6f6d0c5a6337289f5874a2a16e0691f2232ece17   63071:
 8e55c91dc8c33629986344803dd90d2946c44ca8 v: v3

---
 [refs]                                      |  2 +-
 trunk/Documentation/DocBook/kernel-api.tmpl | 13 +++++++++++--
 trunk/fs/pipe.c                             |  2 +-
 trunk/fs/splice.c                           |  4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 50cf14298f2d..161bbe27d7a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c2ff389bbb33074e7fde7a744f59da199a74af5
+refs/heads/master: 79685b8deea4541d18882d8c07d0e99e788292ab
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
index eb42bf9847cb..ec7c498b69fc 100644
--- a/trunk/Documentation/DocBook/kernel-api.tmpl
+++ b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -704,14 +704,23 @@ X!Idrivers/video/console/fonts.c
 
   <chapter id="splice">
       <title>splice API</title>
-  <para>)
+  <para>
 	splice is a method for moving blocks of data around inside the
-	kernel, without continually transferring it between the kernel
+	kernel, without continually transferring them between the kernel
 	and user space.
   </para>
 !Iinclude/linux/splice.h
 !Ffs/splice.c
   </chapter>
 
+  <chapter id="pipes">
+      <title>pipes API</title>
+  <para>
+	Pipe interfaces are all for in-kernel (builtin image) use.
+	They are not exported for use by modules.
+  </para>
+!Iinclude/linux/pipe_fs_i.h
+!Ffs/pipe.c
+  </chapter>
 
 </book>
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index d007830d9c87..6b3d91a691bf 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/fs/pipe.c
@@ -255,7 +255,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf)
 
 /**
  * generic_pipe_buf_confirm - verify contents of the pipe buffer
- * @pipe:	the pipe that the buffer belongs to
+ * @info:	the pipe that the buffer belongs to
  * @buf:	the buffer to confirm
  *
  * Description:
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index 0a0973218084..c010a72ca2d2 100644
--- a/trunk/fs/splice.c
+++ b/trunk/fs/splice.c
@@ -164,7 +164,7 @@ static const struct pipe_buf_operations user_page_pipe_buf_ops = {
  * @spd:	data to fill
  *
  * Description:
- *    @spd contains a map of pages and len/offset tupples, a long with
+ *    @spd contains a map of pages and len/offset tuples, along with
  *    the struct pipe_buf_operations associated with these pages. This
  *    function will link that data to the pipe.
  *
@@ -1000,7 +1000,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
  * Description:
  *    This is a special case helper to splice directly between two
  *    points, without requiring an explicit pipe. Internally an allocated
- *    pipe is cached in the process, and reused during the life time of
+ *    pipe is cached in the process, and reused during the lifetime of
  *    that process.
  *
  */