aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-07-09 13:33:13 +0200
committerZandra Hird <[email protected]>2015-07-09 13:33:13 +0200
commit31623a16629dee45e3d3e6f33ffb0865b157301a (patch)
treea423082c0070ba6ec8429feff24a0b6b7269dd26 /lib
parent3b9df47c2d73ca610c81066a4d916eb2e6c70622 (diff)
parent745563e98f6993e279703dc1ad1e9a2c38dfac28 (diff)
downloadotp-31623a16629dee45e3d3e6f33ffb0865b157301a.tar.gz
otp-31623a16629dee45e3d3e6f33ffb0865b157301a.tar.bz2
otp-31623a16629dee45e3d3e6f33ffb0865b157301a.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/tools/doc/src/make.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tools/doc/src/make.xml b/lib/tools/doc/src/make.xml
index e63163d689..5c2e5e5d62 100644
--- a/lib/tools/doc/src/make.xml
+++ b/lib/tools/doc/src/make.xml
@@ -76,7 +76,7 @@
Load mode. Loads all recompiled modules.</item>
<item><c>netload</c> <br></br>
- Net load mode. Loads all recompiled modules an all known nodes.</item>
+ Net load mode. Loads all recompiled modules on all known nodes.</item>
</list>
<p>All items in <c>Options</c> that are not make options are assumed
to be compiler options and are passed as-is to