merge with master

akka-docs/dev/building-akka.rst

@@ -9,8 +9,6 @@
 
 This page describes how to build and run Akka from the latest source code.
 
-.. contents:: :local:
-
 
 Get the Source Code
 ===================
@@ -21,11 +19,11 @@ Akka uses `Git`_ and is hosted at `Github`_.
 .. _Github: http://github.com
 
 You first need Git installed on your machine. You can then clone the source
-repository from http://github.com/jboner/akka.
+repository from http://github.com/akka/akka.
 
 For example::
 
-   git clone git://github.com/jboner/akka.git
+   git clone git://github.com/akka/akka.git
 
 If you have already cloned the repository previously then you can update the
 code with ``git pull``::

akka-docs/dev/developer-guidelines.rst

@@ -44,12 +44,12 @@ All code that is checked in **should** have tests. All testing is done with ``Sc
 * Name tests as **Test.scala** if they do not depend on any external stuff. That keeps surefire happy.
 * Name tests as **Spec.scala** if they have external dependencies.
 
-There is a testing standard that should be followed: `Ticket001Spec <https://github.com/jboner/akka/blob/master/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala>`_
+There is a testing standard that should be followed: `Ticket001Spec <https://github.com/akka/akka/blob/master/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala>`_
 
 Actor TestKit
 ^^^^^^^^^^^^^
 
-There is a useful test kit for testing actors: `akka.util.TestKit <https://github.com/jboner/akka/tree/master/akka-testkit/src/main/scala/akka/testkit/TestKit.scala>`_. It enables assertions concerning replies received and their timing, there is more documentation in the :ref:`akka-testkit` module.
+There is a useful test kit for testing actors: `akka.util.TestKit <https://github.com/akka/akka/tree/master/akka-testkit/src/main/scala/akka/testkit/TestKit.scala>`_. It enables assertions concerning replies received and their timing, there is more documentation in the :ref:`akka-testkit` module.
 
 Multi-JVM Testing
 ^^^^^^^^^^^^^^^^^

akka-docs/dev/documentation.rst

@@ -7,10 +7,6 @@
  Documentation Guidelines
 #########################
 
-.. sidebar:: Contents
-
-   .. contents:: :local:
-   
 The Akka documentation uses `reStructuredText`_ as its markup language and is
 built using `Sphinx`_.
 

akka-docs/dev/multi-jvm-testing.rst

@@ -8,8 +8,6 @@
 Support for running applications (objects with main methods) and
 ScalaTest tests in multiple JVMs.
 
-.. contents:: :local:
-
 
 Setup
 =====
@@ -48,7 +46,7 @@ multi-JVM testing::
 
      lazy val buildSettings = Defaults.defaultSettings ++ Seq(
        organization := "com.typesafe.akka",
-       version      := "2.0-SNAPSHOT",
+       version      := "2.1-SNAPSHOT",
        scalaVersion := "2.9.1",
        crossPaths   := false
      )
@@ -361,13 +359,13 @@ machines using schoir (read the same as ``esquire``) plugin. The plugin is inclu
 The interaction with the plugin is through ``schoir:master`` input task. This input task optionally accepts the
 path to the file with the following properties::
 
-   git.url=git@github.com:jboner/akka.git
+   git.url=git@github.com:akka/akka.git
    external.addresses.for.ssh=host1:port1,...,hostN:portN
    internal.host.names=host1,...,hostN
 
 Alternative to specifying the property file, one can set respective settings in the build file::
 
-   gitUrl := "git@github.com:jboner/akka.git",
+   gitUrl := "git@github.com:akka/akka.git",
    machinesExt := List(InetAddress("host1", port1)),
    machinesInt := List("host1")
 
@@ -381,4 +379,4 @@ same machine at the same time.
 
 The machines that are used for testing (slaves) should have ssh access to the outside world and be able to talk
 to each other with the internal addresses given. On the master machine ssh client is required. Obviosly git
-and sbt should be installed on both master and slave machines.
+and sbt should be installed on both master and slave machines.