Merge branch 'master' into wip-traversal-oriented-layout-master-patriknw

akka-docs/rst/scala/cluster-usage.rst

@@ -119,7 +119,7 @@ seed nodes in the existing cluster.
 
 If you don't configure seed nodes you need to join the cluster programmatically or manually.
 
-Manual joining can be performed by using ref:`cluster_jmx_scala` or :ref:`cluster_http_scala`.
+Manual joining can be performed by using :ref:`cluster_jmx_scala` or :ref:`cluster_http_scala`.
 Joining programmatically can be performed with ``Cluster(system).join``. Unsuccessful join attempts are
 automatically retried after the time period defined in configuration property ``retry-unsuccessful-join-after``.
 Retries can be disabled by setting the property to ``off``.
@@ -168,9 +168,9 @@ can be performed automatically or manually. By default it must be done manually,
 It can also be performed programmatically with ``Cluster(system).down(address)``.
 
 A pre-packaged solution for the downing problem is provided by
-`Split Brain Resolver <http://doc.akka.io/docs/akka/akka-commercial-addons-1.0/scala/split-brain-resolver.html>`_,
+`Split Brain Resolver <http://developer.lightbend.com/docs/akka-commercial-addons/current/split-brain-resolver.html>`_,
 which is part of the `Lightbend Reactive Platform <http://www.lightbend.com/platform>`_. 
-If you don’t use RP, you should anyway carefully read the `documentation <http://doc.akka.io/docs/akka/akka-commercial-addons-1.0/scala/split-brain-resolver.html>`_
+If you don’t use RP, you should anyway carefully read the `documentation <http://developer.lightbend.com/docs/akka-commercial-addons/current/split-brain-resolver.html>`_
 of the Split Brain Resolver and make sure that the solution you are using handles the concerns
 described there.
 

akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala

@@ -25,7 +25,7 @@ package docs.serialization {
 
     // Pick a unique identifier for your Serializer,
     // you've got a couple of billions to choose from,
-    // 0 - 16 is reserved by Akka itself
+    // 0 - 40 is reserved by Akka itself
     def identifier = 1234567
 
     // "toBinary" serializes the given object to an Array of Bytes
@@ -58,7 +58,7 @@ package docs.serialization {
 
     // Pick a unique identifier for your Serializer,
     // you've got a couple of billions to choose from,
-    // 0 - 16 is reserved by Akka itself
+    // 0 - 40 is reserved by Akka itself
     def identifier = 1234567
 
     // The manifest (type hint) that will be provided in the fromBinary method

akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala

@@ -108,8 +108,8 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
 
   trait HiddenDefinitions {
     //#graph-dsl-broadcast
-    val writeAuthors: Sink[Author, Unit] = ???
-    val writeHashtags: Sink[Hashtag, Unit] = ???
+    val writeAuthors: Sink[Author, NotUsed] = ???
+    val writeHashtags: Sink[Hashtag, NotUsed] = ???
     //#graph-dsl-broadcast
   }
 

akka-docs/rst/scala/persistence.rst

@@ -218,10 +218,10 @@ maximum stash capacity in the mailbox configuration::
 
 Note that the stash capacity is per actor. If you have many persistent actors, e.g. when using cluster sharding,
 you may need to define a small stash capacity to ensure that the total number of stashed messages in the system
-don't consume too much memory. Additionally, The persistent actor defines three strategies to handle failure when the 
+doesn't consume too much memory. Additionally, the persistent actor defines three strategies to handle failure when the 
 internal stash capacity is exceeded. The default overflow strategy is the ``ThrowOverflowExceptionStrategy``, which 
-discards the current received message and throws a ``StashOverflowException``, causing actor restart if default 
-supervision strategy is used. you can override the ``internalStashOverflowStrategy`` method to return 
+discards the current received message and throws a ``StashOverflowException``, causing actor restart if the default 
+supervision strategy is used. You can override the ``internalStashOverflowStrategy`` method to return 
 ``DiscardToDeadLetterStrategy`` or ``ReplyToStrategy`` for any "individual" persistent actor, or define the "default" 
 for all persistent actors by providing FQCN, which must be a subclass of ``StashOverflowStrategyConfigurator``, in the 
 persistence configuration::
@@ -232,7 +232,7 @@ persistence configuration::
 The ``DiscardToDeadLetterStrategy`` strategy also has a pre-packaged companion configurator 
 ``akka.persistence.DiscardConfigurator``.
 
-You can also query default strategy via the Akka persistence extension singleton::
+You can also query the default strategy via the Akka persistence extension singleton::
 
     Persistence(context.system).defaultInternalStashOverflowStrategy