diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/slice/Freeze/Evictor.ice | 10 | ||||
| -rw-r--r-- | cpp/slice/Ice/Communicator.ice | 54 | ||||
| -rw-r--r-- | cpp/slice/Ice/Current.ice | 4 | ||||
| -rw-r--r-- | cpp/slice/Ice/ImplicitContext.ice | 27 | ||||
| -rw-r--r-- | cpp/slice/Ice/LocalException.ice | 18 | ||||
| -rw-r--r-- | cpp/slice/Ice/Locator.ice | 8 | ||||
| -rw-r--r-- | cpp/slice/Ice/ObjectAdapter.ice | 52 | ||||
| -rw-r--r-- | cpp/slice/Ice/ObjectFactory.ice | 2 | ||||
| -rw-r--r-- | cpp/slice/Ice/Plugin.ice | 2 | ||||
| -rw-r--r-- | cpp/slice/Ice/Process.ice | 4 | ||||
| -rw-r--r-- | cpp/slice/Ice/Properties.ice | 10 | ||||
| -rw-r--r-- | cpp/slice/Ice/Router.ice | 4 | ||||
| -rw-r--r-- | cpp/slice/Ice/ServantLocator.ice | 4 | ||||
| -rw-r--r-- | cpp/slice/IceBox/IceBox.ice | 4 | ||||
| -rw-r--r-- | cpp/slice/IceGrid/Admin.ice | 20 | ||||
| -rw-r--r-- | cpp/slice/IceGrid/UserAccountMapper.ice | 4 |
16 files changed, 115 insertions, 112 deletions
diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice index 13a3ccb0561..acdad7b4665 100644 --- a/cpp/slice/Freeze/Evictor.ice +++ b/cpp/slice/Freeze/Evictor.ice @@ -198,7 +198,7 @@ local interface Evictor extends Ice::ServantLocator /** * - * Like [add], but with a facet. Calling <literal>add(servant, id)</literal> + * Like [add], but with a facet. Calling <tt>add(servant, id)</tt> * is equivalent to calling [addFacet] with an empty * facet. * @@ -257,7 +257,7 @@ local interface Evictor extends Ice::ServantLocator /** * - * Like [remove], but with a facet. Calling <literal>remove(id)</literal> + * Like [remove], but with a facet. Calling <tt>remove(id)</tt> * is equivalent to calling [removeFacet] with an empty facet. * * @param id The identity of the Ice object. @@ -304,7 +304,7 @@ local interface Evictor extends Ice::ServantLocator /** * - * Like [keep], but with a facet. Calling <literal>keep(id)</literal> + * Like [keep], but with a facet. Calling <tt>keep(id)</tt> * is equivalent to calling [keepFacet] with an empty facet. * * @param id The identity of the Ice object. @@ -345,7 +345,7 @@ local interface Evictor extends Ice::ServantLocator /** * - * Like [release], but with a facet. Calling <literal>release(id)</literal> + * Like [release], but with a facet. Calling <tt>release(id)</tt> * is equivalent to calling [releaseFacet] with an empty facet. * * @param id The identity of the Ice object. @@ -381,7 +381,7 @@ local interface Evictor extends Ice::ServantLocator /** * - * Like [hasObject], but with a facet. Calling <literal>hasObject(id)</literal> + * Like [hasObject], but with a facet. Calling <tt>hasObject(id)</tt> * is equivalent to calling [hasFacet] with an empty * facet. * diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice index ca3808877ff..2b4e549af9c 100644 --- a/cpp/slice/Ice/Communicator.ice +++ b/cpp/slice/Ice/Communicator.ice @@ -67,11 +67,11 @@ local interface Communicator * a deactivated object adapter raise [ObjectAdapterDeactivatedException].) * Subsequent calls to [shutdown] are ignored. * - * <note><para> After [shutdown] returns, no new requests are + * <p class="Note"> After [shutdown] returns, no new requests are * processed. However, requests that have been started before * [shutdown] was called might still be active. You can use * [waitForShutdown] to wait for the completion of all - * requests. </para></note> + * requests.</p> * * @see destroy * @see waitForShutdown @@ -102,8 +102,8 @@ local interface Communicator /** * * Convert a string into a proxy. For example, - * <literal>MyCategory/MyObject:tcp -h some_host -p - * 10000</literal> creates a proxy that refers to the Ice object + * <tt>MyCategory/MyObject:tcp -h some_host -p + * 10000</tt> 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 string does not parse correctly, the operation @@ -173,7 +173,7 @@ local interface Communicator * * Create a new object adapter. The endpoints for the object * adapter are taken from the property - * <literal><replaceable>name</replaceable>.Endpoints</literal>. + * <tt><em>name</em>.Endpoints</tt>. * * @param name The object adapter name. * @@ -190,15 +190,15 @@ local interface Communicator * * Create a new object adapter with endpoints. This operation sets * the property - * <literal><replaceable>name</replaceable>.Endpoints</literal>, + * <tt><em>name</em>.Endpoints</tt>, * and then calls [createObjectAdapter]. It is provided as a - * convenience function.</para> + * convenience function. * - * <para>It is legal to create an object adapter without any endpoints. + * <p>It is legal to create an object adapter without any endpoints. * Such an object adapter cannot be accessed remotely and, therefore, * is accessible only for collocated invocations that originate from the * the same communicator as is used by the adapter. - * space. + * space.</p> * * @param name The object adapter name. * @@ -235,33 +235,33 @@ local interface Communicator * * Add a servant factory to this communicator. Installing a * factory with an id for which a factory is already registered - * throws [AlreadyRegisteredException].</para> + * throws [AlreadyRegisteredException].</p> * - * <para>When unmarshaling an Ice object, the Ice run-time reads the + * <p>When unmarshaling an Ice object, the Ice run-time reads the * most-derived type id off the wire and attempts to create an * instance of the type using a factory. If no instance is created, * either because no factory was found, or because all factories * returned nil, the object is sliced to the next most-derived type * and the process repeats. If no factory is found that can create an - * instance, the Ice run-time throws [NoObjectFactoryException].</para> + * instance, the Ice run-time throws [NoObjectFactoryException].</dd> * - * <para>The following order is used to locate a factory for a type: + * <p>The following order is used to locate a factory for a type:</p> * - * <orderedlist> + * <ol> * - * <listitem><para>The Ice run-time looks for a factory registered - * specifically for the type.</para></listitem> + * <li>The Ice run-time looks for a factory registered + * specifically for the type.</li> * - * <listitem><para>If no instance has been created, the Ice run-time looks + * <li>If no instance has been created, the Ice run-time looks * for the default factory, which is registered with an emtpy type id. - * </para></listitem> + * </li> * - * <listitem><para>If no instance has been created by any of the preceding + * <li>If no instance has been created by any of the preceding * steps, the Ice run-time looks for a factory that may have been * statically generated by the language mapping for non-abstract classes. - * </para></listitem> + * </li> * - * </orderedlist> + * </ol> * * @param factory The factory to add. * @@ -309,8 +309,8 @@ local interface Communicator * created proxies will use this default context. This operation * has no effect on existing proxies. * - * <note><para> You can also set a context for an individual proxy - * by calling the operation [ice_context] on the proxy.</para></note> + * <p class="Note"> You can also set a context for an individual proxy + * by calling the operation [ice_context] on the proxy.</p> * * @param ctx The default context to be set. * @see getDefaultContext @@ -379,8 +379,8 @@ local interface Communicator * default router, null can be used. Note that this * operation has no effect on existing proxies. * - * <note><para> You can also set a router for an individual proxy - * by calling the operation [ice_router] on the proxy.</para></note> + * <note><p> You can also set a router for an individual proxy + * by calling the operation [ice_router] on the proxy.</p></note> * * @param rtr The default router to use for this communicator. * @@ -411,10 +411,10 @@ local interface Communicator * Note that this operation has no effect on existing proxies or * object adapters. * - * <note><para> You can also set a locator for an individual proxy + * <note><p> You can also set a locator for an individual proxy * by calling the operation [ice_locator] on the proxy, or for an * object adapter by calling the operation [setLocator] on the - * object adapter.</para></note> + * object adapter.</p></note> * * @param loc The default locator to use for this communicator. * diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice index dbbcfcab794..2fd44d3e8ad 100644 --- a/cpp/slice/Ice/Current.ice +++ b/cpp/slice/Ice/Current.ice @@ -64,8 +64,8 @@ enum OperationMode * Operations that use the Slice [idempotent] 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, <literal>x = 1</literal> is an idempotent statement, - * whereas <literal>x += 1</literal> is not. For idempotent + * example, <tt>x = 1</tt> is an idempotent statement, + * whereas <tt>x += 1</tt> 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. diff --git a/cpp/slice/Ice/ImplicitContext.ice b/cpp/slice/Ice/ImplicitContext.ice index 339f473073f..00f7ee0b06b 100644 --- a/cpp/slice/Ice/ImplicitContext.ice +++ b/cpp/slice/Ice/ImplicitContext.ice @@ -20,19 +20,22 @@ module Ice * * When you make a remote invocation without an explicit [Context] parameter, * Ice uses the per-proxy [Context] (if any) combined with the [ImplicitContext] - * associated with the communicator. - * Ice provides several implementations of [ImplicitContext]. The implementation + * associated with the communicator.</p> + * <p>Ice provides several implementations of [ImplicitContext]. The implementation * used depends on the value of the Ice.ImplicitContext property. - * <orderedlist> - * <listitem><para>None: (the default) No implicit context at all.</para></listitem> - * <listitem><para>PerThread: The implementation maintains a [Context] per thread - * </para></listitem> - * <listitem><para>Shared: The implementation maintains a single [Context] shared - * by all threads, and serializes access to this [Context].</para></listitem> - * <listitem><para>SharedWithoutLocking: The implementation maintains a single - * [Context] shared by all threads, and does not serialize access to this [Context]. - * </para></listitem> - * </orderedList> + * <dl> + * <dt>None (default)</dt> + * <dd>No implicit context at all.</dd> + * <dt>PerThread</dt> + * <dd>The implementation maintains a [Context] per thread.</dd> + * <dt>Shared</dt> + * <dd>The implementation maintains a single [Context] shared + * by all threads, and serializes access to this [Context].</dd> + * <dt>SharedWithoutLocking</dt> + * <dd>The implementation maintains a single + * [Context] shared by all threads, and does not serialize access to this [Context].</dd> + * </dt> + * </dl> * **/ diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice index b0e5460862a..e915e302604 100644 --- a/cpp/slice/Ice/LocalException.ice +++ b/cpp/slice/Ice/LocalException.ice @@ -145,8 +145,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 <literal>Ice::LocalException</literal> or - * <literal>Ice::UserException</literal>. + * indirectly derived from <tt>Ice::LocalException</tt> or + * <tt>Ice::UserException</tt>. * **/ local exception UnknownException @@ -182,13 +182,13 @@ local exception UnknownLocalException extends UnknownException * * This exception is raised if an operation call on a server raises a * user exception that is not declared in the exception's - * <literal>throws</literal> clause. Such undeclared exceptions are + * <tt>throws</tt> clause. Such undeclared exceptions are * not transmitted from the server to the client by the Ice * protocol, but instead the client just gets an * [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 - * <literal>throws</literal> clause can be raised. + * <tt>throws</tt> clause can be raised. * **/ local exception UnknownUserException extends UnknownException @@ -411,10 +411,10 @@ local exception SyscallException /** * * The error number describing the system exception. For C++ and - * Unix, this is equivalent to <literal>errno</literal>. For C++ + * Unix, this is equivalent to <tt>errno</tt>. For C++ * and Windows, this is the value returned by - * <literal>GetLastError()</literal> or - * <literal>WSAGetLastError()</literal>. + * <tt>GetLastError()</tt> or + * <tt>WSAGetLastError()</tt>. * **/ int error; // Don't use errno, as errno is usually a macro. @@ -484,9 +484,9 @@ local exception DNSException /** * * The error number describing the DNS problem. For C++ and Unix, - * this is equivalent to <literal>h_errno</literal>. For C++ and + * this is equivalent to <tt>h_errno</tt>. For C++ and * Windows, this is the value returned by - * <literal>WSAGetLastError()</literal>. + * <tt>WSAGetLastError()</tt>. * **/ int error; // Don't use h_errno, as h_errno is usually a macro. diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice index 9c53098792e..188ceaaf924 100644 --- a/cpp/slice/Ice/Locator.ice +++ b/cpp/slice/Ice/Locator.ice @@ -71,10 +71,10 @@ interface LocatorRegistry; * lookup adapters and objects. It is also used by servers to get the * locator registry proxy. * - * <note><para> The [Locator] interface is intended to be used by + * <note><p> The [Locator] interface is intended to be used by * Ice internals and by locator implementations. Regular user code * should not attempt to use any functionality of this interface - * directly.</para></note> + * directly.</p></note> * **/ interface Locator @@ -125,10 +125,10 @@ interface Locator * The Ice locator registry interface. This interface is used by * servers to register adapter endpoints with the locator. * - * <note><para> The [LocatorRegistry] interface is intended to be used + * <note><p> The [LocatorRegistry] interface is intended to be used * by Ice internals and by locator implementations. Regular user * code should not attempt to use any functionality of this interface - * directly.</para></note> + * directly.</p></note> * **/ interface LocatorRegistry diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice index 4ecbc4f5eab..d85b80d7c76 100644 --- a/cpp/slice/Ice/ObjectAdapter.ice +++ b/cpp/slice/Ice/ObjectAdapter.ice @@ -69,10 +69,10 @@ local interface ObjectAdapter * Temporarily hold receiving and dispatching requests. The object * adapter can be reactivated with the [activate] operation. * - * <note><para> Holding is not immediate, i.e., after [hold] + * <note><p> Holding is not immediate, i.e., after [hold] * returns, the object adapter might still be active for some * time. You can use [waitForHold] to wait until holding is - * complete. </para></note> + * complete. </p></note> * * @see activate * @see deactivate @@ -105,12 +105,12 @@ local interface ObjectAdapter * [deactivate] an already deactivated object adapter are ignored * and do nothing. * - * <note><para> After [deactivate] returns, no new requests are + * <note><p> After [deactivate] returns, no new requests are * processed by the object adapter. However, requests that have * been started before [deactivate] was called might still be * active. You can use [waitForDeactivate] to wait for the * completion of all requests for this object - * adapter. </para></note> + * adapter. </p></note> * * @see activate * @see hold @@ -163,7 +163,7 @@ local interface ObjectAdapter /** * - * Like [add], but with a facet. Calling <literal>add(servant, * id)</literal> + * Like [add], but with a facet. Calling <tt>add(servant, * id)</tt> * is equivalent to calling [addFacet] with an empty * facet. * @@ -211,7 +211,7 @@ local interface ObjectAdapter /** * * Like [addWithUUID], but with a facet. Calling - * <literal>addWithUUID(servant)</literal> is equivalent to calling + * <tt>addWithUUID(servant)</tt> is equivalent to calling * [addFacetWithUUID] with an empty facet. * * @param servant The servant to add. @@ -254,7 +254,7 @@ local interface ObjectAdapter /** * * Like [remove], but with a facet. Calling - * <literal>remove(id)</literal> is equivalent to calling + * <tt>remove(id)</tt> is equivalent to calling * [removeFacet] with an empty facet. * * @param id The identity of the Ice object that is @@ -295,9 +295,9 @@ local interface ObjectAdapter * Look up a servant in this object adapter's Active Servant Map * by the identity of the Ice object it implements. * - * <note><para>This operation only tries to lookup a servant in + * <note><p>This operation only tries to lookup a servant in * the Active Servant Map. It does not attempt to find a servant - * by using any installed [ServantLocator].</para></note> + * by using any installed [ServantLocator].</p></note> * * @param id The identity of the Ice object for which the * servant should be returned. @@ -315,7 +315,7 @@ local interface ObjectAdapter /** * * Like [find], but with a facet. Calling - * <literal>find(id)</literal> is equivalent to calling + * <tt>find(id)</tt> is equivalent to calling * [findFacet] with an empty facet. * * @param id The identity of the Ice object for which the @@ -358,9 +358,9 @@ local interface ObjectAdapter * Look up a servant in this object adapter's Active Servant Map, * given a proxy. * - * <note><para>This operation only tries to lookup a servant in + * <note><p>This operation only tries to lookup a servant in * the Active Servant Map. It does not attempt to find a servant - * via any installed [ServantLocator]s.</para></note> + * via any installed [ServantLocator]s.</p></note> * * @param proxy The proxy for which the servant should be returned. * @@ -382,33 +382,33 @@ local interface ObjectAdapter * servant for a given Ice object identity and facet in the * following order: * - * <orderedlist> + * <ol> * - * <listitem><para>The object adapter tries to find a servant for + * <li>The object adapter tries to find a servant for * the identity and facet in the Active Servant - * Map.</para></listitem> + * Map.</li> * - * <listitem><para>If no servant has been found in the Active + * <li>If no servant has been found in the Active * Servant Map, the object adapter tries to find a locator for the * category component of the identity. If a locator is found, the * object adapter tries to find a servant using this - * locator.</para></listitem> + * locator.</li> * - * <listitem><para>If no servant has been found by any of the + * <li>If no servant has been found by any of the * preceding steps, the object adapter tries to find a locator for * an empty category, regardless of the category contained in the * identity. If a locator is found, the object adapter tries to - * find a servant using this locator.</para></listitem> + * find a servant using this locator.</li> * - * <listitem><para>If no servant has been found with any of the + * <li>If no servant has been found with any of the * preceding steps, the object adapter gives up and the caller * receives [ObjectNotExistException] or - * [FacetNotExistException].</para></listitem> + * [FacetNotExistException].</li> * - * </orderedlist> + * </ol> * - * <note><para>Only one locator for the empty category can be - * installed.</para></note> + * <note><p>Only one locator for the empty category can be + * installed.</p></note> * * @param locator The locator to add. * @@ -497,9 +497,9 @@ local interface ObjectAdapter * A reverse proxy uses the incoming connections that have been * established from a client to this object adapter. * - * <note><para> This operation is intended to be used by special + * <note><p> This operation is intended to be used by special * services, such as [Router] implementations. Regular user code - * should not attempt to use this operation. </para></note> + * should not attempt to use this operation. </p></note> * * @param id The identity for which a proxy is to be created. * diff --git a/cpp/slice/Ice/ObjectFactory.ice b/cpp/slice/Ice/ObjectFactory.ice index f876b019a99..ed9d87207da 100644 --- a/cpp/slice/Ice/ObjectFactory.ice +++ b/cpp/slice/Ice/ObjectFactory.ice @@ -34,7 +34,7 @@ local interface ObjectFactory * Slice type id for interfaces of type [Bar] in the module * [Foo] is [::Foo::Bar]. * - * <note><para>The leading "[::]" is required.</para></note> + * <note><p>The leading "[::]" is required.</p></note> * * @param type The object type. * diff --git a/cpp/slice/Ice/Plugin.ice b/cpp/slice/Ice/Plugin.ice index 79b4ca0e2e1..c018fc8fe74 100644 --- a/cpp/slice/Ice/Plugin.ice +++ b/cpp/slice/Ice/Plugin.ice @@ -53,7 +53,7 @@ local interface PluginManager * Initialize the configured plugins. The communicator automatically initializes * the plugins by default, but an application may need to interact directly with * a plugin prior to initialization. In this case, the application must set - * <literal>Ice.InitPlugins=0</literal> and then invoke [initializePlugins] + * <tt>Ice.InitPlugins=0</tt> and then invoke [initializePlugins] * manually. The plugins are initialized in the order in which they are loaded. * If a plugin raises an exception during initialization, the communicator * invokes destroy on the plugins that have already been initialized. diff --git a/cpp/slice/Ice/Process.ice b/cpp/slice/Ice/Process.ice index e9bb0292c3e..805f2529d92 100644 --- a/cpp/slice/Ice/Process.ice +++ b/cpp/slice/Ice/Process.ice @@ -18,11 +18,11 @@ module Ice * An administrative interface for process management. Managed servers must * implement this interface. * - * <note><para> A servant implementing this interface is a potential target + * <note><p> A servant implementing this interface is a potential target * for denial-of-service attacks, therefore proper security precautions * should be taken. For example, the servant can use a UUID to make its * identity harder to guess, and be registered in an object adapter with - * a secured endpoint.</para></note> + * a secured endpoint.</p></note> * **/ interface Process diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice index 6475613c8af..45c2c1258c0 100644 --- a/cpp/slice/Ice/Properties.ice +++ b/cpp/slice/Ice/Properties.ice @@ -30,7 +30,7 @@ local dictionary<string, string> PropertyDict; * A property set used to configure Ice and Ice applications. * Properties are key/value pairs, with both keys and values * being [string]s. By convention, property keys should have the form - * <replaceable>application-name</replaceable>\[.<replaceable>category</replaceable>\[.<replaceable>sub-category</replaceable>]].<replaceable>name</replaceable>. + * <em>application-name</em>\[.<em>category</em>\[.<em>sub-category</em>]].<em>name</em>. * **/ local interface Properties @@ -101,8 +101,8 @@ local interface Properties /** * * Get all properties whose keys begins with - * <replaceable>prefix</replaceable>. If - * <replaceable>prefix</replaceable> is an empty string, + * <em>prefix</em>. If + * <em>prefix</em> is an empty string, * then all properties are returned. * * @return The matching property set. @@ -128,7 +128,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 - * [--<replaceable>key</replaceable>=<replaceable>value</replaceable>]. + * [--<em>key</em>=<em>value</em>]. * * @return The command line options for this property set. * @@ -139,7 +139,7 @@ local interface Properties * * Convert a sequence of command-line options into properties. * All options that begin with - * [--<replaceable>prefix</replaceable>.] are + * [--<em>prefix</em>.] are * converted into properties. If the prefix is empty, all options * that begin with [--] are converted to properties. * diff --git a/cpp/slice/Ice/Router.ice b/cpp/slice/Ice/Router.ice index 99306631769..2ffa0b220c8 100644 --- a/cpp/slice/Ice/Router.ice +++ b/cpp/slice/Ice/Router.ice @@ -48,8 +48,8 @@ interface Router * * Add new proxy information to the router's routing table. * - * <note><para>This operation is deprecated, and only used for old - * Ice clients (older than version 3.1).</para></note> + * <note><p>This operation is deprecated, and only used for old + * Ice clients (older than version 3.1).</p></note> * * @param proxy The proxy to add. * diff --git a/cpp/slice/Ice/ServantLocator.ice b/cpp/slice/Ice/ServantLocator.ice index 866b5a2af17..5f2938ed4a3 100644 --- a/cpp/slice/Ice/ServantLocator.ice +++ b/cpp/slice/Ice/ServantLocator.ice @@ -36,12 +36,12 @@ local interface ServantLocator * the returned servant into its active servant map. This must be * done by the servant locator implementation, if this is desired. * - * <important><para>If you call [locate] from your own code, you + * <important><p>If you call [locate] from your own code, you * must also call [finished] when you have finished using the * servant, provided that a non-null servant was * returned. Otherwise you will get undefined behavior if you use * Servant Locators such as the - * [Freeze::Evictor].</para></important> + * [Freeze::Evictor].</p></important> * * @param curr Information about the current operation for which * a servant is required. diff --git a/cpp/slice/IceBox/IceBox.ice b/cpp/slice/IceBox/IceBox.ice index e94ff441be6..9c70a582610 100644 --- a/cpp/slice/IceBox/IceBox.ice +++ b/cpp/slice/IceBox/IceBox.ice @@ -85,8 +85,8 @@ local interface Service * also be used by other services, depending on the service * configuration. * - * <note><para>The [ServiceManager] owns this communicator, and is - * responsible for destroying it.</para></note> + * <note><p>The [ServiceManager] owns this communicator, and is + * responsible for destroying it.</p></note> * * @param name The service's name, as determined by the * configuration. diff --git a/cpp/slice/IceGrid/Admin.ice b/cpp/slice/IceGrid/Admin.ice index 25c4827f12f..58328659127 100644 --- a/cpp/slice/IceGrid/Admin.ice +++ b/cpp/slice/IceGrid/Admin.ice @@ -360,9 +360,9 @@ struct ApplicationUpdateInfo /** * - * The IceGrid administrative interface. <warning><para>Allowing + * The IceGrid administrative interface. <warning><p>Allowing * access to this interface is a security risk! Please see the - * IceGrid documentation for further information.</para></warning> + * IceGrid documentation for further information.</p></warning> * **/ interface Admin @@ -897,7 +897,7 @@ interface Admin * * @param expr The expression to match against the stringified * identities of registered objects. The expression may contain - * a trailing wildcard (<literal>*</literal>) character. + * a trailing wildcard (<tt>*</tt>) character. * * @return All the object infos with a stringified identity * matching the given expression. @@ -1235,7 +1235,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * @@ -1264,7 +1264,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * @@ -1293,7 +1293,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * @@ -1322,7 +1322,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * @@ -1347,7 +1347,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * @@ -1372,7 +1372,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * @@ -1398,7 +1398,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 <literal>count</literal> lines. + * the file is read from the last <tt>count</tt> lines. * * @return An iterator to read the file. * diff --git a/cpp/slice/IceGrid/UserAccountMapper.ice b/cpp/slice/IceGrid/UserAccountMapper.ice index 4768f21a647..8b202a05515 100644 --- a/cpp/slice/IceGrid/UserAccountMapper.ice +++ b/cpp/slice/IceGrid/UserAccountMapper.ice @@ -37,9 +37,9 @@ 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 <literal>user</literal> + * @param user The value of the server descriptor's <tt>user</tt> * attribute. If this attribute is not defined, and the server's - * activation mode is <literal>session</literal>, the default value of + * activation mode is <tt>session</tt>, the default value of * [user] is the session identifier. * * @return The user account name. |