aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/doc
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-12-14 17:21:22 +0100
committerErlang/OTP <[email protected]>2010-12-14 17:21:22 +0100
commit06ff115c291c4bb07a728bbeb72f67822e9d4b80 (patch)
treecea5739ba4e858904c17a2a4b26fa23495fc1052 /lib/orber/doc
parent34f7f62caf25ef159b63ca4f080e212b8726675f (diff)
parente10e306098b6f331ec683147e34a4a745900c144 (diff)
downloadotp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.tar.gz
otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.tar.bz2
otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.zip
Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r13
* nick/orber/old_ssl_option/OTP-8994: The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this. Conflicts: lib/orber/doc/src/notes.xml lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/doc')
-rw-r--r--lib/orber/doc/src/notes.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 1e2cdd05ba..ba16682f0b 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -40,7 +40,7 @@
<list type="bulleted">
<item>
<p>
- Partial support for recursive structs and unions.
+ Partial support for recursive structs and unions.
Only available for the erl_corba backend and requires
that Light IFR is used. I.e. the IC option {light_ifr, true}
and that Orber is configured in such a way that Light IFR
@@ -56,7 +56,7 @@
<item>
<p>The SSL option {ssl_imp, old} was not used if ssl_generation was
set to 2. Only R14B was affected by this.</p>
- <p>Own Id: OTP-8994 Aux Id:seq11747</p>
+ <p>Own Id: OTP-8994 Aux Id: seq11747</p>
</item>
</list>
</section>