diff --git a/memcheck/docs/mc-manual.xml b/memcheck/docs/mc-manual.xml
index 8fd88b487..a590d585a 100644
--- a/memcheck/docs/mc-manual.xml
+++ b/memcheck/docs/mc-manual.xml
@@ -1288,10 +1288,7 @@ arguments.
VALGRIND_MAKE_MEM_DEFINED.
These mark address ranges as completely inaccessible,
accessible but containing undefined data, and accessible and
- containing defined data, respectively. Subsequent errors may
- have their faulting addresses described in terms of these
- blocks. Returns a "block handle". Returns zero when not run
- on Valgrind.
+ containing defined data, respectively.
@@ -1300,21 +1297,6 @@ arguments.
affects those bytes that are already addressable.
-
- VALGRIND_DISCARD: At some point you may
- want Valgrind to stop reporting errors in terms of the blocks
- defined by the previous three macros. To do this, the above macros
- return a small-integer "block handle". You can pass this block
- handle to VALGRIND_DISCARD. After doing so,
- Valgrind will no longer be able to relate addressing errors to the
- user-defined block associated with the handle. The permissions
- settings associated with the handle remain in place; this just
- affects how errors are reported, not whether they are reported.
- Returns 1 for an invalid handle and 0 for a valid handle (although
- passing invalid handles is harmless). Always returns 0 when not run
- on Valgrind.
-
-
VALGRIND_CHECK_MEM_IS_ADDRESSABLE and
VALGRIND_CHECK_MEM_IS_DEFINED: check immediately
@@ -1372,6 +1354,30 @@ arguments.
know what they are doing.
+
+ VALGRIND_CREATE_BLOCK and
+ VALGRIND_DISCARD. VALGRIND_CREATE_BLOCK
+ takes an address, a number of bytes and a character string. The
+ specified address range is then associated with that string. When
+ Memcheck reports an invalid access to an address in the range, it
+ will describe it in terms of this block rather than in terms of
+ any other block it knows about. Note that the use of this macro
+ does not actually change the state of memory in any way -- it
+ merely gives a name for the range.
+
+
+ At some point you may want Memcheck to stop reporting errors
+ in terms of the block named
+ by VALGRIND_CREATE_BLOCK. To make this
+ possible, VALGRIND_CREATE_BLOCK returns a
+ "block handle", which is a C int value. You
+ can pass this block handle to VALGRIND_DISCARD.
+ After doing so, Valgrind will no longer relate addressing errors
+ in the specified range to the block. Passing invalid handles to
+ VALGRIND_DISCARD is harmless.
+
+
+