aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/doc
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-07-09 13:32:42 +0200
committerZandra Hird <[email protected]>2015-07-09 13:32:42 +0200
commit745563e98f6993e279703dc1ad1e9a2c38dfac28 (patch)
tree568ad1df5fd92eed7ef8c4399dd29b6e071f23f8 /lib/tools/doc
parent46e36470195f6015ec2253244a22c782140700a4 (diff)
parentbb66bb749248fdef7634b5753000b62a0c3ad1a6 (diff)
downloadotp-745563e98f6993e279703dc1ad1e9a2c38dfac28.tar.gz
otp-745563e98f6993e279703dc1ad1e9a2c38dfac28.tar.bz2
otp-745563e98f6993e279703dc1ad1e9a2c38dfac28.zip
Merge branch 'c-rack/fix-typo2' into maint
* c-rack/fix-typo2: Fix small typo
Diffstat (limited to 'lib/tools/doc')
-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