From a59791599316c93bc2e15bc7d72141e2e419bea2 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 6 May 2011 09:03:57 +0200 Subject: [PATCH] Docs: Restructured toc (cherry picked from commit b6ea22e994ab900dad2661861cd90a7ab969ceb4) --- akka-docs/additional/index.rst | 1 - akka-docs/{general => dev}/building-akka.rst | 0 akka-docs/dev/index.rst | 5 +++-- akka-docs/general/index.rst | 6 +----- akka-docs/index.rst | 13 +------------ akka-docs/project/index.rst | 6 ++++++ akka-docs/{general => project}/issue-tracking.rst | 0 akka-docs/{general => project}/licenses.rst | 0 akka-docs/project/links.rst | 3 --- .../migration-guide-0.7.x-0.8.x.rst | 0 .../migration-guide-0.8.x-0.9.x.rst | 0 .../migration-guide-0.9.x-0.10.x.rst | 0 .../migration-guide-1.0.x-1.1.x.rst | 0 akka-docs/{general => project}/migration-guides.rst | 0 akka-docs/{pending => project}/release-notes.rst | 0 akka-docs/{general => project}/scaladoc.rst | 0 akka-docs/{dev => project}/sponsors.rst | 0 akka-docs/scala/actors.rst | 2 +- 18 files changed, 12 insertions(+), 24 deletions(-) rename akka-docs/{general => dev}/building-akka.rst (100%) rename akka-docs/{general => project}/issue-tracking.rst (100%) rename akka-docs/{general => project}/licenses.rst (100%) rename akka-docs/{general => project}/migration-guide-0.7.x-0.8.x.rst (100%) rename akka-docs/{general => project}/migration-guide-0.8.x-0.9.x.rst (100%) rename akka-docs/{general => project}/migration-guide-0.9.x-0.10.x.rst (100%) rename akka-docs/{general => project}/migration-guide-1.0.x-1.1.x.rst (100%) rename akka-docs/{general => project}/migration-guides.rst (100%) rename akka-docs/{pending => project}/release-notes.rst (100%) rename akka-docs/{general => project}/scaladoc.rst (100%) rename akka-docs/{dev => project}/sponsors.rst (100%) diff --git a/akka-docs/additional/index.rst b/akka-docs/additional/index.rst index b8573a450f..389e68fa35 100644 --- a/akka-docs/additional/index.rst +++ b/akka-docs/additional/index.rst @@ -6,7 +6,6 @@ Additional Information articles benchmarks - `Support `_ recipes external-sample-projects companies-using-akka diff --git a/akka-docs/general/building-akka.rst b/akka-docs/dev/building-akka.rst similarity index 100% rename from akka-docs/general/building-akka.rst rename to akka-docs/dev/building-akka.rst diff --git a/akka-docs/dev/index.rst b/akka-docs/dev/index.rst index a4f1cee593..690ea88664 100644 --- a/akka-docs/dev/index.rst +++ b/akka-docs/dev/index.rst @@ -4,7 +4,8 @@ Information for Developers .. toctree:: :maxdepth: 2 - documentation + building-akka developer-guidelines - sponsors + documentation team + diff --git a/akka-docs/general/index.rst b/akka-docs/general/index.rst index a437095478..eaedbd37f7 100644 --- a/akka-docs/general/index.rst +++ b/akka-docs/general/index.rst @@ -5,10 +5,6 @@ General :maxdepth: 2 jmm - migration-guides - building-akka configuration event-handler - scaladoc - issue-tracking - licenses + diff --git a/akka-docs/index.rst b/akka-docs/index.rst index c01678f8fd..7fbe64f4c3 100644 --- a/akka-docs/index.rst +++ b/akka-docs/index.rst @@ -22,19 +22,8 @@ Quick Links * `Source Code `_ -* `API `_ - -* `Mailing List `_ - -* :ref:`licenses` +* :ref:`scaladoc` * :ref:`issue_tracking` -* :ref:`team` - -* :ref:`developer_guidelines` - -* :ref:`documentation` - -* :ref:`sponsors` diff --git a/akka-docs/project/index.rst b/akka-docs/project/index.rst index 13671bfa28..c429e74379 100644 --- a/akka-docs/project/index.rst +++ b/akka-docs/project/index.rst @@ -4,4 +4,10 @@ Project Information .. toctree:: :maxdepth: 2 + migration-guides + release-notes + scaladoc + issue-tracking + licenses + sponsors links diff --git a/akka-docs/general/issue-tracking.rst b/akka-docs/project/issue-tracking.rst similarity index 100% rename from akka-docs/general/issue-tracking.rst rename to akka-docs/project/issue-tracking.rst diff --git a/akka-docs/general/licenses.rst b/akka-docs/project/licenses.rst similarity index 100% rename from akka-docs/general/licenses.rst rename to akka-docs/project/licenses.rst diff --git a/akka-docs/project/links.rst b/akka-docs/project/links.rst index 69b7380249..7f1c061a26 100644 --- a/akka-docs/project/links.rst +++ b/akka-docs/project/links.rst @@ -9,9 +9,6 @@ `Source Code `_ ============================================== -`API `_ -========================================== - `Maven Repository `_ ================================================ diff --git a/akka-docs/general/migration-guide-0.7.x-0.8.x.rst b/akka-docs/project/migration-guide-0.7.x-0.8.x.rst similarity index 100% rename from akka-docs/general/migration-guide-0.7.x-0.8.x.rst rename to akka-docs/project/migration-guide-0.7.x-0.8.x.rst diff --git a/akka-docs/general/migration-guide-0.8.x-0.9.x.rst b/akka-docs/project/migration-guide-0.8.x-0.9.x.rst similarity index 100% rename from akka-docs/general/migration-guide-0.8.x-0.9.x.rst rename to akka-docs/project/migration-guide-0.8.x-0.9.x.rst diff --git a/akka-docs/general/migration-guide-0.9.x-0.10.x.rst b/akka-docs/project/migration-guide-0.9.x-0.10.x.rst similarity index 100% rename from akka-docs/general/migration-guide-0.9.x-0.10.x.rst rename to akka-docs/project/migration-guide-0.9.x-0.10.x.rst diff --git a/akka-docs/general/migration-guide-1.0.x-1.1.x.rst b/akka-docs/project/migration-guide-1.0.x-1.1.x.rst similarity index 100% rename from akka-docs/general/migration-guide-1.0.x-1.1.x.rst rename to akka-docs/project/migration-guide-1.0.x-1.1.x.rst diff --git a/akka-docs/general/migration-guides.rst b/akka-docs/project/migration-guides.rst similarity index 100% rename from akka-docs/general/migration-guides.rst rename to akka-docs/project/migration-guides.rst diff --git a/akka-docs/pending/release-notes.rst b/akka-docs/project/release-notes.rst similarity index 100% rename from akka-docs/pending/release-notes.rst rename to akka-docs/project/release-notes.rst diff --git a/akka-docs/general/scaladoc.rst b/akka-docs/project/scaladoc.rst similarity index 100% rename from akka-docs/general/scaladoc.rst rename to akka-docs/project/scaladoc.rst diff --git a/akka-docs/dev/sponsors.rst b/akka-docs/project/sponsors.rst similarity index 100% rename from akka-docs/dev/sponsors.rst rename to akka-docs/project/sponsors.rst diff --git a/akka-docs/scala/actors.rst b/akka-docs/scala/actors.rst index ed186e17ba..ddd1e5f439 100644 --- a/akka-docs/scala/actors.rst +++ b/akka-docs/scala/actors.rst @@ -11,7 +11,7 @@ The `Actor Model `_ provides a higher The API of Akka’s Actors is similar to Scala Actors which has borrowed some of its syntax from Erlang. -The Akka 0.9 release introduced a new concept; ActorRef, which requires some refactoring. If you are new to Akka just read along, but if you have used Akka 0.6.x, 0.7.x and 0.8.x then you might be helped by the :doc:`0.8.x => 0.9.x migration guide ` +The Akka 0.9 release introduced a new concept; ActorRef, which requires some refactoring. If you are new to Akka just read along, but if you have used Akka 0.6.x, 0.7.x and 0.8.x then you might be helped by the :doc:`0.8.x => 0.9.x migration guide ` Creating Actors ---------------