aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src/epmd.c
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-03-25 14:55:50 +0100
committerHenrik Nord <[email protected]>2011-03-25 14:55:50 +0100
commit21a514ba7842380973fd4c4006d6cf71403d021e (patch)
treece4332309bdb5e53706d7782ac954a8eaee85724 /erts/epmd/src/epmd.c
parentad99d0e01d9c61dfad5e8a32dc587b61e2409edb (diff)
parent179de7d370b9e0398500d7d0e5ae34dd2ad6c619 (diff)
downloadotp-21a514ba7842380973fd4c4006d6cf71403d021e.tar.gz
otp-21a514ba7842380973fd4c4006d6cf71403d021e.tar.bz2
otp-21a514ba7842380973fd4c4006d6cf71403d021e.zip
Merge branch 'ta/doc-fixes' into dev
* ta/doc-fixes: Fix two typos in erlsrv log messages Fix typo in epmd help Fix typo in binary:part/2 example Fix typos in efficiency guide erts: Fix doc typos, duplication and readability Fix inet:port/1 doc to match implementation/spec Fix typos in zip manpage
Diffstat (limited to 'erts/epmd/src/epmd.c')
-rw-r--r--erts/epmd/src/epmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 65ff0cd6b2..e94533f0ba 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -433,7 +433,7 @@ static void usage(EpmdVars *g)
fprintf(stderr, " List names registered with the currently "
"running epmd\n");
fprintf(stderr, " -kill\n");
- fprintf(stderr, " Kill the currently runniing epmd\n");
+ fprintf(stderr, " Kill the currently running epmd\n");
fprintf(stderr, " (only allowed if -names show empty database or\n");
fprintf(stderr, " -relaxed_command_check was given when epmd was started).\n");
fprintf(stderr, " -stop Name\n");