Merge branch 'lars/orber/fix-man-warnings/OTP-14673' into maint

* lars/orber/fix-man-warnings/OTP-14673:
  [orber] Touchup of code tags

16 files changed, 97 insertions, 111 deletions

diff --git a/lib/orber/doc/src/CosNaming.xml b/lib/orber/doc/src/CosNaming.xml
index d69b604f2f..251e721df1 100644
--- a/lib/orber/doc/src/CosNaming.xml
+++ b/lib/orber/doc/src/CosNaming.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -55,8 +55,8 @@ struct Binding {
 
 typedef sequence <Binding> BindingList;
     ]]></code>
-    <p>To get access to the record definitions for the structs use:
-      <c>-include_lib("orber/COSS/CosNaming.hrl").</c>.</p>
+    <p>To get access to the record definitions for the structs use:</p>
+    <code>-include_lib("orber/COSS/CosNaming.hrl").</code>
     <p>Names are not an ORB object but the can be structured in components as seen by 
       the definition above. There are no requirements on names so the service can support 
       many different conventions and standards.</p>
diff --git a/lib/orber/doc/src/CosNaming_NamingContext.xml b/lib/orber/doc/src/CosNaming_NamingContext.xml
index 96a6367cbb..4c83e6a240 100644
--- a/lib/orber/doc/src/CosNaming_NamingContext.xml
+++ b/lib/orber/doc/src/CosNaming_NamingContext.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,61 +37,54 @@
       naming contexts. Name context may be named in other contexts and cycles are
       permitted.</p>
     <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="none">
-      -record('CosNaming_NameComponent', {id, kind=""}).
-    </code>
+    <code type="erl">-record('CosNaming_NameComponent', {id, kind=""}).</code>
     <p>where <c>id</c> and <c>kind</c> are strings. </p>
     <p>The type <c>Binding</c> used below is defined as:</p>
-    <code type="none">
-      -record('CosNaming_Binding', {binding_name, binding_type}).
-    </code>
+    <code type="erl">-record('CosNaming_Binding', {binding_name, binding_type}).</code>
     <p>where <c>binding_name</c> is a Name and <c>binding_type</c> is an enum which 
       has the values <c>nobject</c> and <c>ncontext</c>.</p>
     <p>Both these records are defined in the file <c>CosNaming.hrl</c> and it 
       is included with:</p>
-    <code type="none">
-      -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
-    </code>
+    <code type="erl">-include_lib("orber/COSS/CosNaming/CosNaming.hrl").</code>
     <p>There are a number of exceptions that can be returned from functions in this 
       interface.</p>
     <list type="bulleted">
       <item>
         <p>NotFound is defined as </p>
-        <code type="none">
--record('CosNaming_NamingContext_NotFound', 
-                      {rest_of_name, why}).        </code>
+        <code type="erl">
+-record('CosNaming_NamingContext_NotFound',
+        {rest_of_name, why}).</code>
       </item>
       <item>
         <p>CannotProceed is defined as </p>
-        <code type="none">
--record('CosNaming_NamingContext_CannotProceed', 
-                      {rest_of_name, cxt}).        </code>
+        <code type="erl">
+-record('CosNaming_NamingContext_CannotProceed',
+        {rest_of_name, cxt}).
+	</code>
       </item>
       <item>
         <p>InvalidName is defined as </p>
-        <code type="none">
--record('CosNaming_NamingContext_InvalidName', {}).        </code>
+        <code type="erl">
+-record('CosNaming_NamingContext_InvalidName', {}).
+	</code>
       </item>
       <item>
         <p>NotFound is defined as </p>
-        <code type="none">
--record('CosNaming_NamingContext_NotFound', {}).        </code>
+        <code type="erl">-record('CosNaming_NamingContext_NotFound', {}).</code>
       </item>
       <item>
         <p>AlreadyBound is defined as </p>
-        <code type="none">
--record('CosNaming_NamingContext_AlreadyBound', {}).        </code>
+        <code type="erl">-record('CosNaming_NamingContext_AlreadyBound', {}).</code>
       </item>
       <item>
         <p>NotEmpty is defined as </p>
-        <code type="none">
--record('CosNaming_NamingContext_NotEmpty', {).        </code>
+        <code type="erl">-record('CosNaming_NamingContext_NotEmpty', {}).</code>
       </item>
     </list>
     <p>These exceptions are defined in the file <c>CosNaming_NamingContext.hrl</c> and it 
       is included with:</p>
-    <code type="none">
-      -include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
+    <code type="erl">
+-include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
     </code>
   </description>
   <funcs>
diff --git a/lib/orber/doc/src/CosNaming_NamingContextExt.xml b/lib/orber/doc/src/CosNaming_NamingContextExt.xml
index a571b97ccb..2af3deadda 100644
--- a/lib/orber/doc/src/CosNaming_NamingContextExt.xml
+++ b/lib/orber/doc/src/CosNaming_NamingContextExt.xml
@@ -4,8 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year>
-      <year>2016</year>
+      <year>2000</year><year>2017</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -36,8 +35,8 @@
   <description>
     <p>To get access to the record definitions for the structures use:      <br></br>
 </p>
-    <code type="none">
-        -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
+    <code type="erl">
+-include_lib("orber/COSS/CosNaming/CosNaming.hrl").
     </code>
     <p>This module also exports the functions described in:</p>
     <list type="bulleted">
diff --git a/lib/orber/doc/src/any.xml b/lib/orber/doc/src/any.xml
index f51712c97e..c94a2132d8 100644
--- a/lib/orber/doc/src/any.xml
+++ b/lib/orber/doc/src/any.xml
@@ -4,8 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year>
-      <year>2016</year>
+      <year>1998</year><year>2017</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -41,9 +40,7 @@
     <p>The type <c>TC</c> used below describes an IDL type and is a tuple according 
       to the to the Erlang language mapping.</p>
     <p>The type <c>Any</c> used below is defined as:</p>
-    <code type="none">
-      -record(any, {typecode, value}).
-    </code>
+    <code type="erl">-record(any, {typecode, value}).</code>
     <p>where <c>typecode</c> is a TC tuple and <c>value</c> is an Erlang term of 
       the type defined by the typecode field.</p>
   </description>
diff --git a/lib/orber/doc/src/ch_debugging.xml b/lib/orber/doc/src/ch_debugging.xml
index a036cf5231..debac4313e 100644
--- a/lib/orber/doc/src/ch_debugging.xml
+++ b/lib/orber/doc/src/ch_debugging.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -121,7 +121,7 @@ Result.......: {'EXCEPTION',{'MARSHAL',[],102,'COMPLETED_NO'}}
         uses the <c>error_logger</c> module to generate the logs. If the traffic 
         is intense you probably want to write the reports to a log-file. 
         This is done by, for example, invoking:</p>
-      <code type="none">
+      <code type="erl">
 erl> error_logger:tty(false). 
 erl> error_logger:logfile({open, "/tmp/IIOPTrace"}). 
       </code>
diff --git a/lib/orber/doc/src/ch_exceptions.xml b/lib/orber/doc/src/ch_exceptions.xml
index 52735dc394..17657d0d4a 100644
--- a/lib/orber/doc/src/ch_exceptions.xml
+++ b/lib/orber/doc/src/ch_exceptions.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -192,7 +192,7 @@ module MyModule {
     <title>Throwing Exceptions</title>
     <p>To be able to raise <c>MyException</c> or <c>MyExceptionMsg</c> exceptions, 
       the generated <c>MyModule.hrl</c> must be included, and typical usage is:</p>
-    <code type="none">
+    <code type="erl">
 -module('MyModule_MyInterface_impl').
 -include("MyModule.hrl").
 
diff --git a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
index a0feda3f84..eaa88f24f1 100644
--- a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
+++ b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -819,7 +819,7 @@ module x {
     <p><term id="Type Codes"><termdef>Type codes give a complete description  of the type including all its components and structure.</termdef></term>are, for example, used in <seealso marker="any">Any</seealso> values.
       Hence, we can encapsulate the <c>employee</c> struct in an <c>any</c>
       type by:</p>
-    <code type="none">
+    <code type="erl">
 %% Erlang code
 ....
 AnEmployee = #'DB_employee'{'No'      = 1,
@@ -962,7 +962,7 @@ R1 = m_i:foo(Obj, 55),
       representation of the IDL-type <c>void</c>, must be returned by
       <c>baz</c> and <c>'_set_RWAttribute'</c>. 
       These operations can be implemented in the call-back module as:</p>
-    <code type="none">
+    <code type="erl">
 '_set_RWAttribute'(State, Long) ->
     {reply, ok, State}.
 
@@ -1011,7 +1011,7 @@ $> erlc +"{be,erl_template}" DB.idl
     <p>We begin with implementing the <c>DB_Access_impl.erl</c> module, which,
       if we used <c>erl_template</c>, will look like the following. All we need
       to do is to add the logic to the <c>logon</c> operation.</p>
-    <code type="none"><![CDATA[
+    <code type="erl"><![CDATA[
 %%----------------------------------------------------------------------
 %% <LICENSE>
 %% 
@@ -1154,7 +1154,7 @@ $ <input>erlc *.erl</input>
       <seealso marker="ch_exceptions">Exceptions</seealso> chapter.
       In the following example, only the implementation of the API functions
       are shown:</p>
-    <code type="none">
+    <code type="erl">
 %%======================================================================
 %% API Functions
 %%======================================================================
diff --git a/lib/orber/doc/src/ch_install.xml b/lib/orber/doc/src/ch_install.xml
index 9bc974225d..65faa91ccf 100644
--- a/lib/orber/doc/src/ch_install.xml
+++ b/lib/orber/doc/src/ch_install.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -106,7 +106,7 @@
         necessary to start the Erlang distribution (i.e. using <c>-name/-sname</c>).</p>
       <p>If we use <c>ram_copies</c> there is no need for creating a disk based
         schema. Simply use:</p>
-      <code type="none">
+      <code type="erl">
 erl> mnesia:start().
 erl> corba:orb_init([{domain, "MyRAMSingleNodeORB"}]).
 erl> orber:install([node()], [{ifr_storage_type, ram_copies}]).
@@ -115,7 +115,7 @@ erl> orber:start().
       <p>If you installation requires <c>disc_copies</c> you must begin with
         creating a Mnesia schema. Otherwise, the installation is similar
         to a RAM installation:</p>
-      <code type="none">
+      <code type="erl">
 erl> mnesia:create_schema([node()]).
 erl> mnesia:start().
 erl> corba:orb_init([{domain, "MyDiskSingleNodeORB"}]).
@@ -137,7 +137,7 @@ erl> orber:start().
       <title>Install RAM Based Multi Node Orber</title>
       <p>Within a domain Orber uses the Erlang distribution protocol. Hence, you
         <em>must</em> start it first by, for example, using:</p>
-      <code type="none">
+      <code type="erl">
 hostA> erl -sname nodeA
       </code>
       <p>In this example, we assume that we want to use two nodes; <c>nodeA</c> and
@@ -146,7 +146,7 @@ hostA> erl -sname nodeA
         parameter <c>extra_db_nodes</c> or use <c>mnesia:change_config/2</c>. To 
         begin with, Mnesia must be started on all nodes before we can install
         Orber:</p>
-      <code type="none">
+      <code type="erl">
 nodeA@hostA> mnesia:start().
 nodeA@hostA> mnesia:change_config(extra_db_nodes, 
                                   [nodeA@hostA, nodeB@hostB]).
@@ -154,7 +154,7 @@ nodeA@hostA> mnesia:change_config(extra_db_nodes,
       <p>After that the above have been repeated on <c>nodeB</c> we must
         first make sure that both nodes will use the same domain name, then
         we can install Orber:</p>
-      <code type="none">
+      <code type="erl">
 nodeA@hostA> corba:orb_init([{domain, "MyRAMMultiNodeORB"}]).
 nodeA@hostA> orber:install([nodeA@hostA, nodeB@hostB],
                            [{ifr_storage_type, ram_copies}]).
@@ -162,7 +162,7 @@ nodeA@hostA> orber:start().
       </code>
       <p>Note that you can only invoke <c>orber:install/1/2</c> on one of the
         nodes. Now we can start Orber on the other node:</p>
-      <code type="none">
+      <code type="erl">
 nodeB@hostB> corba:orb_init([{domain, "MyRAMMultiNodeORB"}]).
 nodeB@hostB> orber:start().
       </code>
@@ -173,7 +173,7 @@ nodeB@hostB> orber:start().
       <p>As for RAM based multi-node Orber installations, the Erlang distribution
         must be started (e.g. erl -sname nodeA). The major difference is that
         when it is disk based a Mnesia schema must be created:</p>
-      <code type="none">
+      <code type="erl">
 nodeA@hostA> mnesia:create_schema([nodeA@hostA, nodeB@hostB]).
 nodeA@hostA> mnesia:start().
       </code>
@@ -183,7 +183,7 @@ nodeA@hostA> mnesia:start().
         <c>mnesia:start()</c>) on <c>nodeB</c>.</p>
       <p>After Mnesia have been started on all nodes, you must confirm that all 
         nodes have the same domain name, then Orber is ready to be installed:</p>
-      <code type="none">
+      <code type="erl">
 nodeA@hostA> corba:orb_init([{domain, "MyDiskMultiNodeORB"}]).
 nodeA@hostA> orber:install([nodeA@hostA, nodeB@hostB],
                            [{ifr_storage_type, disc_copies}]).
@@ -191,7 +191,7 @@ nodeA@hostA> orber:start().
       </code>
       <p>Note that you can only invoke <c>orber:install/1/2</c> on one of the
         nodes. Now we can start Orber on the other node:</p>
-      <code type="none">
+      <code type="erl">
 nodeB@hostB> corba:orb_init([{domain, "MyDiskMultiNodeORB"}]).
 nodeB@hostB> orber:start().
       </code>
@@ -918,7 +918,7 @@ TCP Firewall With NAT</icaption>
       verify whether access would be granted or not. For example, if Orber would
       be started with the ACL <c>[{tcp_out, "10.1.1.1/8#4001/5001"}]</c>, then 
       <c>orber_acl:match/2</c> would behave as follows:</p>
-    <code type="none">
+    <code type="erl">
 erl> orber_acl:match({11,1,1,1}, tcp_out).
 false
 
@@ -967,7 +967,7 @@ erl> orber_acl:match({10,1,1,1}, tcp_out, true).
       the configuration of the underlying system.</p>
     <p>Adding the interface context, for generated stubs/skeletons, is done in the 
       following way:</p>
-    <code type="none">
+    <code type="erl">
 Ctx = #'IOP_ServiceContext'{context_id = ?ORBER_GENERIC_CTX_ID, 
                             context_data = {interface, "10.0.0.1"}},
 'CosNaming_NamingContext':resolve(NS, [{context, [Ctx]}], Name),
diff --git a/lib/orber/doc/src/ch_interceptors.xml b/lib/orber/doc/src/ch_interceptors.xml
index 392fe7de82..4a9f8e69ca 100644
--- a/lib/orber/doc/src/ch_interceptors.xml
+++ b/lib/orber/doc/src/ch_interceptors.xml
@@ -4,7 +4,7 @@
 <chapter>
    <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -121,7 +121,7 @@ The Invocation Order of Interceptor Functions.</icaption>
       we store which objects the clients are allowed to invoke operations on
       and <c>ChecksumModule</c> determines which module we should use to handle
       the checksums. </p>
-    <code type="none">
+    <code type="erl">
 new_in_connection(Arg, Host, Port) ->
     %% Since we only use one interceptor we do not care about the
     %% input Arg since it is set do undefined by Orber.
@@ -141,7 +141,7 @@ new_in_connection(Arg, Host, Port) ->
     <p>When a new request comes in the first interceptor function to be invoked is
       <c>in_request_encoded</c>. We will remove the checksum from the coded
       request body in the following way:</p>
-    <code type="none">
+    <code type="erl">
 in_request_encoded({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
     NewBin = ChecksumModule:remove_checksum(Bin),
     {NewBin, Extra}.
@@ -154,7 +154,7 @@ in_request_encoded({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
       good throughput.</p>
     <p>If we want to we can restrict any clients to only use a subset of operations
       exported by a server:</p>
-    <code type="none">
+    <code type="erl">
 in_request({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Params, Extra) ->
     case ets:lookup(ObjTable, {ObjKey, Op}) of
          [] ->
@@ -166,13 +166,13 @@ in_request({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Params, Extra) ->
     <p>At this point Orber are now ready to invoke the operation on the target 
       object. Since we do not care about what the reply is the <c>out_reply</c>
       function do nothing, i.e.:</p>
-    <code type="none">
+    <code type="erl">
 out_reply(_, _, _, _, Reply, Extra) ->
     {Reply, Extra}.
     </code>
     <p>If the client side ORB expects a checksum to be added to the reply we
       add it by using:</p>
-    <code type="none">
+    <code type="erl">
 out_reply_encoded({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
     NewBin = ChecksumModule:add_checksum(Bin),
     {NewBin, Extra}.
@@ -183,8 +183,7 @@ out_reply_encoded({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
     </warning>
     <p>For outgoing requests the principle is the same. Hence, it is not further
       described here. The complete interceptor module would look like:</p>
-    <code type="none">
-
+    <code type="erl">
 -module(myInterceptor).
 
 %% Interceptor functions.
diff --git a/lib/orber/doc/src/ch_naming_service.xml b/lib/orber/doc/src/ch_naming_service.xml
index bcbab2a597..991402ae86 100644
--- a/lib/orber/doc/src/ch_naming_service.xml
+++ b/lib/orber/doc/src/ch_naming_service.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -116,7 +116,7 @@ Figure 1: Contextual object relationships using the Naming Service.</icaption>
       <title>Fetch Initial Reference to the Naming Service</title>
       <p>In order to use the naming service you have to fetch an 
         initial reference to it. This is done with:</p>
-      <code type="none">
+      <code type="erl">
 NS = corba:resolve_initial_references("NameService").
       </code>
       <note>
@@ -128,14 +128,14 @@ NS = corba:resolve_initial_references("NameService").
       <title>Creating a Naming Context</title>
       <p>There are two functions for creating a naming context.
         The first function, which only creates a naming context object is:</p>
-      <code type="none">
+      <code type="erl">
 NC = 'CosNaming_NamingContext':new_context(NS).
       </code>
       <p>The other function creates a naming context and binds it to a name in 
         an already existing naming context (the initial context in this 
         example):
         </p>
-      <code type="none">
+      <code type="erl">
 NC = 'CosNaming_NamingContext':bind_new_context(NS, lname:new(["new"])).
       </code>
     </section>
@@ -150,19 +150,19 @@ NC = 'CosNaming_NamingContext':bind_new_context(NS, lname:new(["new"])).
       <list type="ordered">
         <item>
           <p>Use the naming library functions to create a name</p>
-          <code type="none">
+          <code type="erl">
 Name = lname:new(["object"]).
           </code>
         </item>
         <item>
           <p>Use CosNaming::NamingContext::bind() to bind a name to an object</p>
-          <code type="none">
+          <code type="erl">
 'CosNaming_NamingContext':bind(Sc, Name, Object).
           </code>
         </item>
         <item>
           <p>Use CosNaming::NamingContext::unbind() to remove the NameBinding from an object</p>
-          <code type="none">
+          <code type="erl">
 'CosNaming_NamingContext':unbind(Sc, Name).
           </code>
         </item>
@@ -180,19 +180,19 @@ Name = lname:new(["object"]).
       <list type="ordered">
         <item>
           <p>Use the naming library functions to create a name path:</p>
-          <code type="none">
+          <code type="erl">
 Name = lname:new(["workgroup", "services"]).
           </code>
         </item>
         <item>
           <p>Use CosNaming::NamingContext::resolve() to to resolve the name to an object</p>
-          <code type="none">
+          <code type="erl">
 Sc = 'CosNaming_NamingContext':resolve(NS, Name).
           </code>
         </item>
       </list>
       <p>An alternative is to use:</p>
-      <code type="none">
+      <code type="erl">
 Sc = corba:string_to_object("corbaname:rir:/NameService#workgroup/services/").
       </code>
       <p>The <c>corbaname</c> schema is described further in the Interoperable
@@ -205,7 +205,7 @@ Sc = corba:string_to_object("corbaname:rir:/NameService#workgroup/services/").
         <item>
           <p>Use CosNaming::NamingContext::list() to list all the bindings in a context</p>
           <p>The following code retrieves and lists up to 10 bindings from a context.</p>
-          <code type="none">
+          <code type="erl">
 {BList, BIterator} = 'CosNaming_NamingContext':list(Sc, 10).
 
 lists:foreach(fun({{Id, Kind},BindingType}) -> case BindingType of 
@@ -229,8 +229,8 @@ lists:foreach(fun({{Id, Kind},BindingType}) -> case BindingType of
           <em>must be removed</em> otherwise dangling processes will occur.
           Use <c>CosNaming::BindingIterator::destroy()</c> to remove it.</p>
       </warning>
-      <code type="none">
-      'CosNaming_NamingContext':destroy(BIterator).
+      <code type="erl">
+'CosNaming_NamingContext':destroy(BIterator).
       </code>
     </section>
 
@@ -241,7 +241,7 @@ lists:foreach(fun({{Id, Kind},BindingType}) -> case BindingType of
       <list type="ordered">
         <item>
           <p>Use CosNaming::NamingContext::destroy() to remove a NamingContext</p>
-          <code type="none">
+          <code type="erl">
 'CosNaming_NamingContext':destroy(Sc).
           </code>
         </item>
@@ -318,13 +318,13 @@ lists:foreach(fun({{Id, Kind},BindingType}) -> case BindingType of
         listed below, they should be associated with. The <c>NameService</c>
         key may <em>not</em> be changed in Orber. If you want to add one of the
         reserved keys as an initial service, simply use:</p>
-      <code type="none">
+      <code type="erl">
 1> Factory = cosNotificationApp:start_global_factory().
 2> corba:add_initial_service("NotificationService", Factory).
       </code>
       <p>This object can then be easily resolved by any other ORB, supporting 
         the Interoperable Naming Service, by using:</p>
-      <code type="none">
+      <code type="erl">
 3> NF = corba:string_to_object("corbaloc::[email protected]:4001/NotificationService").
       </code>
       <table>
@@ -438,13 +438,13 @@ lists:foreach(fun({{Id, Kind},BindingType}) -> case BindingType of
         <tcaption>Stringified Name representation</tcaption>
       </table>
       <p>After creating a stringified Name we can either use:</p>
-      <code type="none">
+      <code type="erl">
 NameStr = "org.erlang",
 NS      = corba:resolve_initial_references("NameService"),
 Obj     = 'CosNaming_NamingContextExt':resolve_str(NS, NameStr),
       </code>
       <p>or concatenate the Name String using:</p>
-      <code type="none">
+      <code type="erl">
 NameStr = "Swedish/Soccer/Champions",
 Address = "corbaname:iiop:[email protected]:2000/NameService",
 NS      = corba:resolve_initial_references("NameService"),
diff --git a/lib/orber/doc/src/ch_orberweb.xml b/lib/orber/doc/src/ch_orberweb.xml
index be1d7fb983..c9dcc382e6 100644
--- a/lib/orber/doc/src/ch_orberweb.xml
+++ b/lib/orber/doc/src/ch_orberweb.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -208,8 +208,7 @@
     <p>You may choose to start OrberWeb on node, on which Orber is running or not. But
       the Erlang distribution must be started (e.g. by using -sname aNodeName). Now, all 
       you have to do is to invoke:</p>
-    <code type="none">
-    
+    <code type="none">    
 erl> webtool:start().
 WebTool is available at http://localhost:8888/
 Or  http://127.0.0.1:8888/
diff --git a/lib/orber/doc/src/ch_stubs.xml b/lib/orber/doc/src/ch_stubs.xml
index 144191a66a..9290c127f9 100644
--- a/lib/orber/doc/src/ch_stubs.xml
+++ b/lib/orber/doc/src/ch_stubs.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2016</year>
+      <year>1999</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -158,7 +158,7 @@ up_to_date
         <p>Arguments and Replies are determined by the IDL-code and, hence, not
           further described here.</p>
       </note>
-      <code type="none">
+      <code type="erl">
 %%%-----------------------------------------------------------
 %%% File    : Module_Interface_impl.erl
 %%% Author  : 
diff --git a/lib/orber/doc/src/corba.xml b/lib/orber/doc/src/corba.xml
index d89f035dba..fbfb55f2f2 100644
--- a/lib/orber/doc/src/corba.xml
+++ b/lib/orber/doc/src/corba.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -370,12 +370,12 @@ Example:
       <desc>
         <p>This function takes a <c>corbaname</c>, <c>corbaloc</c> or an IOR on the
           external string representation and returns the object reference.</p>
-        <p>To lookup the NameService reference, simply use
-          <c>"corbaloc:iiop:[email protected]:4001/NameService"</c></p>
-        <p>We can also resolve an object from the NameService by using
-          <c>"corbaname:iiop:[email protected]:4001/NameService#org/Erlang/MyObj"</c></p>
-        <p>To lookup the NameService reference with an IPv6 address, simply use
-          <c>"corbaloc:iiop:1.2@[FEC1:0:3:0:0312:44AF:FAB1:3D01]:4001/NameService"</c></p>
+        <p>To lookup the NameService reference, simply use:</p>
+        <code>corbaloc:iiop:[email protected]:4001/NameService</code>
+        <p>We can also resolve an object from the NameService by using:</p>
+        <code>corbaname:iiop:[email protected]:4001/NameService#org/Erlang/MyObj</code>
+        <p>To lookup the NameService reference with an IPv6 address, simply use:</p>
+        <code>corbaloc:iiop:1.2@[FEC1:0:3:0:0312:44AF:FAB1:3D01]:4001/NameService</code>
         <p>For more information about <c>corbaname</c> and <c>corbaloc</c>, see
           the User's Guide (Interoperable Naming Service).</p>
         <p>The <em>configuration</em> context is used to override the global
diff --git a/lib/orber/doc/src/fixed.xml b/lib/orber/doc/src/fixed.xml
index a751476cf7..ef4d1bd604 100644
--- a/lib/orber/doc/src/fixed.xml
+++ b/lib/orber/doc/src/fixed.xml
@@ -4,8 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year>
-      <year>2016</year>
+      <year>2002</year><year>2017</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -38,8 +37,8 @@
   <description>
     <p>This module contains functions that gives an interface to the CORBA fixed type.</p>
     <p>The type <c>Fixed</c> used below is defined as:</p>
-    <code type="none">
-      -record(fixed, {digits, scale, value}).
+    <code type="erl">
+-record(fixed, {digits, scale, value}).
     </code>
     <p>where <c>digits</c> is the total amount of digits it consists of and 
       <c>scale</c> is the number of fractional digits. The <c>value</c> field
diff --git a/lib/orber/doc/src/lname.xml b/lib/orber/doc/src/lname.xml
index 09d6859777..c0c9be1a85 100644
--- a/lib/orber/doc/src/lname.xml
+++ b/lib/orber/doc/src/lname.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -44,14 +44,14 @@
       the Names are represented as standard Erlang lists and therefor will be removed 
       by the garbage collector when not in use.</p>
     <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="none">
-      -record('CosNaming_NameComponent', {id, kind=""}).
+    <code type="erl">
+-record('CosNaming_NameComponent', {id, kind=""}).
     </code>
     <p><c>id</c> and <c>kind</c> are strings. </p>
     <p>The record is defined in the file <c>CosNaming.hrl</c> and it 
       is included with:</p>
-    <code type="none">
-      -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
+    <code type="erl">
+-include_lib("orber/COSS/CosNaming/CosNaming.hrl").
     </code>
   </description>
   <funcs>
diff --git a/lib/orber/doc/src/lname_component.xml b/lib/orber/doc/src/lname_component.xml
index 631e5d0244..8b8001c0fb 100644
--- a/lib/orber/doc/src/lname_component.xml
+++ b/lib/orber/doc/src/lname_component.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -44,14 +44,14 @@
       function because the NameComponents are represented as Erlang records and 
       therefor will be removed by the garbage collector when not in use.</p>
     <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="none">
-      -record('CosNaming_NameComponent', {id, kind=""}).
+    <code type="erl">
+-record('CosNaming_NameComponent', {id, kind=""}).
     </code>
     <p><c>id</c> and <c>kind</c> are strings. </p>
     <p>The record is defined in the file <c>CosNaming.hrl</c> and it 
       is included with:</p>
-    <code type="none">
-      -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
+    <code type="erl">
+-include_lib("orber/COSS/CosNaming/CosNaming.hrl").
     </code>
   </description>
   <funcs>