Merge branch 'master' into wip-scala210M4-√

2012-07-20 14:17:27 +02:00 · 2012-07-20 14:17:27 +02:00 · 6e134ede21
commit 6e134ede21
parent 6d0809f1f4 3856ec9357
2 changed files with 11 additions and 2 deletions
--- a/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
+++ b/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
@ -168,7 +168,7 @@ public class SerializationDocTestBase {

  @Test
  public void demonstrateTheProgrammaticAPI() {
-    // #programmatic
+    //#programmatic
    ActorSystem system = ActorSystem.create("example");

    // Get the Serialization Extension
@ -190,7 +190,7 @@ public class SerializationDocTestBase {
    // Voilá!
    assertEquals(original, back);

-    // #programmatic
+    //#programmatic
    system.shutdown();
  }
 }