diff --git a/akka-docs/rst/java/cluster-usage.rst b/akka-docs/rst/java/cluster-usage.rst
index 055e030ac5..c3e0db8858 100644
--- a/akka-docs/rst/java/cluster-usage.rst
+++ b/akka-docs/rst/java/cluster-usage.rst
@@ -102,6 +102,17 @@ it sends a message to all seed nodes and then sends join command to the one that
 answers first. If no one of the seed nodes replied (might not be started yet)
 it retries this procedure until successful or shutdown.
 
+You define the seed nodes in the :ref:`cluster_configuration_java` file (application.conf)::
+
+  akka.cluster.seed-nodes = [
+    "akka.tcp://ClusterSystem@host1:2552", 
+    "akka.tcp://ClusterSystem@host2:2552"]
+
+This can also be defined as Java system properties when starting the JVM using the following syntax::
+
+  -Dakka.cluster.seed-nodes.0=akka.tcp://ClusterSystem@host1:2552
+  -Dakka.cluster.seed-nodes.1=akka.tcp://ClusterSystem@host2:2552
+
 The seed nodes can be started in any order and it is not necessary to have all
 seed nodes running, but the node configured as the first element in the ``seed-nodes``
 configuration list must be started when initially starting a cluster, otherwise the 
diff --git a/akka-docs/rst/java/futures.rst b/akka-docs/rst/java/futures.rst
index 2da3a6b6ba..988dc45614 100644
--- a/akka-docs/rst/java/futures.rst
+++ b/akka-docs/rst/java/futures.rst
@@ -88,7 +88,7 @@ Or failures:
 
 It is also possible to create an empty ``Promise``, to be filled later, and obtain the corresponding ``Future``:
 
-.. includecode:: code/docs/future/FutureDocTestBase.java#promise
+.. includecode:: code/docs/future/FutureDocTest.java#promise
 
 For these examples ``PrintResult`` is defined as follows:
 
diff --git a/akka-docs/rst/scala/cluster-usage.rst b/akka-docs/rst/scala/cluster-usage.rst
index 6be41d77b0..f0e973576a 100644
--- a/akka-docs/rst/scala/cluster-usage.rst
+++ b/akka-docs/rst/scala/cluster-usage.rst
@@ -95,6 +95,17 @@ it sends a message to all seed nodes and then sends join command to the one that
 answers first. If no one of the seed nodes replied (might not be started yet)
 it retries this procedure until successful or shutdown.
 
+You define the seed nodes in the :ref:`cluster_configuration_scala` file (application.conf)::
+
+  akka.cluster.seed-nodes = [
+    "akka.tcp://ClusterSystem@host1:2552", 
+    "akka.tcp://ClusterSystem@host2:2552"]
+
+This can also be defined as Java system properties when starting the JVM using the following syntax::
+
+  -Dakka.cluster.seed-nodes.0=akka.tcp://ClusterSystem@host1:2552
+  -Dakka.cluster.seed-nodes.1=akka.tcp://ClusterSystem@host2:2552
+
 The seed nodes can be started in any order and it is not necessary to have all
 seed nodes running, but the node configured as the first element in the ``seed-nodes``
 configuration list must be started when initially starting a cluster, otherwise the 
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 2a7be35902..f4796a6652 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -924,7 +924,7 @@ object Dependencies {
     // Compile
     val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.10.3" exclude("org.slf4j", "slf4j-api") // ApacheV2
 
-    val config        = "com.typesafe"                % "config"                       % "1.0.0"       // ApacheV2
+    val config        = "com.typesafe"                % "config"                       % "1.0.1"       // ApacheV2
     val netty         = "io.netty"                    % "netty"                        % "3.6.6.Final" // ApacheV2
     val protobuf      = "com.google.protobuf"         % "protobuf-java"                % "2.4.1"       // New BSD
     val scalaStm      = "org.scala-stm"              %% "scala-stm"                    % "0.7"         // Modified BSD (Scala)