aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-07-04 17:51:18 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-07-04 17:51:18 +0200
commit1ac1ae65e6cbf42c002acb27615127bbc0b20d9e (patch)
treea393e9c40c5b8acc1bc882c818fb42a0b53915d4
parent3cd86904692060b0ca3e381f8264f8c36350feb1 (diff)
Fix terminology
-rw-r--r--doc/manual.xhtml6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual.xhtml b/doc/manual.xhtml
index 385bb9d..b60eafc 100644
--- a/doc/manual.xhtml
+++ b/doc/manual.xhtml
@@ -5524,11 +5524,11 @@ t.commit ();
a pre-allocated instance, the object is only cached if its object
pointer is a raw pointer.</p>
- <p>Finally, the session caches both constant and non-constant objects,
+ <p>Finally, the session caches both constant and unrestricted objects,
depending on whether a constant reference or constant pointer was
passed to the <code>database::persist()</code> function (in contrast,
- when loaded, objects are always created and cached as non-constant).
- If we try to load an object as non-constant that was previously
+ when loaded, objects are always created and cached as unrestricted).
+ If we try to load an object as unrestricted that was previously
persisted and cached as constant, the <code>odb::const_object</code>
exception is thrown. The following transaction shows the
situation where this would happen:</p>