From ea315e85a719de834f562dbba47c0fb176ed9ff3 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 1 Jul 2013 15:21:56 +0200 Subject: [PATCH] DOC: Strange link names, see #3259 --- akka-docs/rst/general/actors.rst | 3 ++- akka-docs/rst/general/configuration.rst | 2 +- akka-docs/rst/intro/deployment-scenarios.rst | 4 ++-- akka-docs/rst/intro/getting-started.rst | 6 +++--- akka-docs/rst/intro/what-is-akka.rst | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/akka-docs/rst/general/actors.rst b/akka-docs/rst/general/actors.rst index ae247dcd5b..793c299f4c 100644 --- a/akka-docs/rst/general/actors.rst +++ b/akka-docs/rst/general/actors.rst @@ -7,7 +7,8 @@ The previous section about :ref:`actor-systems` explained how actors form hierarchies and are the smallest unit when building an application. This section looks at one such actor in isolation, explaining the concepts you encounter while implementing it. For a more in depth reference with all the -details please refer to :ref:`actors-scala` and :ref:`untyped-actors-java`. +details please refer to +:ref:`Actors (Scala) ` and :ref:`Untyped Actors (Java) `. An actor is a container for `State`_, `Behavior`_, a `Mailbox`_, `Children`_ and a `Supervisor Strategy`_. All of this is encapsulated behind an `Actor diff --git a/akka-docs/rst/general/configuration.rst b/akka-docs/rst/general/configuration.rst index 29cdb5c087..76c8cec80b 100644 --- a/akka-docs/rst/general/configuration.rst +++ b/akka-docs/rst/general/configuration.rst @@ -182,7 +182,7 @@ and parsed by the actor system can be displayed like this: .. code-block:: java final ActorSystem system = ActorSystem.create(); - println(system.settings()); + System.out.println(system.settings()); // this is a shortcut for system.settings().config().root().render() A Word About ClassLoaders diff --git a/akka-docs/rst/intro/deployment-scenarios.rst b/akka-docs/rst/intro/deployment-scenarios.rst index fc3b38cbd2..4845585492 100644 --- a/akka-docs/rst/intro/deployment-scenarios.rst +++ b/akka-docs/rst/intro/deployment-scenarios.rst @@ -13,7 +13,7 @@ Akka can be used in different ways: be put into ``WEB-INF/lib`` - As a stand alone application by instantiating ActorSystem in a main class or - using the :ref:`microkernel-scala` / :ref:`microkernel-java` + using the :ref:`Microkernel (Scala) ` / :ref:`Microkernel (Java) ` Using Akka as library @@ -28,5 +28,5 @@ Using Akka as a stand alone microkernel ---------------------------------------- Akka can also be run as a stand-alone microkernel. See -:ref:`microkernel-scala` / :ref:`microkernel-java` for +:ref:`Microkernel (Scala) ` / :ref:`Microkernel (Java) ` for more information. diff --git a/akka-docs/rst/intro/getting-started.rst b/akka-docs/rst/intro/getting-started.rst index 6b8f87a3b4..46c8653dbb 100644 --- a/akka-docs/rst/intro/getting-started.rst +++ b/akka-docs/rst/intro/getting-started.rst @@ -107,7 +107,7 @@ application jar in the ``deploy`` directory and use the scripts in the ``bin`` directory. More information is available in the documentation of the -:ref:`microkernel-scala` / :ref:`microkernel-java`. +:ref:`Microkernel (Scala) ` / :ref:`Microkernel (Java) `. .. _build-tool: @@ -231,8 +231,8 @@ Do not use -optimize Scala compiler flag ---------------------------------------- .. warning:: - - Akka has not been compiled or tested with -optimize Scala compiler flag. + + Akka has not been compiled or tested with -optimize Scala compiler flag. Strange behavior has been reported by users that have tried it. diff --git a/akka-docs/rst/intro/what-is-akka.rst b/akka-docs/rst/intro/what-is-akka.rst index 4f393fda5d..9a31a987d0 100644 --- a/akka-docs/rst/intro/what-is-akka.rst +++ b/akka-docs/rst/intro/what-is-akka.rst @@ -36,7 +36,7 @@ Actors give you: - Asynchronous, non-blocking and highly performant event-driven programming model. - Very lightweight event-driven processes (approximately 2.7 million actors per GB RAM). -See :ref:`actors-scala` and :ref:`untyped-actors-java` +See :ref:`Actors (Scala) ` and :ref:`Untyped Actors (Java) ` Fault Tolerance --------------- @@ -45,7 +45,7 @@ Fault Tolerance - Supervisor hierarchies can span over multiple JVMs to provide truly fault-tolerant systems. - Excellent for writing highly fault-tolerant systems that self-heal and never stop. -See :ref:`fault-tolerance-scala` and :ref:`fault-tolerance-java` +See :ref:`Fault Tolerance (Scala) ` and :ref:`Fault Tolerance (Java) ` Location Transparency --------------------- @@ -60,7 +60,7 @@ Transactors Transactors combine actors and Software Transactional Memory (STM) into transactional actors. It allows you to compose atomic message flows with automatic retry and rollback. -See :ref:`transactors-scala` and :ref:`transactors-java` +See :ref:`Transactors (Scala) ` and :ref:`Transactors (Java) ` Scala and Java APIs