diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpFFIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/UdpFFIntegrationSpec.scala
index 6cb6042b2f..88d41a21c4 100644
--- a/akka-actor-tests/src/test/scala/akka/io/UdpFFIntegrationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/io/UdpFFIntegrationSpec.scala
@@ -22,7 +22,7 @@ class UdpFFIntegrationSpec extends AkkaSpec("akka.loglevel = INFO") with Implici
 
   val simpleSender: ActorRef = {
     val commander = TestProbe()
-    commander.send(IO(UdpFF), SimpleSender(Nil))
+    commander.send(IO(UdpFF), SimpleSender)
     commander.expectMsg(SimpleSendReady)
     commander.sender
   }
diff --git a/akka-actor/src/main/scala/akka/io/UdpFF.scala b/akka-actor/src/main/scala/akka/io/UdpFF.scala
index df935ebbaa..838f53a88d 100644
--- a/akka-actor/src/main/scala/akka/io/UdpFF.scala
+++ b/akka-actor/src/main/scala/akka/io/UdpFF.scala
@@ -35,6 +35,7 @@ object UdpFF extends ExtensionKey[UdpFFExt] {
   case object Unbind extends Command
 
   case class SimpleSender(options: immutable.Traversable[SocketOption] = Nil) extends Command
+  object SimpleSender extends SimpleSender(Nil)
 
   case object StopReading extends Command
   case object ResumeReading extends Command
diff --git a/akka-docs/rst/scala/io.rst b/akka-docs/rst/scala/io.rst
index 631f7a4c69..5f0331d8a2 100644
--- a/akka-docs/rst/scala/io.rst
+++ b/akka-docs/rst/scala/io.rst
@@ -235,7 +235,7 @@ may handle all close events in the same way.
 Throttling Reads and Writes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-TODO
+*This section is not yet ready. More coming soon*
 
 Using UDP
 ---------
@@ -264,7 +264,7 @@ manager:
 
 .. code-block:: scala
 
-  IO(UdpFF) ! SimpleSender()
+  IO(UdpFF) ! SimpleSender
   // or with socket options:
   import akka.io.Udp._
   IO(UdpFF) ! SimpleSender(List(SO.Broadcast(true)))
@@ -370,12 +370,8 @@ Again, the send does not contain a remote address, as it is always the endpoint
 Throttling Reads and Writes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-TODO
+*This section is not yet ready. More coming soon*
 
-Integration with Iteratees
---------------------------
-
-TODO
 
 Architecture in-depth
 ---------------------