diff options
author | Lars Thorsen <[email protected]> | 2011-12-07 15:12:41 +0100 |
---|---|---|
committer | Lars Thorsen <[email protected]> | 2011-12-07 15:12:41 +0100 |
commit | 9a786fbc0ec809fb4dd20181fe6fd6291b76c0d3 (patch) | |
tree | b604db92ccf3ea2cdc1fd8fe6dbff23bc478d2cf /lib/orber/doc/src/corba_object.xml | |
parent | f7241e210c333b088210a138c0880aa93d1f7780 (diff) | |
parent | cae42e74905f1ef50edc881e4cfadad8787a498e (diff) | |
download | otp-9a786fbc0ec809fb4dd20181fe6fd6291b76c0d3.tar.gz otp-9a786fbc0ec809fb4dd20181fe6fd6291b76c0d3.tar.bz2 otp-9a786fbc0ec809fb4dd20181fe6fd6291b76c0d3.zip |
Merge branch 'lars/orber/doc-update-ssl'
* lars/orber/doc-update-ssl:
[orber] Update documentation according to the new handling of SSL options
Diffstat (limited to 'lib/orber/doc/src/corba_object.xml')
-rw-r--r-- | lib/orber/doc/src/corba_object.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/orber/doc/src/corba_object.xml b/lib/orber/doc/src/corba_object.xml index e0f9a9f503..ef440f1a2d 100644 --- a/lib/orber/doc/src/corba_object.xml +++ b/lib/orber/doc/src/corba_object.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="latin1" ?> +<?xml version="1.0" encoding="iso-8859-1" ?> <!DOCTYPE erlref SYSTEM "erlref.dtd"> <erlref> @@ -75,8 +75,7 @@ <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v> <v>Interface = string()</v> <v>Options = [{Key, Value}]</v> - <v>Key = ssl_client_verify | ssl_client_depth | ssl_client_certfile | ssl_client_cacertfile | - ssl_client_password | ssl_client_keyfile | ssl_client_ciphers | ssl_client_cachetimeout</v> + <v>Key = ssl_client_options</v> <v>Value = allowed value associated with the given key</v> <v>Return = boolean() | {'EXCEPTION', E}</v> </type> @@ -117,8 +116,7 @@ <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v> <v>Interface = string()</v> <v>Options = [{Key, Value}]</v> - <v>Key = ssl_client_verify | ssl_client_depth | ssl_client_certfile | ssl_client_cacertfile | - ssl_client_password | ssl_client_keyfile | ssl_client_ciphers | ssl_client_cachetimeout</v> + <v>Key = ssl_client_options</v> <v>Value = allowed value associated with the given key</v> <v>Return = boolean() | {'EXCEPTION', E}</v> </type> @@ -149,8 +147,7 @@ <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v> <v>Interface = string()</v> <v>Options = [{Key, Value}]</v> - <v>Key = ssl_client_verify | ssl_client_depth | ssl_client_certfile | ssl_client_cacertfile | - ssl_client_password | ssl_client_keyfile | ssl_client_ciphers | ssl_client_cachetimeout</v> + <v>Key = ssl_client_options</v> <v>Value = allowed value associated with the given key</v> <v>Return = boolean() | {'EXCEPTION', E}</v> </type> |