diff --git a/akka-docs/_sphinx/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html
index c92fa9b9c3..0406998aaa 100644
--- a/akka-docs/_sphinx/themes/akka/layout.html
+++ b/akka-docs/_sphinx/themes/akka/layout.html
@@ -34,7 +34,7 @@
Download
Mailing List
Code
- Commerical Support
+ Commercial Support
@@ -44,9 +44,9 @@
{{ title }}
{%- if is_snapshot -%}
-
+
{%- else -%}
-
+
{%- endif -%}
diff --git a/akka-docs/disabled/spring.rst b/akka-docs/disabled/spring.rst
index 207f419bb8..62918a5941 100644
--- a/akka-docs/disabled/spring.rst
+++ b/akka-docs/disabled/spring.rst
@@ -7,11 +7,11 @@
Akkas integration with the `Spring Framework `_ supplies the Spring way of using the Typed Actor Java API and for CamelService configuration for :ref:`camel-spring-applications`. It uses Spring's custom namespaces to create Typed Actors, supervisor hierarchies and a CamelService in a Spring environment.
-To use the custom name space tags for Akka you have to add the XML schema definition to your spring configuration. It is available at `http://akka.io/akka-1.0.xsd `_. The namespace for Akka is:
+To use the custom name space tags for Akka you have to add the XML schema definition to your spring configuration. It is available at `http://repo.akka.io/akka-1.0.xsd `_. The namespace for Akka is:
.. code-block:: xml
- xmlns:akka="http://akka.io/schema/akka"
+ xmlns:akka="http://repo.akka.io/schema/akka"
Example header for Akka Spring configuration:
@@ -20,12 +20,12 @@ Example header for Akka Spring configuration:
+ http://repo.akka.io/schema/akka
+ http://repo.akka.io/akka-1.0.xsd">
-
diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst
index 84e702d7e9..9f8544f922 100644
--- a/akka-docs/intro/getting-started-first-java.rst
+++ b/akka-docs/intro/getting-started-first-java.rst
@@ -224,7 +224,7 @@ As you can see we already have a Java source file called ``App.java``, let's now
We also need to edit the ``pom.xml`` build file. Let's add the dependency we
need as well as the Maven repository it should download it from. The Akka Maven
-repository can be found at http://akka.io/releases/ and Typesafe provides
+repository can be found at http://repo.akka.io/releases/ and Typesafe provides
http://repo.typesafe.com/typesafe/releases/ that proxies several other
repositories, including akka.io. It should now look something like this:
diff --git a/akka-docs/intro/getting-started.rst b/akka-docs/intro/getting-started.rst
index 580721f193..46d470b46f 100644
--- a/akka-docs/intro/getting-started.rst
+++ b/akka-docs/intro/getting-started.rst
@@ -57,7 +57,7 @@ Download the release you need from http://akka.io/downloads and unzip it.
Using a snapshot version
------------------------
-The Akka nightly snapshots are published to http://akka.io/snapshots/ and are
+The Akka nightly snapshots are published to http://repo.akka.io/snapshots/ and are
versioned with both ``SNAPSHOT`` and timestamps. You can choose a timestamped
version to work with and can decide when to update to a newer version. The Akka
snapshots repository is also proxied through http://repo.typesafe.com/typesafe/snapshots/
@@ -76,7 +76,7 @@ Using a build tool
------------------
Akka can be used with build tools that support Maven repositories. The Akka
-Maven repository can be found at http://akka.io/realeses/ and Typesafe provides
+Maven repository can be found at http://repo.akka.io/releases/ and Typesafe provides
http://repo.typesafe.com/typesafe/releases/ that proxies several other
repositories, including akka.io.
diff --git a/akka-docs/project/links.rst b/akka-docs/project/links.rst
index f9ea25bac7..e4f1017828 100644
--- a/akka-docs/project/links.rst
+++ b/akka-docs/project/links.rst
@@ -28,10 +28,10 @@ Akka uses Git and is hosted at `Github `_.
* Akka: clone the Akka repository from ``_
-`Releases Repository `_
-=================================================
+`Releases Repository `_
+======================================================
-The Akka Maven repository can be found at http://akka.io/releases/.
+The Akka Maven repository can be found at http://repo.akka.io/releases/.
Typesafe provides http://repo.typesafe.com/typesafe/releases/ that proxies
several other repositories, including akka.io. It is convenient to use the
@@ -39,7 +39,7 @@ Typesafe repository, since it includes all external dependencies of Akka. It is
a "best-effort" service, and if it is unavailable you may need to use the
underlying repositories directly.
-* http://akka.io/releases/
+* http://repo.akka.io/releases/
* http://repository.codehaus.org/
* http://guiceyfruit.googlecode.com/svn/repo/releases/
* http://repository.jboss.org/nexus/content/groups/public/
@@ -49,10 +49,10 @@ underlying repositories directly.
* http://databinder.net/repo/
-`Snapshots Repository `_
-===================================================
+`Snapshots Repository `_
+========================================================
-Nightly builds are available in http://akka.io/snapshots/ and proxied through
+Nightly builds are available in http://repo.akka.io/snapshots/ and proxied through
http://repo.typesafe.com/typesafe/snapshots/ as both ``SNAPSHOT`` and
timestamped versions.
diff --git a/akka-docs/project/other-doc.rst b/akka-docs/project/other-doc.rst
index 4afc747dc4..7e32234934 100644
--- a/akka-docs/project/other-doc.rst
+++ b/akka-docs/project/other-doc.rst
@@ -12,13 +12,13 @@ Release Versions
2.0
---
-- Akka 2.0 - http://akka.io/docs/akka/2.0/ (or in `PDF format `__)
+- Akka 2.0 - http://doc.akka.io/docs/akka/2.0/ (or in `PDF format `__)
1.3.1
-----
-- Akka 1.3.1 - http://akka.io/docs/akka/1.3.1/ (or in `PDF format `__)
-- Akka Modules 1.3.1 - http://akka.io/docs/akka-modules/1.3.1/ (or in `PDF format `__)
+- Akka 1.3.1 - http://doc.akka.io/docs/akka/1.3.1/ (or in `PDF format `__)
+- Akka Modules 1.3.1 - http://doc.akka.io/docs/akka-modules/1.3.1/ (or in `PDF format `__)
Akka Snapshot
@@ -27,4 +27,4 @@ Akka Snapshot
Automatically published documentation for the latest SNAPSHOT version of Akka can
be found here:
-- Akka - http://akka.io/docs/akka/snapshot/ (or in `PDF format `__)
+- Akka - http://doc.akka.io/docs/akka/snapshot/ (or in `PDF format `__)
diff --git a/akka-docs/project/scaladoc.rst b/akka-docs/project/scaladoc.rst
index d92565ee3d..4ad09caad1 100644
--- a/akka-docs/project/scaladoc.rst
+++ b/akka-docs/project/scaladoc.rst
@@ -12,17 +12,17 @@ Release Versions
2.0
-----
-- Akka 2.0 - http://akka.io/api/akka/2.0/
+- Akka 2.0 - http://doc.akka.io/api/akka/2.0/
1.3.1
-----
-- Akka 1.3.1 - http://akka.io/api/akka/1.3.1/
-- Akka Modules 1.3.1 - http://akka.io/api/akka-modules/1.3.1/
+- Akka 1.3.1 - http://doc.akka.io/api/akka/1.3.1/
+- Akka Modules 1.3.1 - http://doc.akka.io/api/akka-modules/1.3.1/
Akka Snapshot
=============
Automatically published Scaladoc API for the latest SNAPSHOT version of Akka can
-be found here: http://akka.io/api/akka/snapshot
+be found here: http://doc.akka.io/api/akka/snapshot