aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/doc/src/rel.xml
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-21 19:10:49 +0100
committerSiri Hansen <[email protected]>2012-03-21 19:11:15 +0100
commit33e42a694e0ddd8a6c02bfe6c04298ca95aa938a (patch)
tree5c416c25321d3b6372ca2be871aead7fb234e5cd /lib/sasl/doc/src/rel.xml
parent22d5fe18a285784fe724d5f1ce62578bd7ff4f1a (diff)
parente855e8326a6ce589991da9cafc2590f306d035c3 (diff)
downloadotp-33e42a694e0ddd8a6c02bfe6c04298ca95aa938a.tar.gz
otp-33e42a694e0ddd8a6c02bfe6c04298ca95aa938a.tar.bz2
otp-33e42a694e0ddd8a6c02bfe6c04298ca95aa938a.zip
Merge branch 'siri/reltool/fresh-up' into maint
OTP-9792 OTP-9794 OTP-9967 OTP-9968 OTP-9980 OTP-9984 * siri/reltool/fresh-up: (27 commits) [reltool] Improve title of dependency colum [reltool] Update status bar for all config changes and for generate target [reltool] Fix GUI problems on Windows [reltool] Remove skip statement for test that failed due to stdlib error [sasl] Sort applications used by other applications correctly in .script [sasl] Doc that included applications in .rel defaults to same as in .app [reltool] Fix problems with sorting of applications [reltool] Just warn if same module occurs twice in .app file [reltool] Always return warnings as flat strings [reltool] Fix type spec and doc for app() and mod() [reltool] Move tables out of common record [reltool] Display warnings continously in GUI [reltool] Cleanup test code [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE [reltool] Improve error handling [reltool] Fix rollback and undo [reltool] Link together escript with inlined application [reltool] Fix badmatch when starting GUI [reltool] Update state and tables consistently for all types of config changes [reltool] Add test cases for handling of escripts ...
Diffstat (limited to 'lib/sasl/doc/src/rel.xml')
-rw-r--r--lib/sasl/doc/src/rel.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/doc/src/rel.xml b/lib/sasl/doc/src/rel.xml
index 470adf3c03..68ef90330f 100644
--- a/lib/sasl/doc/src/rel.xml
+++ b/lib/sasl/doc/src/rel.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>1997</year>
- <year>2011</year>
+ <year>2012</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -88,7 +88,7 @@
<p>The list must be a subset of the included applications
specified in the application resource file
(<c>Application.app</c>) and overrides this value. Defaults
- to the empty list.</p>
+ to the same value as in the application resource file.</p>
</item>
</list>
<note>