aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/doc/src
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 /lib/asn1/doc/src
parent2fbce26b3fe4bd7b4401f0e1313b778c38be36b2 (diff)
parentf5b36fc72e1ac37d00f82b7651b7ca06a628097f (diff)
downloadotp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.gz
otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.bz2
otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.zip
Merge branch 'maint'
Diffstat (limited to 'lib/asn1/doc/src')
-rw-r--r--lib/asn1/doc/src/asn1_ug.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 020e58c615..8b33497dd3 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -1390,7 +1390,7 @@ GENERAL-PROCEDURES GENERAL-PROCEDURE ::= {
instance, if a Type is used in a definition with certain
purpose, one want the type-name to express the intention. This
can be done with parameterization.</p>
- <p>When many types (or an other ASN.1 entity) only differs in some
+ <p>When many types (or another ASN.1 entity) only differs in some
minor cases, but the structure of the types are similar, only
one general type can be defined and the differences may be supplied
through parameters. </p>