Fixed ICE-5811: renamed book demos to manual demos

77 files changed, 22 insertions, 16 deletions

diff --git a/java/demo/IceDiscovery/README b/java/demo/IceDiscovery/README
new file mode 100644
index 00000000000..1baa94c1914
--- /dev/null
+++ b/java/demo/IceDiscovery/README
@@ -0,0 +1,9 @@
+Demos in this directory:
+
+- hello
+
+  The Ice hello world demo configured to use IceDiscovery
+
+- replication
+
+  A demo to illustrate how replication is setup with IceDiscovery
diff --git a/java/demo/IceDiscovery/hello/README b/java/demo/IceDiscovery/hello/README
index 0cc7c5b7cc9..7b3a7a2e20f 100644
--- a/java/demo/IceDiscovery/hello/README
+++ b/java/demo/IceDiscovery/hello/README
@@ -1,5 +1,4 @@
-This demo illustrates how to invoke ordinary (twoway) operations, as
-well as how to make oneway, datagram, secure, and batched invocations.
+This demo is the Ice hello world demo.
 
 To run the demo, first start the server:
 
@@ -9,10 +8,6 @@ In a separate window, start the client:
 
 $ java Client
 
-To test timeouts you can use 'T' to set a timeout on the client proxy 
-and 'P' to set a delayed response in the server to cause a timeout.
-You will notice that two "Hello World!" messages will be printed by
-the server in this case. This is because the sayHello method is marked
-as idempotent in the slice, meaning that Ice does not need to follow
-the at-most-once retry semantics. See the manual for more information
-about retry behavior.
+The client and server use IceDiscovery to enable the location of the
+Ice hello object. See the config.server and config.client files for
+details on the IceDiscovery configuration.
\ No newline at end of file
diff --git a/java/demo/README b/java/demo/README
index 86783362f5c..edd95c11bb6 100644
--- a/java/demo/README
+++ b/java/demo/README
@@ -3,8 +3,10 @@ are provided to get you started on how to use a particular feature or
 coding technique. See the README file in each subdirectory for details
 on the demos.
 
-The book directory contains demos for some of the code examples in
-"Distributed Programming with Ice".
+The manual directory contains demos for some of the code examples in
+the Ice manual available online:
+
+   http://doc.zeroc.com/display/Ice/Ice+Manual
 
 For more examples of the features of the Ice services (Glacier2, IceGrid,
 IceStorm) please see the demos in the Ice for C++ distribution.
diff --git a/java/demo/book/README b/java/demo/manual/README
index d1653f804c4..6dbc708834e 100644
--- a/java/demo/book/README
+++ b/java/demo/manual/README
@@ -23,7 +23,7 @@ Demos in this directory:
 - printer
 
   An implementation of the simple printer example at the beginning of
-  the book.
+  the manual.
 
 - simple_filesystem
 
diff --git a/java/demo/book/build.gradle b/java/demo/manual/build.gradle
index d540ad0f19a..6f285aaf51a 100644
--- a/java/demo/book/build.gradle
+++ b/java/demo/manual/build.gradle
@@ -9,7 +9,7 @@
 
 ['evictor_filesystem', 'lifecycle', 'printer', 'simple_filesystem'].each {
  	def name = it
-	project(":demo/book/${it}") {
+	project(":demo/manual/${it}") {
 		slice {
 			java {
 				include = ["${projectDir}", "${sliceDir}"]
diff --git a/java/demo/book/evictor/EvictorBase.java b/java/demo/manual/evictor/EvictorBase.java
index c309bd2866a..c309bd2866a 100644
--- a/java/demo/book/evictor/EvictorBase.java
+++ b/java/demo/manual/evictor/EvictorBase.java
diff --git a/java/demo/book/evictor/LinkedList.java b/java/demo/manual/evictor/LinkedList.java
index 5270142e6a9..5270142e6a9 100644
--- a/java/demo/book/evictor/LinkedList.java
+++ b/java/demo/manual/evictor/LinkedList.java
diff --git a/java/demo/book/evictor/README b/java/demo/manual/evictor/README
index cc6b56f5d65..cc6b56f5d65 100644
--- a/java/demo/book/evictor/README
+++ b/java/demo/manual/evictor/README
diff --git a/java/demo/book/evictor_filesystem/.externalToolBuilders/book.demo.evictor_filesystem.slice.launch b/java/demo/manual/evictor_filesystem/.externalToolBuilders/book.demo.evictor_filesystem.slice.launch
index 0ce604434d2..0ce604434d2 100644
--- a/java/demo/book/evictor_filesystem/.externalToolBuilders/book.demo.evictor_filesystem.slice.launch
+++ b/java/demo/manual/evictor_filesystem/.externalToolBuilders/book.demo.evictor_filesystem.slice.launch
diff --git a/java/demo/book/evictor_filesystem/.gitignore b/java/demo/manual/evictor_filesystem/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/demo/book/evictor_filesystem/.gitignore
+++ b/java/demo/manual/evictor_filesystem/.gitignore
diff --git a/java/demo/book/evictor_filesystem/Client.java b/java/demo/manual/evictor_filesystem/Client.java
index 93a48deb2b5..93a48deb2b5 100644
--- a/java/demo/book/evictor_filesystem/Client.java
+++ b/java/demo/manual/evictor_filesystem/Client.java
diff --git a/java/demo/book/evictor_filesystem/DirectoryI.java b/java/demo/manual/evictor_filesystem/DirectoryI.java
index 73074c8b5ec..73074c8b5ec 100644
--- a/java/demo/book/evictor_filesystem/DirectoryI.java
+++ b/java/demo/manual/evictor_filesystem/DirectoryI.java
diff --git a/java/demo/book/evictor_filesystem/FileI.java b/java/demo/manual/evictor_filesystem/FileI.java
index f8904d52490..f8904d52490 100644
--- a/java/demo/book/evictor_filesystem/FileI.java
+++ b/java/demo/manual/evictor_filesystem/FileI.java
diff --git a/java/demo/book/evictor_filesystem/Filesystem.ice b/java/demo/manual/evictor_filesystem/Filesystem.ice
index bb84720f462..bb84720f462 100644
--- a/java/demo/book/evictor_filesystem/Filesystem.ice
+++ b/java/demo/manual/evictor_filesystem/Filesystem.ice
diff --git a/java/demo/book/evictor_filesystem/Grammar.java b/java/demo/manual/evictor_filesystem/Grammar.java
index 16234c61ea5..16234c61ea5 100644
--- a/java/demo/book/evictor_filesystem/Grammar.java
+++ b/java/demo/manual/evictor_filesystem/Grammar.java
diff --git a/java/demo/book/evictor_filesystem/NodeFactory.java b/java/demo/manual/evictor_filesystem/NodeFactory.java
index 80669a9bde2..80669a9bde2 100644
--- a/java/demo/book/evictor_filesystem/NodeFactory.java
+++ b/java/demo/manual/evictor_filesystem/NodeFactory.java
diff --git a/java/demo/book/evictor_filesystem/Parser.java b/java/demo/manual/evictor_filesystem/Parser.java
index 8e89bed9a13..8e89bed9a13 100644
--- a/java/demo/book/evictor_filesystem/Parser.java
+++ b/java/demo/manual/evictor_filesystem/Parser.java
diff --git a/java/demo/book/evictor_filesystem/PersistentFilesystem.ice b/java/demo/manual/evictor_filesystem/PersistentFilesystem.ice
index 07b7d43c382..07b7d43c382 100644
--- a/java/demo/book/evictor_filesystem/PersistentFilesystem.ice
+++ b/java/demo/manual/evictor_filesystem/PersistentFilesystem.ice
diff --git a/java/demo/book/evictor_filesystem/README b/java/demo/manual/evictor_filesystem/README
index 36892b4cfed..36892b4cfed 100644
--- a/java/demo/book/evictor_filesystem/README
+++ b/java/demo/manual/evictor_filesystem/README
diff --git a/java/demo/book/evictor_filesystem/Scanner.java b/java/demo/manual/evictor_filesystem/Scanner.java
index 2b81fcfd450..2b81fcfd450 100644
--- a/java/demo/book/evictor_filesystem/Scanner.java
+++ b/java/demo/manual/evictor_filesystem/Scanner.java
diff --git a/java/demo/book/evictor_filesystem/Server.java b/java/demo/manual/evictor_filesystem/Server.java
index 93449bf215c..93449bf215c 100644
--- a/java/demo/book/evictor_filesystem/Server.java
+++ b/java/demo/manual/evictor_filesystem/Server.java
diff --git a/java/demo/book/evictor_filesystem/Token.java b/java/demo/manual/evictor_filesystem/Token.java
index 7a538343d6c..7a538343d6c 100644
--- a/java/demo/book/evictor_filesystem/Token.java
+++ b/java/demo/manual/evictor_filesystem/Token.java
diff --git a/java/demo/book/evictor_filesystem/config.client b/java/demo/manual/evictor_filesystem/config.client
index 640cfade4f1..640cfade4f1 100644
--- a/java/demo/book/evictor_filesystem/config.client
+++ b/java/demo/manual/evictor_filesystem/config.client
diff --git a/java/demo/book/evictor_filesystem/config.server b/java/demo/manual/evictor_filesystem/config.server
index 69e536ab202..69e536ab202 100644
--- a/java/demo/book/evictor_filesystem/config.server
+++ b/java/demo/manual/evictor_filesystem/config.server
diff --git a/java/demo/book/evictor_filesystem/db/.gitignore b/java/demo/manual/evictor_filesystem/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/java/demo/book/evictor_filesystem/db/.gitignore
+++ b/java/demo/manual/evictor_filesystem/db/.gitignore
diff --git a/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml b/java/demo/manual/evictor_filesystem/demo_manual_evictor_filesystem.iml
index e32f5e3b556..e32f5e3b556 100644
--- a/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml
+++ b/java/demo/manual/evictor_filesystem/demo_manual_evictor_filesystem.iml
diff --git a/java/demo/book/evictor_filesystem/expect.py b/java/demo/manual/evictor_filesystem/expect.py
index 2ee21a1facf..723c2ccf785 100755
--- a/java/demo/book/evictor_filesystem/expect.py
+++ b/java/demo/manual/evictor_filesystem/expect.py
@@ -20,7 +20,7 @@ if len(path) == 0:
 sys.path.append(path[0])
 
 from demoscript import Util
-from demoscript.book import evictor_filesystem
+from demoscript.manual import evictor_filesystem
 
 sys.stdout.write("cleaning databases... ")
 sys.stdout.flush()
diff --git a/java/demo/book/lifecycle/.externalToolBuilders/demo.book.lifecycle.slice.launch b/java/demo/manual/lifecycle/.externalToolBuilders/demo.book.lifecycle.slice.launch
index f4da860e3df..f4da860e3df 100644
--- a/java/demo/book/lifecycle/.externalToolBuilders/demo.book.lifecycle.slice.launch
+++ b/java/demo/manual/lifecycle/.externalToolBuilders/demo.book.lifecycle.slice.launch
diff --git a/java/demo/book/lifecycle/Client.java b/java/demo/manual/lifecycle/Client.java
index aac2733bc58..aac2733bc58 100644
--- a/java/demo/book/lifecycle/Client.java
+++ b/java/demo/manual/lifecycle/Client.java
diff --git a/java/demo/book/lifecycle/Filesystem.ice b/java/demo/manual/lifecycle/Filesystem.ice
index a62086add45..a62086add45 100644
--- a/java/demo/book/lifecycle/Filesystem.ice
+++ b/java/demo/manual/lifecycle/Filesystem.ice
diff --git a/java/demo/book/lifecycle/FilesystemI/DirectoryI.java b/java/demo/manual/lifecycle/FilesystemI/DirectoryI.java
index 005871ed897..005871ed897 100644
--- a/java/demo/book/lifecycle/FilesystemI/DirectoryI.java
+++ b/java/demo/manual/lifecycle/FilesystemI/DirectoryI.java
diff --git a/java/demo/book/lifecycle/FilesystemI/FileI.java b/java/demo/manual/lifecycle/FilesystemI/FileI.java
index 7912d4bc83e..7912d4bc83e 100644
--- a/java/demo/book/lifecycle/FilesystemI/FileI.java
+++ b/java/demo/manual/lifecycle/FilesystemI/FileI.java
diff --git a/java/demo/book/lifecycle/FilesystemI/NodeI.java b/java/demo/manual/lifecycle/FilesystemI/NodeI.java
index 33786ce60f6..33786ce60f6 100644
--- a/java/demo/book/lifecycle/FilesystemI/NodeI.java
+++ b/java/demo/manual/lifecycle/FilesystemI/NodeI.java
diff --git a/java/demo/book/lifecycle/Grammar.java b/java/demo/manual/lifecycle/Grammar.java
index 16234c61ea5..16234c61ea5 100644
--- a/java/demo/book/lifecycle/Grammar.java
+++ b/java/demo/manual/lifecycle/Grammar.java
diff --git a/java/demo/book/lifecycle/Parser.java b/java/demo/manual/lifecycle/Parser.java
index 8e89bed9a13..8e89bed9a13 100644
--- a/java/demo/book/lifecycle/Parser.java
+++ b/java/demo/manual/lifecycle/Parser.java
diff --git a/java/demo/book/lifecycle/README b/java/demo/manual/lifecycle/README
index 260aa1f0445..260aa1f0445 100644
--- a/java/demo/book/lifecycle/README
+++ b/java/demo/manual/lifecycle/README
diff --git a/java/demo/book/lifecycle/Scanner.java b/java/demo/manual/lifecycle/Scanner.java
index 2b81fcfd450..2b81fcfd450 100644
--- a/java/demo/book/lifecycle/Scanner.java
+++ b/java/demo/manual/lifecycle/Scanner.java
diff --git a/java/demo/book/lifecycle/Server.java b/java/demo/manual/lifecycle/Server.java
index 2a5fe5d103a..2a5fe5d103a 100644
--- a/java/demo/book/lifecycle/Server.java
+++ b/java/demo/manual/lifecycle/Server.java
diff --git a/java/demo/book/lifecycle/Token.java b/java/demo/manual/lifecycle/Token.java
index 7a538343d6c..7a538343d6c 100644
--- a/java/demo/book/lifecycle/Token.java
+++ b/java/demo/manual/lifecycle/Token.java
diff --git a/java/demo/book/lifecycle/demo_book_lifecycle.iml b/java/demo/manual/lifecycle/demo_manual_lifecycle.iml
index b6dce281ba2..b6dce281ba2 100644
--- a/java/demo/book/lifecycle/demo_book_lifecycle.iml
+++ b/java/demo/manual/lifecycle/demo_manual_lifecycle.iml
diff --git a/java/demo/book/lifecycle/expect.py b/java/demo/manual/lifecycle/expect.py
index 8f6eee70ba9..424bc7f5714 100755
--- a/java/demo/book/lifecycle/expect.py
+++ b/java/demo/manual/lifecycle/expect.py
@@ -20,7 +20,7 @@ if len(path) == 0:
 sys.path.append(path[0])
 
 from demoscript import Util
-from demoscript.book import lifecycle
+from demoscript.manual import lifecycle
 
 server = Util.spawn('java Server --Ice.PrintAdapterReady')
 server.expect('.* ready')
diff --git a/java/demo/book/map_filesystem/.externalToolBuilders/demo.book.map_filesystem.launch b/java/demo/manual/map_filesystem/.externalToolBuilders/demo.book.map_filesystem.launch
index abe7897ac17..abe7897ac17 100644
--- a/java/demo/book/map_filesystem/.externalToolBuilders/demo.book.map_filesystem.launch
+++ b/java/demo/manual/map_filesystem/.externalToolBuilders/demo.book.map_filesystem.launch
diff --git a/java/demo/book/map_filesystem/.gitignore b/java/demo/manual/map_filesystem/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/demo/book/map_filesystem/.gitignore
+++ b/java/demo/manual/map_filesystem/.gitignore
diff --git a/java/demo/book/map_filesystem/Client.java b/java/demo/manual/map_filesystem/Client.java
index 2309f6a3b23..2309f6a3b23 100644
--- a/java/demo/book/map_filesystem/Client.java
+++ b/java/demo/manual/map_filesystem/Client.java
diff --git a/java/demo/book/map_filesystem/DirectoryI.java b/java/demo/manual/map_filesystem/DirectoryI.java
index 226814d5981..226814d5981 100644
--- a/java/demo/book/map_filesystem/DirectoryI.java
+++ b/java/demo/manual/map_filesystem/DirectoryI.java
diff --git a/java/demo/book/map_filesystem/FileI.java b/java/demo/manual/map_filesystem/FileI.java
index 33b8ece4e85..33b8ece4e85 100644
--- a/java/demo/book/map_filesystem/FileI.java
+++ b/java/demo/manual/map_filesystem/FileI.java
diff --git a/java/demo/book/map_filesystem/Filesystem.ice b/java/demo/manual/map_filesystem/Filesystem.ice
index a62086add45..a62086add45 100644
--- a/java/demo/book/map_filesystem/Filesystem.ice
+++ b/java/demo/manual/map_filesystem/Filesystem.ice
diff --git a/java/demo/book/map_filesystem/FilesystemDB.ice b/java/demo/manual/map_filesystem/FilesystemDB.ice
index 6e2eef6bcd1..6e2eef6bcd1 100644
--- a/java/demo/book/map_filesystem/FilesystemDB.ice
+++ b/java/demo/manual/map_filesystem/FilesystemDB.ice
diff --git a/java/demo/book/map_filesystem/Grammar.java b/java/demo/manual/map_filesystem/Grammar.java
index 16234c61ea5..16234c61ea5 100644
--- a/java/demo/book/map_filesystem/Grammar.java
+++ b/java/demo/manual/map_filesystem/Grammar.java
diff --git a/java/demo/book/map_filesystem/Parser.java b/java/demo/manual/map_filesystem/Parser.java
index 8e89bed9a13..8e89bed9a13 100644
--- a/java/demo/book/map_filesystem/Parser.java
+++ b/java/demo/manual/map_filesystem/Parser.java
diff --git a/java/demo/book/map_filesystem/README b/java/demo/manual/map_filesystem/README
index 4cf93946329..4cf93946329 100644
--- a/java/demo/book/map_filesystem/README
+++ b/java/demo/manual/map_filesystem/README
diff --git a/java/demo/book/map_filesystem/Scanner.java b/java/demo/manual/map_filesystem/Scanner.java
index 2b81fcfd450..2b81fcfd450 100644
--- a/java/demo/book/map_filesystem/Scanner.java
+++ b/java/demo/manual/map_filesystem/Scanner.java
diff --git a/java/demo/book/map_filesystem/Server.java b/java/demo/manual/map_filesystem/Server.java
index 8ce2d5f586a..8ce2d5f586a 100644
--- a/java/demo/book/map_filesystem/Server.java
+++ b/java/demo/manual/map_filesystem/Server.java
diff --git a/java/demo/book/map_filesystem/Token.java b/java/demo/manual/map_filesystem/Token.java
index 7a538343d6c..7a538343d6c 100644
--- a/java/demo/book/map_filesystem/Token.java
+++ b/java/demo/manual/map_filesystem/Token.java
diff --git a/java/demo/book/map_filesystem/build.gradle b/java/demo/manual/map_filesystem/build.gradle
index 2406cdb70f0..2406cdb70f0 100644
--- a/java/demo/book/map_filesystem/build.gradle
+++ b/java/demo/manual/map_filesystem/build.gradle
diff --git a/java/demo/book/map_filesystem/config.client b/java/demo/manual/map_filesystem/config.client
index 640cfade4f1..640cfade4f1 100644
--- a/java/demo/book/map_filesystem/config.client
+++ b/java/demo/manual/map_filesystem/config.client
diff --git a/java/demo/book/map_filesystem/config.server b/java/demo/manual/map_filesystem/config.server
index c8694039614..c8694039614 100644
--- a/java/demo/book/map_filesystem/config.server
+++ b/java/demo/manual/map_filesystem/config.server
diff --git a/java/demo/book/map_filesystem/db/.gitignore b/java/demo/manual/map_filesystem/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/java/demo/book/map_filesystem/db/.gitignore
+++ b/java/demo/manual/map_filesystem/db/.gitignore
diff --git a/java/demo/book/map_filesystem/demo_book_map_filesystem.iml b/java/demo/manual/map_filesystem/demo_manual_map_filesystem.iml
index 93543e73196..93543e73196 100644
--- a/java/demo/book/map_filesystem/demo_book_map_filesystem.iml
+++ b/java/demo/manual/map_filesystem/demo_manual_map_filesystem.iml
diff --git a/java/demo/book/map_filesystem/expect.py b/java/demo/manual/map_filesystem/expect.py
index 592bf5aca1e..c983591d008 100755
--- a/java/demo/book/map_filesystem/expect.py
+++ b/java/demo/manual/map_filesystem/expect.py
@@ -20,7 +20,7 @@ if len(path) == 0:
 sys.path.append(path[0])
 
 from demoscript import Util
-from demoscript.book import map_filesystem
+from demoscript.manual import map_filesystem
 
 sys.stdout.write("cleaning databases... ")
 sys.stdout.flush()
diff --git a/java/demo/book/printer/.externalToolBuilders/demo.book.printer.launch b/java/demo/manual/printer/.externalToolBuilders/demo.book.printer.launch
index b8b0aefe5db..b8b0aefe5db 100644
--- a/java/demo/book/printer/.externalToolBuilders/demo.book.printer.launch
+++ b/java/demo/manual/printer/.externalToolBuilders/demo.book.printer.launch
diff --git a/java/demo/book/printer/Client.java b/java/demo/manual/printer/Client.java
index 458eaae3800..458eaae3800 100644
--- a/java/demo/book/printer/Client.java
+++ b/java/demo/manual/printer/Client.java
diff --git a/java/demo/book/printer/Printer.ice b/java/demo/manual/printer/Printer.ice
index 343fd8e627b..343fd8e627b 100755
--- a/java/demo/book/printer/Printer.ice
+++ b/java/demo/manual/printer/Printer.ice
diff --git a/java/demo/book/printer/PrinterI.java b/java/demo/manual/printer/PrinterI.java
index 6d17fbfd036..6d17fbfd036 100644
--- a/java/demo/book/printer/PrinterI.java
+++ b/java/demo/manual/printer/PrinterI.java
diff --git a/java/demo/book/printer/README b/java/demo/manual/printer/README
index 38d5c0f402d..38d5c0f402d 100644
--- a/java/demo/book/printer/README
+++ b/java/demo/manual/printer/README
diff --git a/java/demo/book/printer/Server.java b/java/demo/manual/printer/Server.java
index cdb11fa5312..cdb11fa5312 100644
--- a/java/demo/book/printer/Server.java
+++ b/java/demo/manual/printer/Server.java
diff --git a/java/demo/book/printer/demo_book_printer.iml b/java/demo/manual/printer/demo_manual_printer.iml
index b6dce281ba2..b6dce281ba2 100644
--- a/java/demo/book/printer/demo_book_printer.iml
+++ b/java/demo/manual/printer/demo_manual_printer.iml
diff --git a/java/demo/book/printer/expect.py b/java/demo/manual/printer/expect.py
index 15022fdfca6..15022fdfca6 100755
--- a/java/demo/book/printer/expect.py
+++ b/java/demo/manual/printer/expect.py
diff --git a/java/demo/book/simple_filesystem/.externalToolBuilders/demo.book.simple_filesystem.launch b/java/demo/manual/simple_filesystem/.externalToolBuilders/demo.book.simple_filesystem.launch
index 2256b877bae..2256b877bae 100644
--- a/java/demo/book/simple_filesystem/.externalToolBuilders/demo.book.simple_filesystem.launch
+++ b/java/demo/manual/simple_filesystem/.externalToolBuilders/demo.book.simple_filesystem.launch
diff --git a/java/demo/book/simple_filesystem/Client.java b/java/demo/manual/simple_filesystem/Client.java
index de1516eb010..de1516eb010 100644
--- a/java/demo/book/simple_filesystem/Client.java
+++ b/java/demo/manual/simple_filesystem/Client.java
diff --git a/java/demo/book/simple_filesystem/Filesystem.ice b/java/demo/manual/simple_filesystem/Filesystem.ice
index 21e8a435fcb..21e8a435fcb 100755
--- a/java/demo/book/simple_filesystem/Filesystem.ice
+++ b/java/demo/manual/simple_filesystem/Filesystem.ice
diff --git a/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java b/java/demo/manual/simple_filesystem/Filesystem/DirectoryI.java
index 69f793bb89c..69f793bb89c 100644
--- a/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
+++ b/java/demo/manual/simple_filesystem/Filesystem/DirectoryI.java
diff --git a/java/demo/book/simple_filesystem/Filesystem/FileI.java b/java/demo/manual/simple_filesystem/Filesystem/FileI.java
index 3a4bff86431..3a4bff86431 100644
--- a/java/demo/book/simple_filesystem/Filesystem/FileI.java
+++ b/java/demo/manual/simple_filesystem/Filesystem/FileI.java
diff --git a/java/demo/book/simple_filesystem/README b/java/demo/manual/simple_filesystem/README
index 6e9a291b37d..6e9a291b37d 100644
--- a/java/demo/book/simple_filesystem/README
+++ b/java/demo/manual/simple_filesystem/README
diff --git a/java/demo/book/simple_filesystem/Server.java b/java/demo/manual/simple_filesystem/Server.java
index a5a97aa6140..a5a97aa6140 100644
--- a/java/demo/book/simple_filesystem/Server.java
+++ b/java/demo/manual/simple_filesystem/Server.java
diff --git a/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml b/java/demo/manual/simple_filesystem/demo_manual_simple_filesystem.iml
index 5e03c3e6c62..5e03c3e6c62 100644
--- a/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml
+++ b/java/demo/manual/simple_filesystem/demo_manual_simple_filesystem.iml
diff --git a/java/demo/book/simple_filesystem/expect.py b/java/demo/manual/simple_filesystem/expect.py
index 0a9bc62fbaf..0a9bc62fbaf 100755
--- a/java/demo/book/simple_filesystem/expect.py
+++ b/java/demo/manual/simple_filesystem/expect.py