aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/design_principles
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-11-24 11:46:38 +0100
committerMarcus Arendt <[email protected]>2014-11-24 11:46:38 +0100
commit2b13135cc0e23ec01f5a74c371b60ef0ec02775e (patch)
treee41d23935574e8e97b2fdc8aad29c1c4711209c5 /system/doc/design_principles
parenta881aaf73a7c0f102175aa837679c62976575fa1 (diff)
parent09725c52dfbdcce5ebcf4e52f856f732c738b0d8 (diff)
downloadotp-2b13135cc0e23ec01f5a74c371b60ef0ec02775e.tar.gz
otp-2b13135cc0e23ec01f5a74c371b60ef0ec02775e.tar.bz2
otp-2b13135cc0e23ec01f5a74c371b60ef0ec02775e.zip
Merge branch 'maint'
Diffstat (limited to 'system/doc/design_principles')
-rw-r--r--system/doc/design_principles/release_handling.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/doc/design_principles/release_handling.xml b/system/doc/design_principles/release_handling.xml
index ba8a88d1c2..9d1e2c8669 100644
--- a/system/doc/design_principles/release_handling.xml
+++ b/system/doc/design_principles/release_handling.xml
@@ -310,7 +310,7 @@
the following instruction is used:</p>
<code type="none">
{apply, {M, F, A}}</code>
- <p>The release handler will evalute <c>apply(M, F, A)</c>.</p>
+ <p>The release handler will evaluate <c>apply(M, F, A)</c>.</p>
</section>
<section>
@@ -350,7 +350,7 @@
possible.</p>
</warning>
<p>An info report is written when the upgrade is completed. To
- programatically find out if the upgrade is complete,
+ programmatically find out if the upgrade is complete,
call <c>release_handler:which_releases(current)</c> and check
if it returns the expected (i.e. the new) release.</p>
<p>The new release version must be made permanent when the new