Merge pull request scala#135 from vjovanov/am-fixes

heathermiller · heathermiller · commit 104a940c4016 · 2012-12-12T09:21:57.000-08:00
Minor fixes to the Actor migration kit.
diff --git a/overviews/core/_posts/2010-11-30-actors.md b/overviews/core/_posts/2010-11-30-actors.md
@@ -10,6 +10,8 @@ overview: actors
 
 This guide describes the API of the `scala.actors` package of Scala 2.8/2.9. The organization follows groups of types that logically belong together. The trait hierarchy is taken into account to structure the individual sections. The focus is on the run-time behavior of the various methods that these traits define, thereby complementing the existing Scaladoc-based API documentation.
 
+NOTE: In Scala 2.10 the Actors library is deprecated and will be removed in future Scala releases. Users should use [Akka](akka.io) actors from the package `akka.actor`. For migration from Scala actors to Akka refer to the [Actors Migration Guide](docs.scala-lang.org/overviews/core/actors-migration-guide.html).
+
 ## The actor traits Reactor, ReplyReactor, and Actor
 
 ### The Reactor trait
diff --git a/overviews/core/_posts/2012-11-08-actors-migration-guide.md b/overviews/core/_posts/2012-11-08-actors-migration-guide.md
@@ -65,8 +65,8 @@ reshape their system so it starts all the actors right after their instantiation
 ## Migration Overview
 
 ### Migration Kit
-In Scala 2.10.0 tactors reside inside the [Scala distribution](http://www.scala-lang.org/downloads) as a separate jar ( *scala-actors.jar* ), and
-the their interface is deprecated. The distribution also includes Akka actors in the *akka-actor.jar*.
+In Scala 2.10.0 actors reside inside the [Scala distribution](http://www.scala-lang.org/downloads) as a separate jar ( *scala-actors.jar* ), and 
+the their interface is deprecated. The distribution also includes Akka actors in the *akka-actor.jar*. 
 The AMK resides both in the Scala actors and in the *akka-actor.jar*. Future major releases of Scala will not contain Scala actors and the AMK.
 
 To start the migration user needs to add the *scala-actors.jar* and the *scala-actors-migration.jar* to the build of their projects.
@@ -306,7 +306,7 @@ examples are shown below.
 should be moved to the `preStart` method.
 
         def act() {
-          // some code
+          // initialization code here
           loop {
             react { ... }
           }
@@ -315,7 +315,7 @@ should be moved to the `preStart` method.
    should be replaced with
 
         override def preStart() {
-          // some code
+          // initialization code here
         }
 
         def act() {
