summaryrefslogtreecommitdiff
path: root/lib/talloc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/talloc')
-rw-r--r--lib/talloc/talloc.3.xml9
-rw-r--r--lib/talloc/talloc_guide.txt8
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
index 18c3788f76..8d9e08226d 100644
--- a/lib/talloc/talloc.3.xml
+++ b/lib/talloc/talloc.3.xml
@@ -136,10 +136,11 @@
talloc_free() operates recursively on its children.
</para>
<para>
- As a special case, talloc_free() is refused on pointers that
- have more than one parent, as talloc would have no way of knowing
- which parent should be removed. To free a pointer that has more than
- one parent please use talloc_unlink().
+ From the 2.0 version of talloc, as a special case,
+ talloc_free() is refused on pointers that have more than one
+ parent, as talloc would have no way of knowing which parent
+ should be removed. To free a pointer that has more than one
+ parent please use talloc_unlink().
</para>
<para>
To help you find problems in your code caused by this behaviour, if
diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt
index 3b6467a083..01de806662 100644
--- a/lib/talloc/talloc_guide.txt
+++ b/lib/talloc/talloc_guide.txt
@@ -131,10 +131,10 @@ For more control on which parent is removed, see talloc_unlink()
talloc_free() operates recursively on its children.
-As a special case, talloc_free() is refused on pointers that have more
-than one parent, as talloc would have no way of knowing which parent
-should be removed. To free a pointer that has more than one parent
-please use talloc_unlink().
+From the 2.0 version of talloc, as a special case, talloc_free() is
+refused on pointers that have more than one parent, as talloc would
+have no way of knowing which parent should be removed. To free a
+pointer that has more than one parent please use talloc_unlink().
To help you find problems in your code caused by this behaviour, if
you do try and free a pointer with more than one parent then the