aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2015-01-07 16:11:00 +0100
committerMarcus Arendt <[email protected]>2015-01-07 16:11:00 +0100
commit821d84c5860a9a26185efa19be407796422e3090 (patch)
treebd68c23e996bea8c5b4a622df52f27dc0d9848e7 /lib
parent4f7edc376ee61238699f68c8721ab23ee56eafee (diff)
parentaee18f309d41691019fc323bd41c5f78be49953b (diff)
downloadotp-821d84c5860a9a26185efa19be407796422e3090.tar.gz
otp-821d84c5860a9a26185efa19be407796422e3090.tar.bz2
otp-821d84c5860a9a26185efa19be407796422e3090.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/mnesia/doc/src/mnesia.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 268dc18e65..c23c2cb226 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -151,9 +151,9 @@ If a new item is inserted with the same key as
</item>
<item>
<p><c>local_content</c> When an application requires
- tables whose contents is local to each node,
+ tables whose contents are local to each node,
<c>local_content</c> tables may be used. The name of the
- table is known to all Mnesia nodes, but its contents is
+ table is known to all Mnesia nodes, but its contents are
unique on each node. This means that access to such a table
must be done locally. Set the <c>local_content</c> field to
<c>true</c> if you want to enable the <c>local_content</c>
@@ -579,7 +579,7 @@ mnesia:add_table_index(person, age)
<desc>
<p>The tables are backed up to external media using the backup
module <c>BackupMod</c>. Tables with the local contents
- property is being backed up as they exist on the current
+ property are backed up as they exist on the current
node. <c>BackupMod</c> is the default backup callback
module obtained by
<c>mnesia:system_info(backup_module)</c>. See the User's