Replaced <tt> by <code> in Slice comments

19 files changed, 129 insertions, 129 deletions

diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice
index bd01298167b..d1f2a0c0066 100644
--- a/slice/Glacier2/Router.ice
+++ b/slice/Glacier2/Router.ice
@@ -46,7 +46,7 @@ exception SessionNotExistException
 
 /**
  *
- * The Glacier2 specialization of the <tt>Ice::Router</tt> interface.
+ * The Glacier2 specialization of the <code>Ice::Router</code> interface.
  *
  **/
 interface Router extends Ice::Router
diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice
index da6d33abecb..84adde8dc9a 100644
--- a/slice/Ice/Communicator.ice
+++ b/slice/Ice/Communicator.ice
@@ -139,8 +139,8 @@ local interface Communicator
     /**
      *
      * Convert a stringified proxy into a proxy. For example,
-     * <tt>MyCategory/MyObject:tcp -h some_host -p
-     * 10000</tt> creates a proxy that refers to the Ice object
+     * <code>MyCategory/MyObject:tcp -h some_host -p
+     * 10000</code> creates a proxy that refers to the Ice object
      * having an identity with a name "MyObject" and a category
      * "MyCategory", with the server running on host "some_host", port
      * 10000. If the stringified proxy does not parse correctly, the
@@ -150,7 +150,7 @@ local interface Communicator
      *
      * @param str The stringified proxy to convert into a proxy.
      *
-     * @return The proxy, or nil if <tt>str</tt> is an empty string.
+     * @return The proxy, or nil if <code>str</code> is an empty string.
      *
      * @see #proxyToString
      *
@@ -164,7 +164,7 @@ local interface Communicator
      * @param obj The proxy to convert into a stringified proxy.
      *
      * @return The stringified proxy, or an empty string if
-     * <tt>obj</tt> is nil.
+     * <code>obj</code> is nil.
      *
      * @see #stringToProxy
      *
@@ -174,11 +174,11 @@ local interface Communicator
     /**
      *
      * Convert a set of proxy properties into a proxy. The "base"
-     * name supplied in the <tt>property</tt> argument refers to a
+     * name supplied in the <code>property</code> argument refers to a
      * property containing a stringified proxy, such as
-     * <tt>MyProxy=id:tcp -h localhost -p 10000</tt>. Additional
+     * <code>MyProxy=id:tcp -h localhost -p 10000</code>. Additional
      * properties configure local settings for the proxy, such as
-     * <tt>MyProxy.PreferSecure=1</tt>. The "Properties"
+     * <code>MyProxy.PreferSecure=1</code>. The "Properties"
      * appendix in the Ice manual describes each of the supported
      * proxy properties.
      *
@@ -233,7 +233,7 @@ local interface Communicator
     /**
      *
      * Create a new object adapter. The endpoints for the object
-     * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.
+     * adapter are taken from the property <code><em>name</em>.Endpoints</code>.
      *
      * It is legal to create an object adapter with the empty string as
      * its name. Such an object adapter is accessible via bidirectional
@@ -257,7 +257,7 @@ local interface Communicator
     /**
      *
      * Create a new object adapter with endpoints. This operation sets
-     * the property <tt><em>name</em>.Endpoints</tt>, and then calls
+     * the property <code><em>name</em>.Endpoints</code>, and then calls
      * {@link #createObjectAdapter}. It is provided as a convenience
      * function.
      *
@@ -431,7 +431,7 @@ local interface Communicator
      * operation has no effect on existing proxies.
      *
      * You can also set a router for an individual proxy
-     * by calling the operation <tt>ice_router</tt> on the proxy.
+     * by calling the operation <code>ice_router</code> on the proxy.
      *
      * @param rtr The default router to use for this communicator.
      *
@@ -463,7 +463,7 @@ local interface Communicator
      * object adapters.
      *
      * You can also set a locator for an individual proxy by calling the
-     * operation <tt>ice_locator</tt> on the proxy, or for an object adapter
+     * operation <code>ice_locator</code> on the proxy, or for an object adapter
      * by calling {@link ObjectAdapter#setLocator} on the object adapter.
      *
      * @param loc The default locator to use for this communicator.
diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice
index a4d91b0ec7f..93ef9093220 100644
--- a/slice/Ice/Current.ice
+++ b/slice/Ice/Current.ice
@@ -26,9 +26,9 @@ module Ice
 
 /**
  *
- * A request context. <tt>Context</tt> is used to transmit metadata about a
+ * A request context. <code>Context</code> is used to transmit metadata about a
  * request from the server to the client, such as Quality-of-Service
- * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
+ * (QoS) parameters. Each operation on the client has a <code>Context</code> as
  * its implicit final parameter.
  *
  **/
@@ -46,37 +46,37 @@ dictionary<string, string> Context;
 enum OperationMode
 {
     /**
-     * Ordinary operations have <tt>Normal</tt> mode.  These operations
+     * Ordinary operations have <code>Normal</code> mode.  These operations
      * modify object state; invoking such an operation twice in a row
      * has different semantics than invoking it once. The Ice run time
      * guarantees that it will not violate at-most-once semantics for
-     * <tt>Normal</tt> operations.
+     * <code>Normal</code> operations.
      */
     Normal,
 
     /**
-     * Operations that use the Slice <tt>nonmutating</tt> keyword must not
+     * Operations that use the Slice <code>nonmutating</code> keyword must not
      * modify object state. For C++, nonmutating operations generate
-     * <tt>const</tt> member functions in the skeleton. In addition, the Ice
+     * <code>const</code> member functions in the skeleton. In addition, the Ice
      * run time will attempt to transparently recover from certain
      * run-time errors by re-issuing a failed request and propagate
      * the failure to the application only if the second attempt
      * fails.
      *
-     * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
-     * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
-     * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
-     * member functions, use the <tt>\["cpp:const"]</tt> metadata
+     * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
+     * <code>idempotent</code> keyword instead. For C++, to retain the mapping
+     * of <code>nonmutating</code> operations to C++ <code>const</code>
+     * member functions, use the <code>\["cpp:const"]</code> metadata
      * directive.
      */
     \Nonmutating,
 
     /**
-     * Operations that use the Slice <tt>idempotent</tt> keyword can modify
+     * Operations that use the Slice <code>idempotent</code> keyword can modify
      * object state, but invoking an operation twice in a row must
      * result in the same object state as invoking it once.  For
-     * example, <tt>x = 1</tt> is an idempotent statement,
-     * whereas <tt>x += 1</tt> is not. For idempotent
+     * example, <code>x = 1</code> is an idempotent statement,
+     * whereas <code>x += 1</code> is not. For idempotent
      * operations, the Ice run-time uses the same retry behavior
      * as for nonmutating operations in case of a potentially
      * recoverable error.
@@ -87,8 +87,8 @@ enum OperationMode
 /**
  *
  * Information about the current method invocation for servers. Each
- * operation on the server has a <tt>Current</tt> as its implicit final
- * parameter. <tt>Current</tt> is mostly used for Ice services. Most
+ * operation on the server has a <code>Current</code> as its implicit final
+ * parameter. <code>Current</code> is mostly used for Ice services. Most
  * applications ignore this parameter.
  *
  **/
diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice
index 20334af5f1c..661c5c9efe0 100644
--- a/slice/Ice/EndpointTypes.ice
+++ b/slice/Ice/EndpointTypes.ice
@@ -28,11 +28,11 @@ module Ice
 local enum EndpointSelectionType
 {
     /**
-     * <tt>Random</tt> causes the endpoints to be arranged in a random order.
+     * <code>Random</code> causes the endpoints to be arranged in a random order.
      */
     Random,
     /**
-     * <tt>Ordered</tt> forces the Ice run time to use the endpoints in the
+     * <code>Ordered</code> forces the Ice run time to use the endpoints in the
      * order they appeared in the proxy.
      */
     Ordered
diff --git a/slice/Ice/ImplicitContext.ice b/slice/Ice/ImplicitContext.ice
index 81a904d9348..a24c323bdc3 100644
--- a/slice/Ice/ImplicitContext.ice
+++ b/slice/Ice/ImplicitContext.ice
@@ -27,24 +27,24 @@ module Ice
  * An interface to associate implict contexts with communicators.
  *
  * When you make a remote invocation without an explicit context parameter,
- * Ice uses the per-proxy context (if any) combined with the <tt>ImplicitContext</tt>
+ * Ice uses the per-proxy context (if any) combined with the <code>ImplicitContext</code>
  * associated with the communicator.
  *
- * Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
- * used depends on the value of the <tt>Ice.ImplicitContext</tt> property.
+ * Ice provides several implementations of <code>ImplicitContext</code>. The implementation
+ * used depends on the value of the <code>Ice.ImplicitContext</code> property.
  * <dl>
- * <dt><tt>None</tt> (default)</dt>
+ * <dt><code>None</code> (default)</dt>
  * <dd>No implicit context at all.</dd>
- * <dt><tt>PerThread</tt></dt>
+ * <dt><code>PerThread</code></dt>
  * <dd>The implementation maintains a context per thread.</dd>
- * <dt><tt>Shared</tt></dt>
+ * <dt><code>Shared</code></dt>
  * <dd>The implementation maintains a single context shared by all threads.</dd>
  * </dl>
  *
- * <tt>ImplicitContext</tt> also provides a number of operations to create, update or retrieve
+ * <code>ImplicitContext</code> also provides a number of operations to create, update or retrieve
  * an entry in the underlying context without first retrieving a copy of the entire
- * context. These operations correspond to a subset of the <tt>java.util.Map</tt> methods,
- * with <tt>java.lang.Object</tt> replaced by <tt>string</tt> and null replaced by the empty-string.
+ * context. These operations correspond to a subset of the <code>java.util.Map</code> methods,
+ * with <code>java.lang.Object</code> replaced by <code>string</code> and null replaced by the empty-string.
  *
  **/
 local interface ImplicitContext
diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice
index 8ec3d057306..b1a34a3ac07 100644
--- a/slice/Ice/LocalException.ice
+++ b/slice/Ice/LocalException.ice
@@ -137,8 +137,8 @@ local exception NotRegisteredException
  * The operation can only be invoked with a twoway request.
  *
  * This exception is raised if an attempt is made to invoke an
- * operation with <tt>ice_oneway</tt>, <tt>ice_batchOneway</tt>, <tt>ice_datagram</tt>,
- * or <tt>ice_batchDatagram</tt> and the operation has a return value,
+ * operation with <code>ice_oneway</code>, <code>ice_batchOneway</code>, <code>ice_datagram</code>,
+ * or <code>ice_batchDatagram</code> and the operation has a return value,
  * out-parameters, or an exception specification.
  *
  **/
@@ -158,10 +158,10 @@ local exception TwowayOnlyException
  * An attempt was made to clone a class that does not support
  * cloning.
  *
- * This exception is raised if <tt>ice_clone</tt> is called on
+ * This exception is raised if <code>ice_clone</code> is called on
  * a class that is derived from an abstract Slice class (that is,
  * a class containing operations), and the derived class does not
- * provide an implementation of the <tt>ice_clone</tt> operation (C++ only).
+ * provide an implementation of the <code>ice_clone</code> operation (C++ only).
  *
  **/
 ["cpp:ice_print"]
@@ -174,8 +174,8 @@ local exception CloneNotImplementedException
  * This exception is raised if an operation call on a server raises an
  * unknown exception. For example, for C++, this exception is raised
  * if the server throws a C++ exception that is not directly or
- * indirectly derived from <tt>Ice::LocalException</tt> or
- * <tt>Ice::UserException</tt>.
+ * indirectly derived from <code>Ice::LocalException</code> or
+ * <code>Ice::UserException</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -198,7 +198,7 @@ local exception UnknownException
  * by the server as {@link UnknownLocalException}. The only exception to this
  * rule are all exceptions derived from {@link RequestFailedException},
  * which are transmitted by the Ice protocol even though they are
- * declared <tt>local</tt>.
+ * declared <code>local</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -212,13 +212,13 @@ local exception UnknownLocalException extends UnknownException
  *
  * This exception is raised if an operation raises a
  * user exception that is not declared in the exception's
- * <tt>throws</tt> clause. Such undeclared exceptions are
+ * <code>throws</code> clause. Such undeclared exceptions are
  * not transmitted from the server to the client by the Ice
  * protocol, but instead the client just gets an
  * {@link UnknownUserException}. This is necessary in order to not violate
  * the contract established by an operation's signature: Only local
  * exceptions and user exceptions declared in the
- * <tt>throws</tt> clause can be raised.
+ * <code>throws</code> clause can be raised.
  *
  **/
 ["cpp:ice_print"]
@@ -428,7 +428,7 @@ local exception IllegalServantException
  * This exception is raised if a request failed. This exception, and
  * all exceptions derived from {@link RequestFailedException}, are
  * transmitted by the Ice protocol, even though they are declared
- * <tt>local</tt>.
+ * <code>local</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -492,10 +492,10 @@ local exception SyscallException
     /**
      *
      * The error number describing the system exception. For C++ and
-     * Unix, this is equivalent to <tt>errno</tt>. For C++
+     * Unix, this is equivalent to <code>errno</code>. For C++
      * and Windows, this is the value returned by
-     * <tt>GetLastError()</tt> or
-     * <tt>WSAGetLastError()</tt>.
+     * <code>GetLastError()</code> or
+     * <code>WSAGetLastError()</code>.
      *
      **/
     int error = 0; // Don't use errno, as errno is usually a macro.
@@ -582,9 +582,9 @@ local exception DNSException
     /**
      *
      * The error number describing the DNS problem. For C++ and Unix,
-     * this is equivalent to <tt>h_errno</tt>. For C++ and
+     * this is equivalent to <code>h_errno</code>. For C++ and
      * Windows, this is the value returned by
-     * <tt>WSAGetLastError()</tt>.
+     * <code>WSAGetLastError()</code>.
      *
      **/
     int error = 0; // Don't use h_errno, as h_errno is usually a macro.
@@ -944,7 +944,7 @@ local exception UnexpectedObjectException extends MarshalException
  *
  * This exception is raised when Ice receives a request or reply
  * message whose size exceeds the limit specified by the
- * <tt>Ice.MessageSizeMax</tt> property.
+ * <code>Ice.MessageSizeMax</code> property.
  *
  **/
 ["cpp:ice_print"]
diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice
index e4426951cc1..af02273c9be 100644
--- a/slice/Ice/ObjectAdapter.ice
+++ b/slice/Ice/ObjectAdapter.ice
@@ -197,7 +197,7 @@ local interface ObjectAdapter
 
     /**
      *
-     * Like {@link #add}, but with a facet. Calling <tt>add(servant, id)</tt>
+     * Like {@link #add}, but with a facet. Calling <code>add(servant, id)</code>
      * is equivalent to calling {@link #addFacet} with an empty facet.
      *
      * @param servant The servant to add.
@@ -224,7 +224,7 @@ local interface ObjectAdapter
      * Add a servant to this object adapter's Active Servant Map,
      * using an automatically generated UUID as its identity. Note that
      * the generated UUID identity can be accessed using the proxy's
-     * <tt>ice_getIdentity</tt> operation.
+     * <code>ice_getIdentity</code> operation.
      *
      * @param servant The servant to add.
      *
@@ -243,7 +243,7 @@ local interface ObjectAdapter
     /**
      *
      * Like {@link #addWithUUID}, but with a facet. Calling
-     * <tt>addWithUUID(servant)</tt> is equivalent to calling
+     * <code>addWithUUID(servant)</code> is equivalent to calling
      * {@link #addFacetWithUUID} with an empty facet.
      *
      * @param servant The servant to add.
@@ -325,7 +325,7 @@ local interface ObjectAdapter
 
     /**
      *
-     * Like {@link #remove}, but with a facet. Calling <tt>remove(id)</tt>
+     * Like {@link #remove}, but with a facet. Calling <code>remove(id)</code>
      * is equivalent to calling {@link #removeFacet} with an empty facet.
      *
      * @param id The identity of the Ice object that is implemented by
@@ -400,7 +400,7 @@ local interface ObjectAdapter
 
     /**
      *
-     * Like {@link #find}, but with a facet. Calling <tt>find(id)</tt>
+     * Like {@link #find}, but with a facet. Calling <code>find(id)</code>
      * is equivalent to calling {@link #findFacet} with an empty
      * facet.
      *
diff --git a/slice/Ice/ObjectFactory.ice b/slice/Ice/ObjectFactory.ice
index e4bd4bda195..b15a1cdbdde 100644
--- a/slice/Ice/ObjectFactory.ice
+++ b/slice/Ice/ObjectFactory.ice
@@ -35,10 +35,10 @@ local interface ObjectFactory
      * Create a new object for a given object type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for interfaces of type <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for interfaces of type <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * <p class="Note">The leading "<tt>::</tt>" is required.
+     * <p class="Note">The leading "<code>::</code>" is required.
      *
      * @param type The object type.
      *
diff --git a/slice/Ice/Plugin.ice b/slice/Ice/Plugin.ice
index e9e84c66224..a4d4c1eb940 100644
--- a/slice/Ice/Plugin.ice
+++ b/slice/Ice/Plugin.ice
@@ -64,7 +64,7 @@ local interface PluginManager
      * Initialize the configured plug-ins. The communicator automatically initializes
      * the plug-ins by default, but an application may need to interact directly with
      * a plug-in prior to initialization. In this case, the application must set
-     * <tt>Ice.InitPlugins=0</tt> and then invoke {@link #initializePlugins}
+     * <code>Ice.InitPlugins=0</code> and then invoke {@link #initializePlugins}
      * manually. The plug-ins are initialized in the order in which they are loaded.
      * If a plug-in raises an exception during initialization, the communicator
      * invokes destroy on the plug-ins that have already been initialized.
diff --git a/slice/Ice/Properties.ice b/slice/Ice/Properties.ice
index ef248a858ab..215ee7191ad 100644
--- a/slice/Ice/Properties.ice
+++ b/slice/Ice/Properties.ice
@@ -170,7 +170,7 @@ local interface Properties
      * Get a sequence of command-line options that is equivalent to
      * this property set. Each element of the returned sequence is
      * a command-line option of the form
-     * <tt>--<em>key</em>=<em>value</em></tt>.
+     * <code>--<em>key</em>=<em>value</em></code>.
      *
      * @return The command line options for this property set.
      *
@@ -181,12 +181,12 @@ local interface Properties
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with
-     * <tt>--<em>prefix</em>.</tt> are
+     * <code>--<em>prefix</em>.</code> are
      * converted into properties. If the prefix is empty, all options
-     * that begin with <tt>--</tt> are converted to properties.
+     * that begin with <code>--</code> are converted to properties.
      *
      * @param prefix The property prefix, or an empty string to
-     * convert all options starting with <tt>--</tt>.
+     * convert all options starting with <code>--</code>.
      *
      * @param options The command-line options.
      *
@@ -200,8 +200,8 @@ local interface Properties
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with one of the following prefixes
-     * are converted into properties: <tt>--Ice</tt>, <tt>--IceBox</tt>, <tt>--IceGrid</tt>,
-     * <tt>--IcePatch2</tt>, <tt>--IceSSL</tt>, <tt>--IceStorm</tt>, <tt>--Freeze</tt>, and <tt>--Glacier2</tt>.
+     * are converted into properties: <code>--Ice</code>, <code>--IceBox</code>, <code>--IceGrid</code>,
+     * <code>--IcePatch2</code>, <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and <code>--Glacier2</code>.
      *
      * @param options The command-line options.
      *
diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice
index 3d9799a4ea2..731a4b79536 100644
--- a/slice/Ice/Router.ice
+++ b/slice/Ice/Router.ice
@@ -24,7 +24,7 @@ module Ice
 /**
  *
  * The Ice router interface. Routers can be set either globally with
- * {@link Communicator#setDefaultRouter}, or with <tt>ice_router</tt> on specific
+ * {@link Communicator#setDefaultRouter}, or with <code>ice_router</code> on specific
  * proxies.
  *
  **/
diff --git a/slice/Ice/ServantLocator.ice b/slice/Ice/ServantLocator.ice
index 5f8abfb553a..13ef696c708 100644
--- a/slice/Ice/ServantLocator.ice
+++ b/slice/Ice/ServantLocator.ice
@@ -42,25 +42,25 @@ local interface ServantLocator
      * the returned servant into its active servant map. This must be
      * done by the servant locator implementation, if this is desired.
      *
-     * <tt>locate</tt> can throw any user exception. If it does, that exception
+     * <code>locate</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
-     * call <tt>finished</tt>.
+     * If <code>locate</code> throws any exception, the Ice run time does <em>not</em>
+     * call <code>finished</code>.
      *
-     * <p class="Note">If you call <tt>locate</tt> from your own code, you
-     * must also call <tt>finished</tt> when you have finished using the
-     * servant, provided that <tt>locate</tt> returned a non-null servant;
+     * <p class="Note">If you call <code>locate</code> from your own code, you
+     * must also call <code>finished</code> when you have finished using the
+     * servant, provided that <code>locate</code> returned a non-null servant;
      * otherwise, you will get undefined behavior if you use
      * servant locators such as the Freeze Evictor.
      *
      * @param curr Information about the current operation for which
      * a servant is required.
      *
-     * @param cookie A "cookie" that will be passed to <tt>finished</tt>.
+     * @param cookie A "cookie" that will be passed to <code>finished</code>.
      *
      * @return The located servant, or null if no suitable servant has
      * been found.
@@ -78,25 +78,25 @@ local interface ServantLocator
     /**
      *
      * Called by the object adapter after a request has been
-     * made. This operation is only called if <tt>locate</tt> was called
+     * made. This operation is only called if <code>locate</code> was called
      * prior to the request and returned a non-null servant. This
      * operation can be used for cleanup purposes after a request.
      *
-     * <tt>finished</tt> can throw any user exception. If it does, that exception
+     * <code>finished</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If both the operation and <tt>finished</tt> throw an exception, the
-     * exception thrown by <tt>finished</tt> is marshaled back to the client.
+     * If both the operation and <code>finished</code> throw an exception, the
+     * exception thrown by <code>finished</code> is marshaled back to the client.
      *
      * @param curr Information about the current operation call for
-     * which a servant was located by <tt>locate</tt>.
+     * which a servant was located by <code>locate</code>.
      *
-     * @param servant The servant that was returned by <tt>locate</tt>.
+     * @param servant The servant that was returned by <code>locate</code>.
      *
-     * @param cookie The cookie that was returned by <tt>locate</tt>.
+     * @param cookie The cookie that was returned by <code>locate</code>.
      *
      * @throws UserException The implementation can raise a UserException
      * and the run time will marshal it as the result of the invocation.
diff --git a/slice/Ice/ValueFactory.ice b/slice/Ice/ValueFactory.ice
index b9f162379aa..d44f4a21983 100644
--- a/slice/Ice/ValueFactory.ice
+++ b/slice/Ice/ValueFactory.ice
@@ -37,10 +37,10 @@ local interface ValueFactory
      * Create a new value for a given value type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for an interface <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for an interface <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * Note that the leading "<tt>::</tt>" is required.
+     * Note that the leading "<code>::</code>" is required.
      *
      * @param type The value type.
      *
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index 47f40293d6d..de6ae3556a5 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -882,7 +882,7 @@ interface Admin
     /**
      *
      * Add an object to the object registry. IceGrid will get the
-     * object type by calling <tt>ice_id</tt> on the given proxy. The object
+     * object type by calling <code>ice_id</code> on the given proxy. The object
      * must be reachable.
      *
      * @param obj The object to be added to the registry.
@@ -991,7 +991,7 @@ interface Admin
      *
      * @param expr The expression to match against the stringified
      * identities of registered objects. The expression may contain
-     * a trailing wildcard (<tt>*</tt>) character.
+     * a trailing wildcard (<code>*</code>) character.
      *
      * @return All the object infos with a stringified identity
      * matching the given expression.
@@ -1364,7 +1364,7 @@ interface RegistryObserver
 {
     /**
      *
-     * The <tt>registryInit</tt> operation is called after registration of
+     * The <code>registryInit</code> operation is called after registration of
      * an observer to indicate the state of the registries.
      *
      * @param registries The current state of the registries.
@@ -1374,7 +1374,7 @@ interface RegistryObserver
 
     /**
      *
-     * The <tt>nodeUp</tt> operation is called to notify an observer that a node
+     * The <code>nodeUp</code> operation is called to notify an observer that a node
      * came up.
      *
      * @param node The node state.
@@ -1384,7 +1384,7 @@ interface RegistryObserver
 
     /**
      *
-     * The <tt>nodeDown</tt> operation is called to notify an observer that a node
+     * The <code>nodeDown</code> operation is called to notify an observer that a node
      * went down.
      *
      * @param name The node name.
@@ -1411,7 +1411,7 @@ interface NodeObserver
 {
     /**
      *
-     * The <tt>nodeInit</tt> operation indicates the current state
+     * The <code>nodeInit</code> operation indicates the current state
      * of nodes. It is called after the registration of an observer.
      *
      * @param nodes The current state of the nodes.
@@ -1421,7 +1421,7 @@ interface NodeObserver
 
     /**
      *
-     * The <tt>nodeUp</tt> operation is called to notify an observer that a node
+     * The <code>nodeUp</code> operation is called to notify an observer that a node
      * came up.
      *
      * @param node The node state.
@@ -1431,7 +1431,7 @@ interface NodeObserver
 
     /**
      *
-     * The <tt>nodeDown</tt> operation is called to notify an observer that a node
+     * The <code>nodeDown</code> operation is called to notify an observer that a node
      * went down.
      *
      * @param name The node name.
@@ -1441,7 +1441,7 @@ interface NodeObserver
 
     /**
      *
-     * The <tt>updateServer</tt> operation is called to notify an observer that
+     * The <code>updateServer</code> operation is called to notify an observer that
      * the state of a server changed.
      *
      * @param node The node hosting the server.
@@ -1453,7 +1453,7 @@ interface NodeObserver
 
     /**
      *
-     * The <tt>updateAdapter</tt> operation is called to notify an observer that
+     * The <code>updateAdapter</code> operation is called to notify an observer that
      * the state of an adapter changed.
      *
      * @param node The node hosting the adapter.
@@ -1475,7 +1475,7 @@ interface ApplicationObserver
 {
     /**
      *
-     * <tt>applicationInit</tt> is called after the registration
+     * <code>applicationInit</code> is called after the registration
      * of an observer to indicate the state of the registry.
      *
      * @param serial The current serial number of the registry
@@ -1490,7 +1490,7 @@ interface ApplicationObserver
 
     /**
      *
-     * The <tt>applicationAdded</tt> operation is called to notify an observer
+     * The <code>applicationAdded</code> operation is called to notify an observer
      * that an application was added.
      *
      * @param serial The new serial number of the registry database.
@@ -1502,7 +1502,7 @@ interface ApplicationObserver
 
     /**
      *
-     * The <tt>applicationRemoved</tt> operation is called to notify an observer
+     * The <code>applicationRemoved</code> operation is called to notify an observer
      * that an application was removed.
      *
      * @param serial The new serial number of the registry database.
@@ -1514,7 +1514,7 @@ interface ApplicationObserver
 
     /**
      *
-     * The <tt>applicationUpdated</tt> operation is called to notify an observer
+     * The <code>applicationUpdated</code> operation is called to notify an observer
      * that an application was updated.
      *
      * @param serial The new serial number of the registry database.
@@ -1535,7 +1535,7 @@ interface AdapterObserver
 {
     /**
      *
-     * <tt>adapterInit</tt> is called after registration of
+     * <code>adapterInit</code> is called after registration of
      * an observer to indicate the state of the registry.
      *
      * @param adpts The adapters that were dynamically registered
@@ -1546,7 +1546,7 @@ interface AdapterObserver
 
     /**
      *
-     * The <tt>adapterAdded</tt> operation is called to notify an observer when
+     * The <code>adapterAdded</code> operation is called to notify an observer when
      * a dynamically-registered adapter was added.
      *
      * @param info The details of the new adapter.
@@ -1583,7 +1583,7 @@ interface ObjectObserver
 {
     /**
      *
-     * <tt>objectInit</tt> is called after the registration of
+     * <code>objectInit</code> is called after the registration of
      * an observer to indicate the state of the registry.
      *
      * @param objects The objects registered with the {@link Admin}
@@ -1594,7 +1594,7 @@ interface ObjectObserver
 
     /**
      *
-     * The <tt>objectAdded</tt> operation is called to notify an observer when an
+     * The <code>objectAdded</code> operation is called to notify an observer when an
      * object was added to the {@link Admin} interface.
      *
      * @param info The details of the added object.
@@ -1604,7 +1604,7 @@ interface ObjectObserver
 
     /**
      *
-     * <tt>objectUpdated</tt> is called to notify an observer when
+     * <code>objectUpdated</code> is called to notify an observer when
      * an object registered with the {@link Admin} interface was updated.
      *
      * @param info The details of the updated object.
@@ -1614,7 +1614,7 @@ interface ObjectObserver
 
     /**
      *
-     * <tt>objectRemoved</tt> is called to notify an observer when
+     * <code>objectRemoved</code> is called to notify an observer when
      * an object registered with the {@link Admin} interface was removed.
      *
      * @param id The identity of the removed object.
@@ -1628,7 +1628,7 @@ interface ObjectObserver
  * Used by administrative clients to view,
  * update, and receive observer updates from the IceGrid
  * registry. Admin sessions are created either via the {@link Registry}
- * object or via the registry admin <tt>SessionManager</tt> object.
+ * object or via the registry admin <code>SessionManager</code> object.
  *
  * @see Registry
  *
@@ -1765,7 +1765,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1794,7 +1794,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1823,7 +1823,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1852,7 +1852,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1877,7 +1877,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1902,7 +1902,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1928,7 +1928,7 @@ interface AdminSession extends Glacier2::Session
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
index 2d3d930f3b8..ca808cfebab 100644
--- a/slice/IceGrid/FileParser.ice
+++ b/slice/IceGrid/FileParser.ice
@@ -35,7 +35,7 @@ exception ParseException
 
 /**
  *
- * <tt>icegridadmin</tt> provides a {@link FileParser}
+ * <code>icegridadmin</code> provides a {@link FileParser}
  * object to transform XML files into {@link ApplicationDescriptor}
  * objects.
  *
diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice
index 65d5147289d..3d2bd911657 100644
--- a/slice/IceGrid/Session.ice
+++ b/slice/IceGrid/Session.ice
@@ -27,7 +27,7 @@ module IceGrid
  *
  * A session object is used by IceGrid clients to allocate and
  * release objects. Client sessions are created either via the
- * {@link Registry} object or via the registry client <tt>SessionManager</tt>
+ * {@link Registry} object or via the registry client <code>SessionManager</code>
  * object.
  *
  * @see Registry
@@ -89,8 +89,8 @@ interface Session extends Glacier2::Session
 
     /**
      *
-     * Release an object that was allocated using <tt>allocateObjectById</tt> or
-     * <tt>allocateObjectByType</tt>.
+     * Release an object that was allocated using <code>allocateObjectById</code> or
+     * <code>allocateObjectByType</code>.
      *
      * @param id The identity of the object to release.
      *
@@ -108,8 +108,8 @@ interface Session extends Glacier2::Session
     /**
      *
      * Set the allocation timeout. If no objects are available for an
-     * allocation request, a call to <tt>allocateObjectById</tt> or
-     * <tt>allocateObjectByType</tt> will block for the duration of this
+     * allocation request, a call to <code>allocateObjectById</code> or
+     * <code>allocateObjectByType</code> will block for the duration of this
      * timeout.
      *
      * @param timeout The timeout in milliseconds.
diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice
index 439162ef871..53740e93185 100644
--- a/slice/IceGrid/UserAccountMapper.ice
+++ b/slice/IceGrid/UserAccountMapper.ice
@@ -44,10 +44,10 @@ interface UserAccountMapper
      * used by IceGrid nodes to figure out the user account to use
      * to run servers.
      *
-     * @param user The value of the server descriptor's <tt>user</tt>
+     * @param user The value of the server descriptor's <code>user</code>
      * attribute. If this attribute is not defined, and the server's
-     * activation mode is <tt>session</tt>, the default value of
-     * <tt>user</tt> is the session identifier.
+     * activation mode is <code>session</code>, the default value of
+     * <code>user</code> is the session identifier.
      *
      * @return The user account name.
      *
diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice
index 8364477f76f..30a6e0769eb 100644
--- a/slice/IcePatch2/FileServer.ice
+++ b/slice/IcePatch2/FileServer.ice
@@ -39,7 +39,7 @@ sequence<Ice::ByteSeq> ByteSeqSeq;
 
 /**
  *
- * A <tt>partition</tt> argument was not in the range 0-255.
+ * A <code>partition</code> argument was not in the range 0-255.
  *
  **/
 exception PartitionOutOfRangeException
diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice
index 32b2b546638..49845b3147c 100644
--- a/slice/IceStorm/IceStorm.ice
+++ b/slice/IceStorm/IceStorm.ice
@@ -202,7 +202,7 @@ interface Topic
 
     /**
      *
-     * Subscribe with the given <tt>qos</tt> to this topic.  A
+     * Subscribe with the given <code>qos</code> to this topic.  A
      * per-subscriber publisher object is returned.
      *
      * @param theQoS The quality of service parameters for this
@@ -228,7 +228,7 @@ interface Topic
 
     /**
      *
-     * Unsubscribe the given <tt>subscriber</tt>.
+     * Unsubscribe the given <code>subscriber</code>.
      *
      * @param subscriber The proxy of an existing subscriber.
      *
@@ -240,7 +240,7 @@ interface Topic
     /**
      *
      * Create a link to the given topic. All events originating
-     * on this topic will also be sent to <tt>linkTo</tt>.
+     * on this topic will also be sent to <code>linkTo</code>.
      *
      * @param linkTo The topic to link to.
      *
@@ -254,7 +254,7 @@ interface Topic
 
     /**
      *
-     * Destroy the link from this topic to the given topic <tt>linkTo</tt>.
+     * Destroy the link from this topic to the given topic <code>linkTo</code>.
      *
      * @param linkTo The topic to destroy the link to.
      *