aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-06-09 11:10:43 +0200
committerPatrik Nyblom <[email protected]>2011-06-09 11:10:43 +0200
commit2316f1e9ed0a9200ca65030b61216ddc3cde73ba (patch)
tree5e85f30a461b42a1cea79c87cbae48c37e37dce3 /erts
parent8722432c16fee486ebb1cf6e33bbc7cc5c9f8a0d (diff)
parent9df8a8c8ff47f69594add5ae91f76b1acf27f7fe (diff)
downloadotp-2316f1e9ed0a9200ca65030b61216ddc3cde73ba.tar.gz
otp-2316f1e9ed0a9200ca65030b61216ddc3cde73ba.tar.bz2
otp-2316f1e9ed0a9200ca65030b61216ddc3cde73ba.zip
Merge branch 'pan/win_erlsrv_stop/OTP-9344' of super:pan_otp into pan/win_erlsrv_stop/OTP-9344
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erlsrv.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erlsrv.xml b/erts/doc/src/erlsrv.xml
index d9f7fdd309..919caa9542 100644
--- a/erts/doc/src/erlsrv.xml
+++ b/erts/doc/src/erlsrv.xml
@@ -290,10 +290,10 @@
<p>The <c>start_disabled</c> command operates on a service
regardless of if it's enabled/disabled or started/stopped. It
- does this by first enabling it (regardless of if it' enabled
+ does this by first enabling it (regardless of if it's enabled
or not), then starting it (if it's not already started) and
then disabling it. The result will be a disabled but started
- service, regardless of it's earlier state. This is useful for
+ service, regardless of its earlier state. This is useful for
starting services temporarily during a release upgrade. The
difference between using <c>start_disabled</c> and the
sequence <c>enable</c>, <c>start</c> and <c>disable</c> is