aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-28 10:26:04 +0200
committerMarcus Arendt <[email protected]>2014-08-28 10:26:04 +0200
commitdeb3008fb728f2089e844a53c95a8d7bfb4dfb5c (patch)
tree5cf9b6b6bdf87546fd38f90da8a5d51440dfbcb2 /system
parent2fbce26b3fe4bd7b4401f0e1313b778c38be36b2 (diff)
parentf5b36fc72e1ac37d00f82b7651b7ca06a628097f (diff)
downloadotp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.gz
otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.bz2
otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.zip
Merge branch 'maint'
Diffstat (limited to 'system')
-rw-r--r--system/doc/system_architecture_intro/sys_arch_intro.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/doc/system_architecture_intro/sys_arch_intro.xml b/system/doc/system_architecture_intro/sys_arch_intro.xml
index 62add510ca..3e88548861 100644
--- a/system/doc/system_architecture_intro/sys_arch_intro.xml
+++ b/system/doc/system_architecture_intro/sys_arch_intro.xml
@@ -150,7 +150,7 @@
<item>Chapter 8: "Operation and Management Principles" describes the model for operation and maintenance of sub-systems.</item>
<item>Chapter 9: "Tutorial" gives an orientation of the different
interoperability mechanism, which can be used when integrating an
- Erlang program with a program written in an other programming language.</item>
+ Erlang program with a program written in another programming language.</item>
</list>
</section>