Fixed ICE-5811: renamed book demos to manual demos

349 files changed, 157 insertions, 121 deletions

diff --git a/.gitignore b/.gitignore
index 0eb5c4a1269..bbf4b8069dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ cpp/demo/Debug
 cpp/test/IceBox/configuration/build.txt
 
 js/lib
+js/node_modules
 
 # OS X Keychain
 
diff --git a/cpp/allDemos.py b/cpp/allDemos.py
index c76260dbac1..9016bc46d9d 100755
--- a/cpp/allDemos.py
+++ b/cpp/allDemos.py
@@ -65,11 +65,11 @@ demos = [
     "Freeze/backup",
     "Freeze/transform",
     "Freeze/casino",
-    "book/map_filesystem",
-    "book/evictor_filesystem",
-    "book/simple_filesystem",
-    "book/printer",
-    "book/lifecycle"]
+    "manual/map_filesystem",
+    "manual/evictor_filesystem",
+    "manual/simple_filesystem",
+    "manual/printer",
+    "manual/lifecycle"]
 
 if not Util.isNoServices():
     demos += ["IceBox/hello", "IceGrid/icebox"]
diff --git a/cpp/demo/IceDiscovery/README b/cpp/demo/IceDiscovery/README
new file mode 100644
index 00000000000..1baa94c1914
--- /dev/null
+++ b/cpp/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/cpp/demo/IceDiscovery/hello/README b/cpp/demo/IceDiscovery/hello/README
index e6538c4913a..1af716ba895 100644
--- a/cpp/demo/IceDiscovery/hello/README
+++ b/cpp/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:
 
 $ 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/cpp/demo/IceDiscovery/replication/config.server3 b/cpp/demo/IceDiscovery/replication/config.server3
index 0b1df84f2e2..01b7d6d674f 100644
--- a/cpp/demo/IceDiscovery/replication/config.server3
+++ b/cpp/demo/IceDiscovery/replication/config.server3
@@ -24,7 +24,6 @@ Ice.ProgramName=Server3
 # Enable the Ice discovery plugin
 #
 Ice.Plugin.IceDiscovery=IceDiscovery:createIceDiscovery
-#Ice.Default.CollocationOptimized=0 # Required by the plugin
 
 #
 # Ensure connection establishment doesn't take too long.
diff --git a/cpp/demo/IceGrid/README b/cpp/demo/IceGrid/README
index 67e3bbabe32..31adb59affa 100644
--- a/cpp/demo/IceGrid/README
+++ b/cpp/demo/IceGrid/README
@@ -4,6 +4,11 @@ Demos in this directory:
 
   This demo shows how to use the allocation feature of IceGrid.
 
+- customLoadBalancing
+  
+  This demo shows how to implement IceGrid custom load balancing using
+  replica group filters.
+
 - icebox
 
   This demo shows a simple IceGrid deployment with an IceBox server.
diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile
index b0a265d5f4e..4cc4ce77919 100644
--- a/cpp/demo/Makefile
+++ b/cpp/demo/Makefile
@@ -19,7 +19,7 @@ SUBDIRS		= IceUtil \
 		  IceStorm \
 		  Glacier2 \
 		  IceGrid \
-		  book
+		  manual
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
 
diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak
index d0365c18388..b7b1ace6873 100644
--- a/cpp/demo/Makefile.mak
+++ b/cpp/demo/Makefile.mak
@@ -14,7 +14,7 @@ top_srcdir	= ..
 SUBDIRS		= IceUtil \
 		  Ice \
 		  IceDiscovery \
-		  book \
+		  manual \
 		  Glacier2 \
 		  Freeze \
 		  IceStorm \
diff --git a/cpp/demo/README b/cpp/demo/README
index c30fbcec28e..8fdaa94adac 100644
--- a/cpp/demo/README
+++ b/cpp/demo/README
@@ -3,5 +3,7 @@ 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
diff --git a/cpp/demo/demo.sln b/cpp/demo/demo.sln
index 89b96d82f40..e6672b65de2 100644
--- a/cpp/demo/demo.sln
+++ b/cpp/demo/demo.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Book", "Book", "{D4C50BCA-F7CF-4EA4-8401-A4106850C132}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{D4C50BCA-F7CF-4EA4-8401-A4106850C132}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Freeze", "Freeze", "{EDB92982-CA2F-4083-86C7-AF7CEA04E94A}"
 EndProject
@@ -263,29 +263,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subscriber", "IceStorm\repl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "workqueue", "IceUtil\workqueue\IceUtil.workqueue.vcxproj", "{AE45156F-573C-4BDC-911D-EC7C28DB36D7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "book\lifecycle\book.lifecycle.client.vcxproj", "{332A63F9-BBD9-4324-8C1E-26604C71D54F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "manual\lifecycle\manual.lifecycle.client.vcxproj", "{332A63F9-BBD9-4324-8C1E-26604C71D54F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "book\lifecycle\book.lifecycle.server.vcxproj", "{95043699-A842-4E16-A95B-13E02709B210}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "manual\lifecycle\manual.lifecycle.server.vcxproj", "{95043699-A842-4E16-A95B-13E02709B210}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "book\printer\book.printer.client.vcxproj", "{4CCAF112-F152-422A-91BE-27C72F638092}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "manual\printer\manual.printer.client.vcxproj", "{4CCAF112-F152-422A-91BE-27C72F638092}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "book\printer\book.printer.server.vcxproj", "{131C5C24-50C3-4AD6-A8D3-C57CEC50AFB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "manual\printer\manual.printer.server.vcxproj", "{131C5C24-50C3-4AD6-A8D3-C57CEC50AFB9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "book\simple_filesystem\book.simple_filesystem.client.vcxproj", "{4B2FC587-BB5D-4B19-85E0-56E7C7636294}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "manual\simple_filesystem\manual.simple_filesystem.client.vcxproj", "{4B2FC587-BB5D-4B19-85E0-56E7C7636294}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "book\simple_filesystem\book.simple_filesystem.server.vcxproj", "{EFCFF55E-CCD2-451E-A0B5-604249ECE4D1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "manual\simple_filesystem\manual.simple_filesystem.server.vcxproj", "{EFCFF55E-CCD2-451E-A0B5-604249ECE4D1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "Ice\interleaved\Ice.interleaved.client.vcxproj", "{798DC5EC-427F-49A6-9028-F2A420CCEA4B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "Ice\interleaved\Ice.interleaved.server.vcxproj", "{383AB467-E29D-4A9D-A5D4-6BCA8E754A88}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "book\map_filesystem\book.map_filesystem.client.vcxproj", "{0C6E1127-1105-49F0-99BB-CBDC1C2566F0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "manual\map_filesystem\manual.map_filesystem.client.vcxproj", "{0C6E1127-1105-49F0-99BB-CBDC1C2566F0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "book\map_filesystem\book.map_filesystem.server.vcxproj", "{37369B6D-DFB9-4413-A4F5-AE261FDA74A2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "manual\map_filesystem\manual.map_filesystem.server.vcxproj", "{37369B6D-DFB9-4413-A4F5-AE261FDA74A2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "book\evictor_filesystem\book.evictor_filesystem.client.vcxproj", "{66668B00-70BB-4CF0-8DB2-2717DC5F4DA3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "manual\evictor_filesystem\manual.evictor_filesystem.client.vcxproj", "{66668B00-70BB-4CF0-8DB2-2717DC5F4DA3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "book\evictor_filesystem\book.evictor_filesystem.server.vcxproj", "{2E1BBDAB-F9C2-4C72-9587-29D7F428BC32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "manual\evictor_filesystem\manual.evictor_filesystem.server.vcxproj", "{2E1BBDAB-F9C2-4C72-9587-29D7F428BC32}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "optional", "optional", "{57D20A28-9954-4D22-ACE6-B367145DC11E}"
 EndProject
diff --git a/cpp/demo/book/Makefile b/cpp/demo/manual/Makefile
index f6c895d93d7..f6c895d93d7 100644
--- a/cpp/demo/book/Makefile
+++ b/cpp/demo/manual/Makefile
diff --git a/cpp/demo/book/Makefile.mak b/cpp/demo/manual/Makefile.mak
index b17c8ef1429..b17c8ef1429 100644
--- a/cpp/demo/book/Makefile.mak
+++ b/cpp/demo/manual/Makefile.mak
diff --git a/cpp/demo/book/README b/cpp/demo/manual/README
index c823ec7313a..26502a28200 100644
--- a/cpp/demo/book/README
+++ b/cpp/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/cpp/demo/book/evictor/EvictorBase.cpp b/cpp/demo/manual/evictor/EvictorBase.cpp
index ed41cfbaba4..ed41cfbaba4 100644
--- a/cpp/demo/book/evictor/EvictorBase.cpp
+++ b/cpp/demo/manual/evictor/EvictorBase.cpp
diff --git a/cpp/demo/book/evictor/EvictorBase.h b/cpp/demo/manual/evictor/EvictorBase.h
index 06bbab70818..06bbab70818 100644
--- a/cpp/demo/book/evictor/EvictorBase.h
+++ b/cpp/demo/manual/evictor/EvictorBase.h
diff --git a/cpp/demo/book/evictor/README b/cpp/demo/manual/evictor/README
index ef2b2857616..ef2b2857616 100644
--- a/cpp/demo/book/evictor/README
+++ b/cpp/demo/manual/evictor/README
diff --git a/cpp/demo/book/evictor_filesystem/.depend.mak b/cpp/demo/manual/evictor_filesystem/.depend.mak
index 50006e9f5c3..50006e9f5c3 100755
--- a/cpp/demo/book/evictor_filesystem/.depend.mak
+++ b/cpp/demo/manual/evictor_filesystem/.depend.mak
diff --git a/cpp/demo/book/evictor_filesystem/.gitignore b/cpp/demo/manual/evictor_filesystem/.gitignore
index 7c81ab1ce91..7c81ab1ce91 100644
--- a/cpp/demo/book/evictor_filesystem/.gitignore
+++ b/cpp/demo/manual/evictor_filesystem/.gitignore
diff --git a/cpp/demo/book/evictor_filesystem/Client.cpp b/cpp/demo/manual/evictor_filesystem/Client.cpp
index c84da4617d2..c84da4617d2 100644
--- a/cpp/demo/book/evictor_filesystem/Client.cpp
+++ b/cpp/demo/manual/evictor_filesystem/Client.cpp
diff --git a/cpp/demo/book/evictor_filesystem/Filesystem.ice b/cpp/demo/manual/evictor_filesystem/Filesystem.ice
index 40093480639..40093480639 100644
--- a/cpp/demo/book/evictor_filesystem/Filesystem.ice
+++ b/cpp/demo/manual/evictor_filesystem/Filesystem.ice
diff --git a/cpp/demo/book/evictor_filesystem/Grammar.cpp b/cpp/demo/manual/evictor_filesystem/Grammar.cpp
index 90457427522..90457427522 100644
--- a/cpp/demo/book/evictor_filesystem/Grammar.cpp
+++ b/cpp/demo/manual/evictor_filesystem/Grammar.cpp
diff --git a/cpp/demo/book/evictor_filesystem/Grammar.h b/cpp/demo/manual/evictor_filesystem/Grammar.h
index ca5a99150f6..ca5a99150f6 100644
--- a/cpp/demo/book/evictor_filesystem/Grammar.h
+++ b/cpp/demo/manual/evictor_filesystem/Grammar.h
diff --git a/cpp/demo/book/evictor_filesystem/Grammar.y b/cpp/demo/manual/evictor_filesystem/Grammar.y
index 8850dee37ce..8850dee37ce 100644
--- a/cpp/demo/book/evictor_filesystem/Grammar.y
+++ b/cpp/demo/manual/evictor_filesystem/Grammar.y
diff --git a/cpp/demo/book/evictor_filesystem/Makefile b/cpp/demo/manual/evictor_filesystem/Makefile
index 70b72c839d0..70b72c839d0 100644
--- a/cpp/demo/book/evictor_filesystem/Makefile
+++ b/cpp/demo/manual/evictor_filesystem/Makefile
diff --git a/cpp/demo/book/evictor_filesystem/Makefile.mak b/cpp/demo/manual/evictor_filesystem/Makefile.mak
index 43bac65048d..43bac65048d 100644
--- a/cpp/demo/book/evictor_filesystem/Makefile.mak
+++ b/cpp/demo/manual/evictor_filesystem/Makefile.mak
diff --git a/cpp/demo/book/evictor_filesystem/Parser.cpp b/cpp/demo/manual/evictor_filesystem/Parser.cpp
index c3c3bb5a3a4..c3c3bb5a3a4 100644
--- a/cpp/demo/book/evictor_filesystem/Parser.cpp
+++ b/cpp/demo/manual/evictor_filesystem/Parser.cpp
diff --git a/cpp/demo/book/evictor_filesystem/Parser.h b/cpp/demo/manual/evictor_filesystem/Parser.h
index 5f5969167b2..5f5969167b2 100644
--- a/cpp/demo/book/evictor_filesystem/Parser.h
+++ b/cpp/demo/manual/evictor_filesystem/Parser.h
diff --git a/cpp/demo/book/evictor_filesystem/PersistentFilesystem.ice b/cpp/demo/manual/evictor_filesystem/PersistentFilesystem.ice
index 52873460084..52873460084 100644
--- a/cpp/demo/book/evictor_filesystem/PersistentFilesystem.ice
+++ b/cpp/demo/manual/evictor_filesystem/PersistentFilesystem.ice
diff --git a/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.cpp b/cpp/demo/manual/evictor_filesystem/PersistentFilesystemI.cpp
index 076357e3c66..076357e3c66 100644
--- a/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.cpp
+++ b/cpp/demo/manual/evictor_filesystem/PersistentFilesystemI.cpp
diff --git a/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.h b/cpp/demo/manual/evictor_filesystem/PersistentFilesystemI.h
index 19c123cdead..19c123cdead 100644
--- a/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.h
+++ b/cpp/demo/manual/evictor_filesystem/PersistentFilesystemI.h
diff --git a/cpp/demo/book/evictor_filesystem/README b/cpp/demo/manual/evictor_filesystem/README
index f7254add36d..f7254add36d 100644
--- a/cpp/demo/book/evictor_filesystem/README
+++ b/cpp/demo/manual/evictor_filesystem/README
diff --git a/cpp/demo/book/evictor_filesystem/Scanner.cpp b/cpp/demo/manual/evictor_filesystem/Scanner.cpp
index bb9ec829e1e..bb9ec829e1e 100644
--- a/cpp/demo/book/evictor_filesystem/Scanner.cpp
+++ b/cpp/demo/manual/evictor_filesystem/Scanner.cpp
diff --git a/cpp/demo/book/evictor_filesystem/Scanner.l b/cpp/demo/manual/evictor_filesystem/Scanner.l
index c89cfbe18b0..c89cfbe18b0 100644
--- a/cpp/demo/book/evictor_filesystem/Scanner.l
+++ b/cpp/demo/manual/evictor_filesystem/Scanner.l
diff --git a/cpp/demo/book/evictor_filesystem/Server.cpp b/cpp/demo/manual/evictor_filesystem/Server.cpp
index 7ff0eefb4b3..7ff0eefb4b3 100644
--- a/cpp/demo/book/evictor_filesystem/Server.cpp
+++ b/cpp/demo/manual/evictor_filesystem/Server.cpp
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.client.vcxproj
index 9842a7c8afc..9842a7c8afc 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj
+++ b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.client.vcxproj
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters
index 18d06402848..18d06402848 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters
+++ b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.server.vcxproj
index 1ccff5eb553..1ccff5eb553 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj
+++ b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.server.vcxproj
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters
index 212e38f87d3..212e38f87d3 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters
+++ b/cpp/demo/manual/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters
diff --git a/cpp/demo/book/evictor_filesystem/config.client b/cpp/demo/manual/evictor_filesystem/config.client
index 640cfade4f1..640cfade4f1 100644
--- a/cpp/demo/book/evictor_filesystem/config.client
+++ b/cpp/demo/manual/evictor_filesystem/config.client
diff --git a/cpp/demo/book/evictor_filesystem/config.server b/cpp/demo/manual/evictor_filesystem/config.server
index 69e536ab202..69e536ab202 100644
--- a/cpp/demo/book/evictor_filesystem/config.server
+++ b/cpp/demo/manual/evictor_filesystem/config.server
diff --git a/cpp/demo/book/evictor_filesystem/db/.gitignore b/cpp/demo/manual/evictor_filesystem/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/cpp/demo/book/evictor_filesystem/db/.gitignore
+++ b/cpp/demo/manual/evictor_filesystem/db/.gitignore
diff --git a/cpp/demo/book/evictor_filesystem/expect.py b/cpp/demo/manual/evictor_filesystem/expect.py
index 104f7f6325b..e6994441caa 100755
--- a/cpp/demo/book/evictor_filesystem/expect.py
+++ b/cpp/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/cpp/demo/book/evictor_filesystem/generated/client/.gitignore b/cpp/demo/manual/evictor_filesystem/generated/client/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/evictor_filesystem/generated/client/.gitignore
+++ b/cpp/demo/manual/evictor_filesystem/generated/client/.gitignore
diff --git a/cpp/demo/book/evictor_filesystem/generated/server/.gitignore b/cpp/demo/manual/evictor_filesystem/generated/server/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/evictor_filesystem/generated/server/.gitignore
+++ b/cpp/demo/manual/evictor_filesystem/generated/server/.gitignore
diff --git a/cpp/demo/book/lifecycle/.depend.mak b/cpp/demo/manual/lifecycle/.depend.mak
index 8604cd43a93..8604cd43a93 100755
--- a/cpp/demo/book/lifecycle/.depend.mak
+++ b/cpp/demo/manual/lifecycle/.depend.mak
diff --git a/cpp/demo/book/lifecycle/.gitignore b/cpp/demo/manual/lifecycle/.gitignore
index a0bd7a59dd3..a0bd7a59dd3 100644
--- a/cpp/demo/book/lifecycle/.gitignore
+++ b/cpp/demo/manual/lifecycle/.gitignore
diff --git a/cpp/demo/book/lifecycle/Client.cpp b/cpp/demo/manual/lifecycle/Client.cpp
index 0e2d5db4f17..0e2d5db4f17 100644
--- a/cpp/demo/book/lifecycle/Client.cpp
+++ b/cpp/demo/manual/lifecycle/Client.cpp
diff --git a/cpp/demo/book/lifecycle/Filesystem.ice b/cpp/demo/manual/lifecycle/Filesystem.ice
index 905c482f4e4..905c482f4e4 100644
--- a/cpp/demo/book/lifecycle/Filesystem.ice
+++ b/cpp/demo/manual/lifecycle/Filesystem.ice
diff --git a/cpp/demo/book/lifecycle/FilesystemI.cpp b/cpp/demo/manual/lifecycle/FilesystemI.cpp
index fdb290725c7..fdb290725c7 100644
--- a/cpp/demo/book/lifecycle/FilesystemI.cpp
+++ b/cpp/demo/manual/lifecycle/FilesystemI.cpp
diff --git a/cpp/demo/book/lifecycle/FilesystemI.h b/cpp/demo/manual/lifecycle/FilesystemI.h
index 7a9d0b18732..7a9d0b18732 100644
--- a/cpp/demo/book/lifecycle/FilesystemI.h
+++ b/cpp/demo/manual/lifecycle/FilesystemI.h
diff --git a/cpp/demo/book/lifecycle/Grammar.cpp b/cpp/demo/manual/lifecycle/Grammar.cpp
index 90457427522..90457427522 100644
--- a/cpp/demo/book/lifecycle/Grammar.cpp
+++ b/cpp/demo/manual/lifecycle/Grammar.cpp
diff --git a/cpp/demo/book/lifecycle/Grammar.h b/cpp/demo/manual/lifecycle/Grammar.h
index ca5a99150f6..ca5a99150f6 100644
--- a/cpp/demo/book/lifecycle/Grammar.h
+++ b/cpp/demo/manual/lifecycle/Grammar.h
diff --git a/cpp/demo/book/lifecycle/Grammar.y b/cpp/demo/manual/lifecycle/Grammar.y
index 8850dee37ce..8850dee37ce 100644
--- a/cpp/demo/book/lifecycle/Grammar.y
+++ b/cpp/demo/manual/lifecycle/Grammar.y
diff --git a/cpp/demo/book/lifecycle/Makefile b/cpp/demo/manual/lifecycle/Makefile
index 8701c10b8a9..8701c10b8a9 100644
--- a/cpp/demo/book/lifecycle/Makefile
+++ b/cpp/demo/manual/lifecycle/Makefile
diff --git a/cpp/demo/book/lifecycle/Makefile.mak b/cpp/demo/manual/lifecycle/Makefile.mak
index 96aa40851de..96aa40851de 100644
--- a/cpp/demo/book/lifecycle/Makefile.mak
+++ b/cpp/demo/manual/lifecycle/Makefile.mak
diff --git a/cpp/demo/book/lifecycle/Parser.cpp b/cpp/demo/manual/lifecycle/Parser.cpp
index 945e67e98ca..945e67e98ca 100644
--- a/cpp/demo/book/lifecycle/Parser.cpp
+++ b/cpp/demo/manual/lifecycle/Parser.cpp
diff --git a/cpp/demo/book/lifecycle/Parser.h b/cpp/demo/manual/lifecycle/Parser.h
index 5f5969167b2..5f5969167b2 100644
--- a/cpp/demo/book/lifecycle/Parser.h
+++ b/cpp/demo/manual/lifecycle/Parser.h
diff --git a/cpp/demo/book/lifecycle/README b/cpp/demo/manual/lifecycle/README
index c1cd9ec96f6..c1cd9ec96f6 100644
--- a/cpp/demo/book/lifecycle/README
+++ b/cpp/demo/manual/lifecycle/README
diff --git a/cpp/demo/book/lifecycle/Scanner.cpp b/cpp/demo/manual/lifecycle/Scanner.cpp
index bb9ec829e1e..bb9ec829e1e 100644
--- a/cpp/demo/book/lifecycle/Scanner.cpp
+++ b/cpp/demo/manual/lifecycle/Scanner.cpp
diff --git a/cpp/demo/book/lifecycle/Scanner.l b/cpp/demo/manual/lifecycle/Scanner.l
index c89cfbe18b0..c89cfbe18b0 100644
--- a/cpp/demo/book/lifecycle/Scanner.l
+++ b/cpp/demo/manual/lifecycle/Scanner.l
diff --git a/cpp/demo/book/lifecycle/Server.cpp b/cpp/demo/manual/lifecycle/Server.cpp
index 6654c4cda31..6654c4cda31 100644
--- a/cpp/demo/book/lifecycle/Server.cpp
+++ b/cpp/demo/manual/lifecycle/Server.cpp
diff --git a/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj b/cpp/demo/manual/lifecycle/book.lifecycle.client.vcxproj
index b7b37d6468a..b7b37d6468a 100644
--- a/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj
+++ b/cpp/demo/manual/lifecycle/book.lifecycle.client.vcxproj
diff --git a/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj.filters b/cpp/demo/manual/lifecycle/book.lifecycle.client.vcxproj.filters
index cf3d61ace3c..cf3d61ace3c 100644
--- a/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj.filters
+++ b/cpp/demo/manual/lifecycle/book.lifecycle.client.vcxproj.filters
diff --git a/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj b/cpp/demo/manual/lifecycle/book.lifecycle.server.vcxproj
index 73757275c75..73757275c75 100644
--- a/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj
+++ b/cpp/demo/manual/lifecycle/book.lifecycle.server.vcxproj
diff --git a/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj.filters b/cpp/demo/manual/lifecycle/book.lifecycle.server.vcxproj.filters
index c5545f14b72..c5545f14b72 100644
--- a/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj.filters
+++ b/cpp/demo/manual/lifecycle/book.lifecycle.server.vcxproj.filters
diff --git a/cpp/demo/book/lifecycle/expect.py b/cpp/demo/manual/lifecycle/expect.py
index a33c50a4666..b108852e4f6 100755
--- a/cpp/demo/book/lifecycle/expect.py
+++ b/cpp/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('./server --Ice.PrintAdapterReady')
 server.expect('.* ready')
diff --git a/cpp/demo/book/lifecycle/generated/client/.gitignore b/cpp/demo/manual/lifecycle/generated/client/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/lifecycle/generated/client/.gitignore
+++ b/cpp/demo/manual/lifecycle/generated/client/.gitignore
diff --git a/cpp/demo/book/lifecycle/generated/server/.gitignore b/cpp/demo/manual/lifecycle/generated/server/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/lifecycle/generated/server/.gitignore
+++ b/cpp/demo/manual/lifecycle/generated/server/.gitignore
diff --git a/cpp/demo/book/map_filesystem/.depend.mak b/cpp/demo/manual/map_filesystem/.depend.mak
index 05f84a90191..05f84a90191 100755
--- a/cpp/demo/book/map_filesystem/.depend.mak
+++ b/cpp/demo/manual/map_filesystem/.depend.mak
diff --git a/cpp/demo/book/map_filesystem/.gitignore b/cpp/demo/manual/map_filesystem/.gitignore
index 023080e7a41..023080e7a41 100644
--- a/cpp/demo/book/map_filesystem/.gitignore
+++ b/cpp/demo/manual/map_filesystem/.gitignore
diff --git a/cpp/demo/book/map_filesystem/Client.cpp b/cpp/demo/manual/map_filesystem/Client.cpp
index db8b1e14594..db8b1e14594 100644
--- a/cpp/demo/book/map_filesystem/Client.cpp
+++ b/cpp/demo/manual/map_filesystem/Client.cpp
diff --git a/cpp/demo/book/map_filesystem/Filesystem.ice b/cpp/demo/manual/map_filesystem/Filesystem.ice
index e5f00c0fc1b..e5f00c0fc1b 100644
--- a/cpp/demo/book/map_filesystem/Filesystem.ice
+++ b/cpp/demo/manual/map_filesystem/Filesystem.ice
diff --git a/cpp/demo/book/map_filesystem/FilesystemDB.ice b/cpp/demo/manual/map_filesystem/FilesystemDB.ice
index 8bfb5f2ef8f..8bfb5f2ef8f 100644
--- a/cpp/demo/book/map_filesystem/FilesystemDB.ice
+++ b/cpp/demo/manual/map_filesystem/FilesystemDB.ice
diff --git a/cpp/demo/book/map_filesystem/FilesystemI.cpp b/cpp/demo/manual/map_filesystem/FilesystemI.cpp
index 376815bc467..376815bc467 100644
--- a/cpp/demo/book/map_filesystem/FilesystemI.cpp
+++ b/cpp/demo/manual/map_filesystem/FilesystemI.cpp
diff --git a/cpp/demo/book/map_filesystem/FilesystemI.h b/cpp/demo/manual/map_filesystem/FilesystemI.h
index a5b2d870180..a5b2d870180 100644
--- a/cpp/demo/book/map_filesystem/FilesystemI.h
+++ b/cpp/demo/manual/map_filesystem/FilesystemI.h
diff --git a/cpp/demo/book/map_filesystem/Grammar.cpp b/cpp/demo/manual/map_filesystem/Grammar.cpp
index 90457427522..90457427522 100644
--- a/cpp/demo/book/map_filesystem/Grammar.cpp
+++ b/cpp/demo/manual/map_filesystem/Grammar.cpp
diff --git a/cpp/demo/book/map_filesystem/Grammar.h b/cpp/demo/manual/map_filesystem/Grammar.h
index ca5a99150f6..ca5a99150f6 100644
--- a/cpp/demo/book/map_filesystem/Grammar.h
+++ b/cpp/demo/manual/map_filesystem/Grammar.h
diff --git a/cpp/demo/book/map_filesystem/Grammar.y b/cpp/demo/manual/map_filesystem/Grammar.y
index 8850dee37ce..8850dee37ce 100644
--- a/cpp/demo/book/map_filesystem/Grammar.y
+++ b/cpp/demo/manual/map_filesystem/Grammar.y
diff --git a/cpp/demo/book/map_filesystem/Makefile b/cpp/demo/manual/map_filesystem/Makefile
index 73dda59bca1..73dda59bca1 100644
--- a/cpp/demo/book/map_filesystem/Makefile
+++ b/cpp/demo/manual/map_filesystem/Makefile
diff --git a/cpp/demo/book/map_filesystem/Makefile.mak b/cpp/demo/manual/map_filesystem/Makefile.mak
index e7de10deb3f..e7de10deb3f 100644
--- a/cpp/demo/book/map_filesystem/Makefile.mak
+++ b/cpp/demo/manual/map_filesystem/Makefile.mak
diff --git a/cpp/demo/book/map_filesystem/Parser.cpp b/cpp/demo/manual/map_filesystem/Parser.cpp
index 945e67e98ca..945e67e98ca 100644
--- a/cpp/demo/book/map_filesystem/Parser.cpp
+++ b/cpp/demo/manual/map_filesystem/Parser.cpp
diff --git a/cpp/demo/book/map_filesystem/Parser.h b/cpp/demo/manual/map_filesystem/Parser.h
index 262870b41a6..262870b41a6 100644
--- a/cpp/demo/book/map_filesystem/Parser.h
+++ b/cpp/demo/manual/map_filesystem/Parser.h
diff --git a/cpp/demo/book/map_filesystem/README b/cpp/demo/manual/map_filesystem/README
index 80cb462be7e..80cb462be7e 100644
--- a/cpp/demo/book/map_filesystem/README
+++ b/cpp/demo/manual/map_filesystem/README
diff --git a/cpp/demo/book/map_filesystem/Scanner.cpp b/cpp/demo/manual/map_filesystem/Scanner.cpp
index bb9ec829e1e..bb9ec829e1e 100644
--- a/cpp/demo/book/map_filesystem/Scanner.cpp
+++ b/cpp/demo/manual/map_filesystem/Scanner.cpp
diff --git a/cpp/demo/book/map_filesystem/Scanner.l b/cpp/demo/manual/map_filesystem/Scanner.l
index c89cfbe18b0..c89cfbe18b0 100644
--- a/cpp/demo/book/map_filesystem/Scanner.l
+++ b/cpp/demo/manual/map_filesystem/Scanner.l
diff --git a/cpp/demo/book/map_filesystem/Server.cpp b/cpp/demo/manual/map_filesystem/Server.cpp
index 6a043804884..6a043804884 100644
--- a/cpp/demo/book/map_filesystem/Server.cpp
+++ b/cpp/demo/manual/map_filesystem/Server.cpp
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj b/cpp/demo/manual/map_filesystem/book.map_filesystem.client.vcxproj
index caec2c0ba3a..caec2c0ba3a 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj
+++ b/cpp/demo/manual/map_filesystem/book.map_filesystem.client.vcxproj
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj.filters b/cpp/demo/manual/map_filesystem/book.map_filesystem.client.vcxproj.filters
index 277066a9e14..277066a9e14 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj.filters
+++ b/cpp/demo/manual/map_filesystem/book.map_filesystem.client.vcxproj.filters
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj b/cpp/demo/manual/map_filesystem/book.map_filesystem.server.vcxproj
index 388c8f29b81..388c8f29b81 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj
+++ b/cpp/demo/manual/map_filesystem/book.map_filesystem.server.vcxproj
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj.filters b/cpp/demo/manual/map_filesystem/book.map_filesystem.server.vcxproj.filters
index b4c9e82e242..b4c9e82e242 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj.filters
+++ b/cpp/demo/manual/map_filesystem/book.map_filesystem.server.vcxproj.filters
diff --git a/cpp/demo/book/map_filesystem/config.client b/cpp/demo/manual/map_filesystem/config.client
index 640cfade4f1..640cfade4f1 100644
--- a/cpp/demo/book/map_filesystem/config.client
+++ b/cpp/demo/manual/map_filesystem/config.client
diff --git a/cpp/demo/book/map_filesystem/config.server b/cpp/demo/manual/map_filesystem/config.server
index c8694039614..c8694039614 100644
--- a/cpp/demo/book/map_filesystem/config.server
+++ b/cpp/demo/manual/map_filesystem/config.server
diff --git a/cpp/demo/book/map_filesystem/db/.gitignore b/cpp/demo/manual/map_filesystem/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/cpp/demo/book/map_filesystem/db/.gitignore
+++ b/cpp/demo/manual/map_filesystem/db/.gitignore
diff --git a/cpp/demo/book/map_filesystem/expect.py b/cpp/demo/manual/map_filesystem/expect.py
index bee43ce507f..73de301ce61 100755
--- a/cpp/demo/book/map_filesystem/expect.py
+++ b/cpp/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/cpp/demo/book/map_filesystem/generated/client/.gitignore b/cpp/demo/manual/map_filesystem/generated/client/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/map_filesystem/generated/client/.gitignore
+++ b/cpp/demo/manual/map_filesystem/generated/client/.gitignore
diff --git a/cpp/demo/book/map_filesystem/generated/server/.gitignore b/cpp/demo/manual/map_filesystem/generated/server/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/map_filesystem/generated/server/.gitignore
+++ b/cpp/demo/manual/map_filesystem/generated/server/.gitignore
diff --git a/cpp/demo/book/printer/.depend.mak b/cpp/demo/manual/printer/.depend.mak
index 04beb93ae2f..04beb93ae2f 100755
--- a/cpp/demo/book/printer/.depend.mak
+++ b/cpp/demo/manual/printer/.depend.mak
diff --git a/cpp/demo/book/printer/.gitignore b/cpp/demo/manual/printer/.gitignore
index 9429c61010d..9429c61010d 100644
--- a/cpp/demo/book/printer/.gitignore
+++ b/cpp/demo/manual/printer/.gitignore
diff --git a/cpp/demo/book/printer/Client.cpp b/cpp/demo/manual/printer/Client.cpp
index 34f755f20aa..34f755f20aa 100644
--- a/cpp/demo/book/printer/Client.cpp
+++ b/cpp/demo/manual/printer/Client.cpp
diff --git a/cpp/demo/book/printer/Makefile b/cpp/demo/manual/printer/Makefile
index 570005fcc1a..570005fcc1a 100644
--- a/cpp/demo/book/printer/Makefile
+++ b/cpp/demo/manual/printer/Makefile
diff --git a/cpp/demo/book/printer/Makefile.mak b/cpp/demo/manual/printer/Makefile.mak
index 55e5e7624de..55e5e7624de 100644
--- a/cpp/demo/book/printer/Makefile.mak
+++ b/cpp/demo/manual/printer/Makefile.mak
diff --git a/cpp/demo/book/printer/Printer.ice b/cpp/demo/manual/printer/Printer.ice
index f366495c9ad..f366495c9ad 100644
--- a/cpp/demo/book/printer/Printer.ice
+++ b/cpp/demo/manual/printer/Printer.ice
diff --git a/cpp/demo/book/printer/README b/cpp/demo/manual/printer/README
index bf45df75b3b..bf45df75b3b 100644
--- a/cpp/demo/book/printer/README
+++ b/cpp/demo/manual/printer/README
diff --git a/cpp/demo/book/printer/Server.cpp b/cpp/demo/manual/printer/Server.cpp
index 7be98614e1b..7be98614e1b 100644
--- a/cpp/demo/book/printer/Server.cpp
+++ b/cpp/demo/manual/printer/Server.cpp
diff --git a/cpp/demo/book/printer/book.printer.client.vcxproj b/cpp/demo/manual/printer/book.printer.client.vcxproj
index 9e74fc7ff24..9e74fc7ff24 100644
--- a/cpp/demo/book/printer/book.printer.client.vcxproj
+++ b/cpp/demo/manual/printer/book.printer.client.vcxproj
diff --git a/cpp/demo/book/printer/book.printer.client.vcxproj.filters b/cpp/demo/manual/printer/book.printer.client.vcxproj.filters
index 4b7cc77ad23..4b7cc77ad23 100644
--- a/cpp/demo/book/printer/book.printer.client.vcxproj.filters
+++ b/cpp/demo/manual/printer/book.printer.client.vcxproj.filters
diff --git a/cpp/demo/book/printer/book.printer.server.vcxproj b/cpp/demo/manual/printer/book.printer.server.vcxproj
index 4d82f87f1b4..4d82f87f1b4 100644
--- a/cpp/demo/book/printer/book.printer.server.vcxproj
+++ b/cpp/demo/manual/printer/book.printer.server.vcxproj
diff --git a/cpp/demo/book/printer/book.printer.server.vcxproj.filters b/cpp/demo/manual/printer/book.printer.server.vcxproj.filters
index 1cc5dc768ef..1cc5dc768ef 100644
--- a/cpp/demo/book/printer/book.printer.server.vcxproj.filters
+++ b/cpp/demo/manual/printer/book.printer.server.vcxproj.filters
diff --git a/cpp/demo/book/printer/expect.py b/cpp/demo/manual/printer/expect.py
index 6833cd47b6b..6833cd47b6b 100755
--- a/cpp/demo/book/printer/expect.py
+++ b/cpp/demo/manual/printer/expect.py
diff --git a/cpp/demo/book/printer/generated/client/.gitignore b/cpp/demo/manual/printer/generated/client/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/printer/generated/client/.gitignore
+++ b/cpp/demo/manual/printer/generated/client/.gitignore
diff --git a/cpp/demo/book/printer/generated/server/.gitignore b/cpp/demo/manual/printer/generated/server/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/printer/generated/server/.gitignore
+++ b/cpp/demo/manual/printer/generated/server/.gitignore
diff --git a/cpp/demo/book/simple_filesystem/.depend.mak b/cpp/demo/manual/simple_filesystem/.depend.mak
index 9be347c20e7..9be347c20e7 100755
--- a/cpp/demo/book/simple_filesystem/.depend.mak
+++ b/cpp/demo/manual/simple_filesystem/.depend.mak
diff --git a/cpp/demo/book/simple_filesystem/.gitignore b/cpp/demo/manual/simple_filesystem/.gitignore
index a0bd7a59dd3..a0bd7a59dd3 100644
--- a/cpp/demo/book/simple_filesystem/.gitignore
+++ b/cpp/demo/manual/simple_filesystem/.gitignore
diff --git a/cpp/demo/book/simple_filesystem/Client.cpp b/cpp/demo/manual/simple_filesystem/Client.cpp
index 3568c39d202..3568c39d202 100644
--- a/cpp/demo/book/simple_filesystem/Client.cpp
+++ b/cpp/demo/manual/simple_filesystem/Client.cpp
diff --git a/cpp/demo/book/simple_filesystem/Filesystem.ice b/cpp/demo/manual/simple_filesystem/Filesystem.ice
index 3f4e3d85379..3f4e3d85379 100644
--- a/cpp/demo/book/simple_filesystem/Filesystem.ice
+++ b/cpp/demo/manual/simple_filesystem/Filesystem.ice
diff --git a/cpp/demo/book/simple_filesystem/FilesystemI.cpp b/cpp/demo/manual/simple_filesystem/FilesystemI.cpp
index 75cefb39023..75cefb39023 100644
--- a/cpp/demo/book/simple_filesystem/FilesystemI.cpp
+++ b/cpp/demo/manual/simple_filesystem/FilesystemI.cpp
diff --git a/cpp/demo/book/simple_filesystem/FilesystemI.h b/cpp/demo/manual/simple_filesystem/FilesystemI.h
index 8da0dae9566..8da0dae9566 100644
--- a/cpp/demo/book/simple_filesystem/FilesystemI.h
+++ b/cpp/demo/manual/simple_filesystem/FilesystemI.h
diff --git a/cpp/demo/book/simple_filesystem/Makefile b/cpp/demo/manual/simple_filesystem/Makefile
index 54eef563847..54eef563847 100644
--- a/cpp/demo/book/simple_filesystem/Makefile
+++ b/cpp/demo/manual/simple_filesystem/Makefile
diff --git a/cpp/demo/book/simple_filesystem/Makefile.mak b/cpp/demo/manual/simple_filesystem/Makefile.mak
index 4fcfd6b6416..4fcfd6b6416 100644
--- a/cpp/demo/book/simple_filesystem/Makefile.mak
+++ b/cpp/demo/manual/simple_filesystem/Makefile.mak
diff --git a/cpp/demo/book/simple_filesystem/README b/cpp/demo/manual/simple_filesystem/README
index 936da730c14..936da730c14 100644
--- a/cpp/demo/book/simple_filesystem/README
+++ b/cpp/demo/manual/simple_filesystem/README
diff --git a/cpp/demo/book/simple_filesystem/Server.cpp b/cpp/demo/manual/simple_filesystem/Server.cpp
index e57906a2c29..e57906a2c29 100644
--- a/cpp/demo/book/simple_filesystem/Server.cpp
+++ b/cpp/demo/manual/simple_filesystem/Server.cpp
diff --git a/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.client.vcxproj
index 705c468f0d6..705c468f0d6 100644
--- a/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj
+++ b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.client.vcxproj
diff --git a/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj.filters b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.client.vcxproj.filters
index a25d09c3769..a25d09c3769 100644
--- a/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj.filters
+++ b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.client.vcxproj.filters
diff --git a/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.server.vcxproj
index 6ab388a7a42..6ab388a7a42 100644
--- a/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj
+++ b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.server.vcxproj
diff --git a/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj.filters b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.server.vcxproj.filters
index 601952443ae..601952443ae 100644
--- a/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj.filters
+++ b/cpp/demo/manual/simple_filesystem/book.simple_filesystem.server.vcxproj.filters
diff --git a/cpp/demo/book/simple_filesystem/expect.py b/cpp/demo/manual/simple_filesystem/expect.py
index 53ea6d488d7..53ea6d488d7 100755
--- a/cpp/demo/book/simple_filesystem/expect.py
+++ b/cpp/demo/manual/simple_filesystem/expect.py
diff --git a/cpp/demo/book/simple_filesystem/generated/client/.gitignore b/cpp/demo/manual/simple_filesystem/generated/client/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/simple_filesystem/generated/client/.gitignore
+++ b/cpp/demo/manual/simple_filesystem/generated/client/.gitignore
diff --git a/cpp/demo/book/simple_filesystem/generated/server/.gitignore b/cpp/demo/manual/simple_filesystem/generated/server/.gitignore
index 26a5736a94d..26a5736a94d 100644
--- a/cpp/demo/book/simple_filesystem/generated/server/.gitignore
+++ b/cpp/demo/manual/simple_filesystem/generated/server/.gitignore
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index 24c663e69e0..befba896a57 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -27,7 +27,7 @@ struct GroupNodeInfo
     // COMPILER FIX: Clang using libc++ requires to define operator=
     //
 #if defined(__clang__) && defined(_LIBCPP_VERSION)
-        GroupNodeInfo& operator=(const GroupNodeInfo&);
+    GroupNodeInfo& operator=(const GroupNodeInfo&);
 #endif
     const int id;
     const LogUpdate llu;
diff --git a/cs/allDemos.py b/cs/allDemos.py
index 8c00dfce21a..e6153effc7f 100755
--- a/cs/allDemos.py
+++ b/cs/allDemos.py
@@ -47,9 +47,9 @@ demos = [
     "IceGrid/simple",
     "IceGrid/icebox",
     "Glacier2/callback",
-    "book/simple_filesystem",
-    "book/printer",
-    "book/lifecycle",
+    "manual/simple_filesystem",
+    "manual/printer",
+    "manual/lifecycle",
     ]
 
 if __name__ == "__main__":
diff --git a/cs/demo/IceDiscovery/README b/cs/demo/IceDiscovery/README
new file mode 100644
index 00000000000..1baa94c1914
--- /dev/null
+++ b/cs/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/cs/demo/Makefile b/cs/demo/Makefile
index 022f57aca11..43238b01851 100644
--- a/cs/demo/Makefile
+++ b/cs/demo/Makefile
@@ -11,7 +11,7 @@ top_srcdir	= ..
 
 include $(top_srcdir)/config/Make.rules.cs
 
-SUBDIRS		= Ice Glacier2 IceGrid IceStorm IceBox IceDiscovery book
+SUBDIRS		= Ice Glacier2 IceGrid IceStorm IceBox IceDiscovery manual
 
 $(EVERYTHING)::
 	@for subdir in $(SUBDIRS); \
diff --git a/cs/demo/Makefile.mak b/cs/demo/Makefile.mak
index e44d2474769..3b7f750849b 100644
--- a/cs/demo/Makefile.mak
+++ b/cs/demo/Makefile.mak
@@ -11,7 +11,7 @@ top_srcdir	= ..
 
 !include $(top_srcdir)\config\Make.rules.mak.cs
 
-SUBDIRS		= Ice Glacier2 IceGrid IceStorm IceBox IceDiscovery book
+SUBDIRS		= Ice Glacier2 IceGrid IceStorm IceBox IceDiscovery manual
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/cs/demo/README b/cs/demo/README
index 11ec1cdf672..e5003ae4296 100644
--- a/cs/demo/README
+++ b/cs/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 various 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/cs/demo/demo.sln b/cs/demo/demo.sln
index 7e44a945160..4ad53d29dd3 100755
--- a/cs/demo/demo.sln
+++ b/cs/demo/demo.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Book", "Book", "{AC5C2F48-9B17-4C83-9362-6E0645CE25D9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{AC5C2F48-9B17-4C83-9362-6E0645CE25D9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glacier2", "Glacier2", "{C4290516-AAD4-4A27-AEBC-9545D9E81987}"
 EndProject
@@ -60,17 +60,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "printer", "printer", "{BADD
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simple_filesystem", "simple_filesystem", "{42B96E9A-A291-49A7-871D-AA14FFE1CF5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "book\lifecycle\client.csproj", "{E6B38408-D998-40CE-A018-C53529B270D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "manual\lifecycle\client.csproj", "{E6B38408-D998-40CE-A018-C53529B270D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "book\lifecycle\server.csproj", "{710B7320-A714-4560-BCB0-A50FCA6ECAC5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "manual\lifecycle\server.csproj", "{710B7320-A714-4560-BCB0-A50FCA6ECAC5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "book\printer\client.csproj", "{07861488-87F0-4EA6-8774-08E39ABDD468}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "manual\printer\client.csproj", "{07861488-87F0-4EA6-8774-08E39ABDD468}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "book\printer\server.csproj", "{2374126D-F982-4E2F-B9F3-278F8B38A310}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "manual\printer\server.csproj", "{2374126D-F982-4E2F-B9F3-278F8B38A310}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "book\simple_filesystem\client.csproj", "{2E01BB07-5E3A-4563-AE3B-C357672BEEF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "manual\simple_filesystem\client.csproj", "{2E01BB07-5E3A-4563-AE3B-C357672BEEF7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "book\simple_filesystem\server.csproj", "{ECF4A31E-8545-4A9D-ADC2-2020E53C9B46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "manual\simple_filesystem\server.csproj", "{ECF4A31E-8545-4A9D-ADC2-2020E53C9B46}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "Glacier2\callback\client.csproj", "{2AC78A13-497B-44B1-8BF0-156877B78293}"
 EndProject
diff --git a/cs/demo/book/Makefile b/cs/demo/manual/Makefile
index 262ced6206f..262ced6206f 100644
--- a/cs/demo/book/Makefile
+++ b/cs/demo/manual/Makefile
diff --git a/cs/demo/book/Makefile.mak b/cs/demo/manual/Makefile.mak
index 03f3ffbaae7..03f3ffbaae7 100644
--- a/cs/demo/book/Makefile.mak
+++ b/cs/demo/manual/Makefile.mak
diff --git a/cs/demo/book/README b/cs/demo/manual/README
index fcc56268d71..f52ddde2245 100644
--- a/cs/demo/book/README
+++ b/cs/demo/manual/README
@@ -13,7 +13,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/cs/demo/book/evictor/EvictorBase.cs b/cs/demo/manual/evictor/EvictorBase.cs
index ec1a9089425..ec1a9089425 100644
--- a/cs/demo/book/evictor/EvictorBase.cs
+++ b/cs/demo/manual/evictor/EvictorBase.cs
diff --git a/cs/demo/book/evictor/LinkedList.cs b/cs/demo/manual/evictor/LinkedList.cs
index 84b17cb9474..84b17cb9474 100644
--- a/cs/demo/book/evictor/LinkedList.cs
+++ b/cs/demo/manual/evictor/LinkedList.cs
diff --git a/cs/demo/book/evictor/README b/cs/demo/manual/evictor/README
index 7fefaf297eb..7fefaf297eb 100644
--- a/cs/demo/book/evictor/README
+++ b/cs/demo/manual/evictor/README
diff --git a/cs/demo/book/lifecycle/.depend.mak b/cs/demo/manual/lifecycle/.depend.mak
index c127329cf37..c127329cf37 100644
--- a/cs/demo/book/lifecycle/.depend.mak
+++ b/cs/demo/manual/lifecycle/.depend.mak
diff --git a/cs/demo/book/lifecycle/Client.cs b/cs/demo/manual/lifecycle/Client.cs
index de90c6dee20..de90c6dee20 100644
--- a/cs/demo/book/lifecycle/Client.cs
+++ b/cs/demo/manual/lifecycle/Client.cs
diff --git a/cs/demo/book/lifecycle/DirectoryI.cs b/cs/demo/manual/lifecycle/DirectoryI.cs
index 8f658b00267..8f658b00267 100644
--- a/cs/demo/book/lifecycle/DirectoryI.cs
+++ b/cs/demo/manual/lifecycle/DirectoryI.cs
diff --git a/cs/demo/book/lifecycle/FileI.cs b/cs/demo/manual/lifecycle/FileI.cs
index 7c7d9c5050e..7c7d9c5050e 100644
--- a/cs/demo/book/lifecycle/FileI.cs
+++ b/cs/demo/manual/lifecycle/FileI.cs
diff --git a/cs/demo/book/lifecycle/Filesystem.ice b/cs/demo/manual/lifecycle/Filesystem.ice
index a62086add45..a62086add45 100644
--- a/cs/demo/book/lifecycle/Filesystem.ice
+++ b/cs/demo/manual/lifecycle/Filesystem.ice
diff --git a/cs/demo/book/lifecycle/Grammar.cs b/cs/demo/manual/lifecycle/Grammar.cs
index c517902b8a9..c517902b8a9 100644
--- a/cs/demo/book/lifecycle/Grammar.cs
+++ b/cs/demo/manual/lifecycle/Grammar.cs
diff --git a/cs/demo/book/lifecycle/Makefile b/cs/demo/manual/lifecycle/Makefile
index 69aa650f805..69aa650f805 100644
--- a/cs/demo/book/lifecycle/Makefile
+++ b/cs/demo/manual/lifecycle/Makefile
diff --git a/cs/demo/book/lifecycle/Makefile.mak b/cs/demo/manual/lifecycle/Makefile.mak
index 22ffab28e06..22ffab28e06 100644
--- a/cs/demo/book/lifecycle/Makefile.mak
+++ b/cs/demo/manual/lifecycle/Makefile.mak
diff --git a/cs/demo/book/lifecycle/NodeI.cs b/cs/demo/manual/lifecycle/NodeI.cs
index ca508dcd0bd..ca508dcd0bd 100644
--- a/cs/demo/book/lifecycle/NodeI.cs
+++ b/cs/demo/manual/lifecycle/NodeI.cs
diff --git a/cs/demo/book/lifecycle/Parser.cs b/cs/demo/manual/lifecycle/Parser.cs
index e1c26fb95b8..e1c26fb95b8 100644
--- a/cs/demo/book/lifecycle/Parser.cs
+++ b/cs/demo/manual/lifecycle/Parser.cs
diff --git a/cs/demo/book/lifecycle/README b/cs/demo/manual/lifecycle/README
index cc2c9c10f9b..cc2c9c10f9b 100644
--- a/cs/demo/book/lifecycle/README
+++ b/cs/demo/manual/lifecycle/README
diff --git a/cs/demo/book/lifecycle/Scanner.cs b/cs/demo/manual/lifecycle/Scanner.cs
index e847439fe26..e847439fe26 100644
--- a/cs/demo/book/lifecycle/Scanner.cs
+++ b/cs/demo/manual/lifecycle/Scanner.cs
diff --git a/cs/demo/book/lifecycle/Server.cs b/cs/demo/manual/lifecycle/Server.cs
index f474495da62..f474495da62 100644
--- a/cs/demo/book/lifecycle/Server.cs
+++ b/cs/demo/manual/lifecycle/Server.cs
diff --git a/cs/demo/book/lifecycle/Token.cs b/cs/demo/manual/lifecycle/Token.cs
index 6ad60dbabf1..6ad60dbabf1 100644
--- a/cs/demo/book/lifecycle/Token.cs
+++ b/cs/demo/manual/lifecycle/Token.cs
diff --git a/cs/demo/book/lifecycle/app.config b/cs/demo/manual/lifecycle/app.config
index e3656033377..e3656033377 100644
--- a/cs/demo/book/lifecycle/app.config
+++ b/cs/demo/manual/lifecycle/app.config
diff --git a/cs/demo/book/lifecycle/client.csproj b/cs/demo/manual/lifecycle/client.csproj
index 3fa8a2a95d8..3fa8a2a95d8 100644
--- a/cs/demo/book/lifecycle/client.csproj
+++ b/cs/demo/manual/lifecycle/client.csproj
diff --git a/cs/demo/book/lifecycle/client.exe.config b/cs/demo/manual/lifecycle/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/demo/book/lifecycle/client.exe.config
+++ b/cs/demo/manual/lifecycle/client.exe.config
diff --git a/cs/demo/book/lifecycle/expect.py b/cs/demo/manual/lifecycle/expect.py
index a73c108e5e3..9d3b36982c2 100755
--- a/cs/demo/book/lifecycle/expect.py
+++ b/cs/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('server.exe --Ice.PrintAdapterReady')
 server.expect('.* ready')
diff --git a/cs/demo/book/lifecycle/generated/.gitignore b/cs/demo/manual/lifecycle/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/lifecycle/generated/.gitignore
+++ b/cs/demo/manual/lifecycle/generated/.gitignore
diff --git a/cs/demo/book/lifecycle/generated/client/.gitignore b/cs/demo/manual/lifecycle/generated/client/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/lifecycle/generated/client/.gitignore
+++ b/cs/demo/manual/lifecycle/generated/client/.gitignore
diff --git a/cs/demo/book/lifecycle/generated/server/.gitignore b/cs/demo/manual/lifecycle/generated/server/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/lifecycle/generated/server/.gitignore
+++ b/cs/demo/manual/lifecycle/generated/server/.gitignore
diff --git a/cs/demo/book/lifecycle/server.csproj b/cs/demo/manual/lifecycle/server.csproj
index 65e428eab2b..65e428eab2b 100644
--- a/cs/demo/book/lifecycle/server.csproj
+++ b/cs/demo/manual/lifecycle/server.csproj
diff --git a/cs/demo/book/lifecycle/server.exe.config b/cs/demo/manual/lifecycle/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/demo/book/lifecycle/server.exe.config
+++ b/cs/demo/manual/lifecycle/server.exe.config
diff --git a/cs/demo/book/printer/.depend.mak b/cs/demo/manual/printer/.depend.mak
index c299f744012..c299f744012 100644
--- a/cs/demo/book/printer/.depend.mak
+++ b/cs/demo/manual/printer/.depend.mak
diff --git a/cs/demo/book/printer/Client.cs b/cs/demo/manual/printer/Client.cs
index 1a9b72d11de..1a9b72d11de 100644
--- a/cs/demo/book/printer/Client.cs
+++ b/cs/demo/manual/printer/Client.cs
diff --git a/cs/demo/book/printer/Makefile b/cs/demo/manual/printer/Makefile
index 4d210ee9439..4d210ee9439 100644
--- a/cs/demo/book/printer/Makefile
+++ b/cs/demo/manual/printer/Makefile
diff --git a/cs/demo/book/printer/Makefile.mak b/cs/demo/manual/printer/Makefile.mak
index 0a592304386..0a592304386 100644
--- a/cs/demo/book/printer/Makefile.mak
+++ b/cs/demo/manual/printer/Makefile.mak
diff --git a/cs/demo/book/printer/Printer.ice b/cs/demo/manual/printer/Printer.ice
index 01fc7af3360..01fc7af3360 100644
--- a/cs/demo/book/printer/Printer.ice
+++ b/cs/demo/manual/printer/Printer.ice
diff --git a/cs/demo/book/printer/README b/cs/demo/manual/printer/README
index 0ce306ad7c1..0ce306ad7c1 100644
--- a/cs/demo/book/printer/README
+++ b/cs/demo/manual/printer/README
diff --git a/cs/demo/book/printer/Server.cs b/cs/demo/manual/printer/Server.cs
index 5dd457ff9d5..5dd457ff9d5 100644
--- a/cs/demo/book/printer/Server.cs
+++ b/cs/demo/manual/printer/Server.cs
diff --git a/cs/demo/book/printer/app.config b/cs/demo/manual/printer/app.config
index e3656033377..e3656033377 100644
--- a/cs/demo/book/printer/app.config
+++ b/cs/demo/manual/printer/app.config
diff --git a/cs/demo/book/printer/client.csproj b/cs/demo/manual/printer/client.csproj
index ec424293c10..ec424293c10 100644
--- a/cs/demo/book/printer/client.csproj
+++ b/cs/demo/manual/printer/client.csproj
diff --git a/cs/demo/book/printer/client.exe.config b/cs/demo/manual/printer/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/demo/book/printer/client.exe.config
+++ b/cs/demo/manual/printer/client.exe.config
diff --git a/cs/demo/book/printer/expect.py b/cs/demo/manual/printer/expect.py
index 1d7df752262..1d7df752262 100755
--- a/cs/demo/book/printer/expect.py
+++ b/cs/demo/manual/printer/expect.py
diff --git a/cs/demo/book/printer/generated/.gitignore b/cs/demo/manual/printer/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/printer/generated/.gitignore
+++ b/cs/demo/manual/printer/generated/.gitignore
diff --git a/cs/demo/book/printer/generated/client/.gitignore b/cs/demo/manual/printer/generated/client/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/printer/generated/client/.gitignore
+++ b/cs/demo/manual/printer/generated/client/.gitignore
diff --git a/cs/demo/book/printer/generated/server/.gitignore b/cs/demo/manual/printer/generated/server/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/printer/generated/server/.gitignore
+++ b/cs/demo/manual/printer/generated/server/.gitignore
diff --git a/cs/demo/book/printer/server.csproj b/cs/demo/manual/printer/server.csproj
index c67b15270db..c67b15270db 100644
--- a/cs/demo/book/printer/server.csproj
+++ b/cs/demo/manual/printer/server.csproj
diff --git a/cs/demo/book/printer/server.exe.config b/cs/demo/manual/printer/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/demo/book/printer/server.exe.config
+++ b/cs/demo/manual/printer/server.exe.config
diff --git a/cs/demo/book/simple_filesystem/.depend.mak b/cs/demo/manual/simple_filesystem/.depend.mak
index c127329cf37..c127329cf37 100644
--- a/cs/demo/book/simple_filesystem/.depend.mak
+++ b/cs/demo/manual/simple_filesystem/.depend.mak
diff --git a/cs/demo/book/simple_filesystem/Client.cs b/cs/demo/manual/simple_filesystem/Client.cs
index 44b6adbe654..44b6adbe654 100644
--- a/cs/demo/book/simple_filesystem/Client.cs
+++ b/cs/demo/manual/simple_filesystem/Client.cs
diff --git a/cs/demo/book/simple_filesystem/DirectoryI.cs b/cs/demo/manual/simple_filesystem/DirectoryI.cs
index c8e58de4235..c8e58de4235 100644
--- a/cs/demo/book/simple_filesystem/DirectoryI.cs
+++ b/cs/demo/manual/simple_filesystem/DirectoryI.cs
diff --git a/cs/demo/book/simple_filesystem/FileI.cs b/cs/demo/manual/simple_filesystem/FileI.cs
index 3ecebed2448..3ecebed2448 100644
--- a/cs/demo/book/simple_filesystem/FileI.cs
+++ b/cs/demo/manual/simple_filesystem/FileI.cs
diff --git a/cs/demo/book/simple_filesystem/Filesystem.ice b/cs/demo/manual/simple_filesystem/Filesystem.ice
index 51efdb0d38b..51efdb0d38b 100644
--- a/cs/demo/book/simple_filesystem/Filesystem.ice
+++ b/cs/demo/manual/simple_filesystem/Filesystem.ice
diff --git a/cs/demo/book/simple_filesystem/Makefile b/cs/demo/manual/simple_filesystem/Makefile
index be435b17c24..be435b17c24 100644
--- a/cs/demo/book/simple_filesystem/Makefile
+++ b/cs/demo/manual/simple_filesystem/Makefile
diff --git a/cs/demo/book/simple_filesystem/Makefile.mak b/cs/demo/manual/simple_filesystem/Makefile.mak
index b447260049e..b447260049e 100644
--- a/cs/demo/book/simple_filesystem/Makefile.mak
+++ b/cs/demo/manual/simple_filesystem/Makefile.mak
diff --git a/cs/demo/book/simple_filesystem/README b/cs/demo/manual/simple_filesystem/README
index 8cb787f1674..8cb787f1674 100644
--- a/cs/demo/book/simple_filesystem/README
+++ b/cs/demo/manual/simple_filesystem/README
diff --git a/cs/demo/book/simple_filesystem/Server.cs b/cs/demo/manual/simple_filesystem/Server.cs
index 60abb20348e..60abb20348e 100644
--- a/cs/demo/book/simple_filesystem/Server.cs
+++ b/cs/demo/manual/simple_filesystem/Server.cs
diff --git a/cs/demo/book/simple_filesystem/app.config b/cs/demo/manual/simple_filesystem/app.config
index e3656033377..e3656033377 100644
--- a/cs/demo/book/simple_filesystem/app.config
+++ b/cs/demo/manual/simple_filesystem/app.config
diff --git a/cs/demo/book/simple_filesystem/client.csproj b/cs/demo/manual/simple_filesystem/client.csproj
index c14043f0279..c14043f0279 100644
--- a/cs/demo/book/simple_filesystem/client.csproj
+++ b/cs/demo/manual/simple_filesystem/client.csproj
diff --git a/cs/demo/book/simple_filesystem/client.exe.config b/cs/demo/manual/simple_filesystem/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/demo/book/simple_filesystem/client.exe.config
+++ b/cs/demo/manual/simple_filesystem/client.exe.config
diff --git a/cs/demo/book/simple_filesystem/expect.py b/cs/demo/manual/simple_filesystem/expect.py
index 4261bee3b2c..4261bee3b2c 100755
--- a/cs/demo/book/simple_filesystem/expect.py
+++ b/cs/demo/manual/simple_filesystem/expect.py
diff --git a/cs/demo/book/simple_filesystem/generated/.gitignore b/cs/demo/manual/simple_filesystem/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/simple_filesystem/generated/.gitignore
+++ b/cs/demo/manual/simple_filesystem/generated/.gitignore
diff --git a/cs/demo/book/simple_filesystem/generated/client/.gitignore b/cs/demo/manual/simple_filesystem/generated/client/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/simple_filesystem/generated/client/.gitignore
+++ b/cs/demo/manual/simple_filesystem/generated/client/.gitignore
diff --git a/cs/demo/book/simple_filesystem/generated/server/.gitignore b/cs/demo/manual/simple_filesystem/generated/server/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/demo/book/simple_filesystem/generated/server/.gitignore
+++ b/cs/demo/manual/simple_filesystem/generated/server/.gitignore
diff --git a/cs/demo/book/simple_filesystem/server.csproj b/cs/demo/manual/simple_filesystem/server.csproj
index 253e87d0363..253e87d0363 100644
--- a/cs/demo/book/simple_filesystem/server.csproj
+++ b/cs/demo/manual/simple_filesystem/server.csproj
diff --git a/cs/demo/book/simple_filesystem/server.exe.config b/cs/demo/manual/simple_filesystem/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/demo/book/simple_filesystem/server.exe.config
+++ b/cs/demo/manual/simple_filesystem/server.exe.config
diff --git a/demoscript/book/__init__.py b/demoscript/manual/__init__.py
index ef96a353f70..ef96a353f70 100755
--- a/demoscript/book/__init__.py
+++ b/demoscript/manual/__init__.py
diff --git a/demoscript/book/evictor_filesystem.py b/demoscript/manual/evictor_filesystem.py
index ba5245bf685..ba5245bf685 100755
--- a/demoscript/book/evictor_filesystem.py
+++ b/demoscript/manual/evictor_filesystem.py
diff --git a/demoscript/book/lifecycle.py b/demoscript/manual/lifecycle.py
index ba5245bf685..ba5245bf685 100755
--- a/demoscript/book/lifecycle.py
+++ b/demoscript/manual/lifecycle.py
diff --git a/demoscript/book/map_filesystem.py b/demoscript/manual/map_filesystem.py
index ba5245bf685..ba5245bf685 100755
--- a/demoscript/book/map_filesystem.py
+++ b/demoscript/manual/map_filesystem.py
diff --git a/java/.idea/gradle.xml b/java/.idea/gradle.xml
index f1137cbefcc..d41ff39def3 100644
--- a/java/.idea/gradle.xml
+++ b/java/.idea/gradle.xml
@@ -44,11 +44,11 @@
             <option value="$PROJECT_DIR$/demo/IceGrid/icebox" />
             <option value="$PROJECT_DIR$/demo/IceGrid/simple" />
             <option value="$PROJECT_DIR$/demo/IceStorm/clock" />
-            <option value="$PROJECT_DIR$/demo/book/evictor_filesystem" />
-            <option value="$PROJECT_DIR$/demo/book/lifecycle" />
-            <option value="$PROJECT_DIR$/demo/book/map_filesystem" />
-            <option value="$PROJECT_DIR$/demo/book/printer" />
-            <option value="$PROJECT_DIR$/demo/book/simple_filesystem" />
+            <option value="$PROJECT_DIR$/demo/manual/evictor_filesystem" />
+            <option value="$PROJECT_DIR$/demo/manual/lifecycle" />
+            <option value="$PROJECT_DIR$/demo/manual/map_filesystem" />
+            <option value="$PROJECT_DIR$/demo/manual/printer" />
+            <option value="$PROJECT_DIR$/demo/manual/simple_filesystem" />
             <option value="$PROJECT_DIR$/src/Freeze" />
             <option value="$PROJECT_DIR$/src/Glacier2" />
             <option value="$PROJECT_DIR$/src/Ice" />
diff --git a/java/.idea/modules.xml b/java/.idea/modules.xml
index b11dd269f1c..4759038bc8f 100644
--- a/java/.idea/modules.xml
+++ b/java/.idea/modules.xml
@@ -48,11 +48,11 @@
       <module fileurl="file://$PROJECT_DIR$/demo/Ice/swing/demo_Ice_swing.iml" filepath="$PROJECT_DIR$/demo/Ice/swing/demo_Ice_swing.iml" />
       <module fileurl="file://$PROJECT_DIR$/demo/Ice/throughput/demo_Ice_throughput.iml" filepath="$PROJECT_DIR$/demo/Ice/throughput/demo_Ice_throughput.iml" />
       <module fileurl="file://$PROJECT_DIR$/demo/Ice/value/demo_Ice_value.iml" filepath="$PROJECT_DIR$/demo/Ice/value/demo_Ice_value.iml" />
-      <module fileurl="file://$PROJECT_DIR$/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml" filepath="$PROJECT_DIR$/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml" />
-      <module fileurl="file://$PROJECT_DIR$/demo/book/lifecycle/demo_book_lifecycle.iml" filepath="$PROJECT_DIR$/demo/book/lifecycle/demo_book_lifecycle.iml" />
-      <module fileurl="file://$PROJECT_DIR$/demo/book/map_filesystem/demo_book_map_filesystem.iml" filepath="$PROJECT_DIR$/demo/book/map_filesystem/demo_book_map_filesystem.iml" />
-      <module fileurl="file://$PROJECT_DIR$/demo/book/printer/demo_book_printer.iml" filepath="$PROJECT_DIR$/demo/book/printer/demo_book_printer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/demo/book/simple_filesystem/demo_book_simple_filesystem.iml" filepath="$PROJECT_DIR$/demo/book/simple_filesystem/demo_book_simple_filesystem.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/manual/evictor_filesystem/demo_manual_evictor_filesystem.iml" filepath="$PROJECT_DIR$/demo/manual/evictor_filesystem/demo_manual_evictor_filesystem.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/manual/lifecycle/demo_manual_lifecycle.iml" filepath="$PROJECT_DIR$/demo/manual/lifecycle/demo_manual_lifecycle.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/manual/map_filesystem/demo_manual_map_filesystem.iml" filepath="$PROJECT_DIR$/demo/manual/map_filesystem/demo_manual_map_filesystem.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/manual/printer/demo_manual_printer.iml" filepath="$PROJECT_DIR$/demo/manual/printer/demo_manual_printer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/manual/simple_filesystem/demo_manual_simple_filesystem.iml" filepath="$PROJECT_DIR$/demo/manual/simple_filesystem/demo_manual_simple_filesystem.iml" />
       <module fileurl="file://$PROJECT_DIR$/java.iml" filepath="$PROJECT_DIR$/java.iml" />
       <module fileurl="file://$PROJECT_DIR$/test/test.iml" filepath="$PROJECT_DIR$/test/test.iml" />
       <module fileurl="file://$PROJECT_DIR$/test/plugins/test_plugins.iml" filepath="$PROJECT_DIR$/test/plugins/test_plugins.iml" />
diff --git a/java/allDemos.py b/java/allDemos.py
index 9aa4eb8542c..e63f315d13e 100755
--- a/java/allDemos.py
+++ b/java/allDemos.py
@@ -53,11 +53,11 @@ demos = [
     "Freeze/library",
     "Freeze/transform",
     "Freeze/casino",
-    "book/evictor_filesystem",
-    "book/map_filesystem",
-    "book/simple_filesystem",
-    "book/printer",
-    "book/lifecycle",
+    "manual/evictor_filesystem",
+    "manual/map_filesystem",
+    "manual/simple_filesystem",
+    "manual/printer",
+    "manual/lifecycle",
 ]
 
 if __name__ == "__main__":
diff --git a/java/build.gradle b/java/build.gradle
index 10f42ecbacc..3c7b0e9d9ea 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -35,7 +35,7 @@ apply from: "$rootProject.projectDir/demo/IceBox/build.gradle"
 apply from: "$rootProject.projectDir/demo/Glacier2/build.gradle"
 apply from: "$rootProject.projectDir/demo/IceStorm/build.gradle"
 apply from: "$rootProject.projectDir/demo/IceGrid/build.gradle"
-apply from: "$rootProject.projectDir/demo/book/build.gradle"
+apply from: "$rootProject.projectDir/demo/manual/build.gradle"
 
 //
 // Used to build the gradle wrapper to automatically download and install
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
diff --git a/java/settings.gradle b/java/settings.gradle
index fd7684edd58..17d39406542 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -72,5 +72,5 @@ include 'test/plugins'
 }
 
 ['evictor_filesystem', 'lifecycle', 'map_filesystem', 'printer', 'simple_filesystem'].each {
- 	include "demo/book/${it}"
+ 	include "demo/manual/${it}"
 }
diff --git a/php/demo/IceDiscovery/README b/php/demo/IceDiscovery/README
new file mode 100644
index 00000000000..67f8159e49f
--- /dev/null
+++ b/php/demo/IceDiscovery/README
@@ -0,0 +1,5 @@
+Demos in this directory:
+
+- hello
+
+  The Ice hello world demo configured to use IceDiscovery
diff --git a/php/demo/IceDiscovery/hello/.gitignore b/php/demo/IceDiscovery/hello/.gitignore
new file mode 100644
index 00000000000..0b9d5a958ca
--- /dev/null
+++ b/php/demo/IceDiscovery/hello/.gitignore
@@ -0,0 +1 @@
+Hello.php
diff --git a/py/allDemos.py b/py/allDemos.py
index 4b4b0e464be..a908468d212 100755
--- a/py/allDemos.py
+++ b/py/allDemos.py
@@ -37,8 +37,8 @@ demos = [
     "Ice/throughput",
     "Ice/value",
     "IceDiscovery/hello",
-    "book/printer",
-    "book/simple_filesystem"
+    "manual/printer",
+    "manual/simple_filesystem"
 ]
 
 #
diff --git a/py/demo/IceDiscovery/README b/py/demo/IceDiscovery/README
new file mode 100644
index 00000000000..67f8159e49f
--- /dev/null
+++ b/py/demo/IceDiscovery/README
@@ -0,0 +1,5 @@
+Demos in this directory:
+
+- hello
+
+  The Ice hello world demo configured to use IceDiscovery
diff --git a/py/demo/IceDiscovery/hello/README b/py/demo/IceDiscovery/hello/README
index c21bd058a00..2947d16507e 100644
--- a/py/demo/IceDiscovery/hello/README
+++ b/py/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:
 
 $ python Client.py
 
-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/rb/demo/book/README b/py/demo/manual/README
index 263a2495643..6226ad7d8a3 100644
--- a/rb/demo/book/README
+++ b/py/demo/manual/README
@@ -3,7 +3,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/py/demo/book/printer/Client.py b/py/demo/manual/printer/Client.py
index 0834d2cd6e8..0834d2cd6e8 100755
--- a/py/demo/book/printer/Client.py
+++ b/py/demo/manual/printer/Client.py
diff --git a/py/demo/book/printer/Printer.ice b/py/demo/manual/printer/Printer.ice
index 343fd8e627b..343fd8e627b 100644
--- a/py/demo/book/printer/Printer.ice
+++ b/py/demo/manual/printer/Printer.ice
diff --git a/py/demo/book/printer/README b/py/demo/manual/printer/README
index 9c3ae7969af..9c3ae7969af 100644
--- a/py/demo/book/printer/README
+++ b/py/demo/manual/printer/README
diff --git a/py/demo/book/printer/Server.py b/py/demo/manual/printer/Server.py
index 70cfb576405..70cfb576405 100755
--- a/py/demo/book/printer/Server.py
+++ b/py/demo/manual/printer/Server.py
diff --git a/py/demo/book/printer/expect.py b/py/demo/manual/printer/expect.py
index 6bbcf3eaa53..6bbcf3eaa53 100755
--- a/py/demo/book/printer/expect.py
+++ b/py/demo/manual/printer/expect.py
diff --git a/py/demo/book/simple_filesystem/Client.py b/py/demo/manual/simple_filesystem/Client.py
index 75bf17aefc6..75bf17aefc6 100755
--- a/py/demo/book/simple_filesystem/Client.py
+++ b/py/demo/manual/simple_filesystem/Client.py
diff --git a/py/demo/book/simple_filesystem/Filesystem.ice b/py/demo/manual/simple_filesystem/Filesystem.ice
index 21e8a435fcb..21e8a435fcb 100644
--- a/py/demo/book/simple_filesystem/Filesystem.ice
+++ b/py/demo/manual/simple_filesystem/Filesystem.ice
diff --git a/py/demo/book/simple_filesystem/README b/py/demo/manual/simple_filesystem/README
index 45194f48b4f..45194f48b4f 100644
--- a/py/demo/book/simple_filesystem/README
+++ b/py/demo/manual/simple_filesystem/README
diff --git a/py/demo/book/simple_filesystem/Server.py b/py/demo/manual/simple_filesystem/Server.py
index 46393576f03..46393576f03 100755
--- a/py/demo/book/simple_filesystem/Server.py
+++ b/py/demo/manual/simple_filesystem/Server.py
diff --git a/py/demo/book/simple_filesystem/expect.py b/py/demo/manual/simple_filesystem/expect.py
index 8cf7d50e291..8cf7d50e291 100755
--- a/py/demo/book/simple_filesystem/expect.py
+++ b/py/demo/manual/simple_filesystem/expect.py
diff --git a/rb/allDemos.py b/rb/allDemos.py
index a0db6ea6fd8..705fd46a41a 100755
--- a/rb/allDemos.py
+++ b/rb/allDemos.py
@@ -31,8 +31,8 @@ demos = [
     "Ice/throughput",
     "Ice/value",
     "IceDiscovery/hello",
-    "book/printer",
-    "book/simple_filesystem",
+    "manual/printer",
+    "manual/simple_filesystem",
 ]
 
 if __name__ == "__main__":
diff --git a/rb/demo/IceDiscovery/README b/rb/demo/IceDiscovery/README
new file mode 100644
index 00000000000..67f8159e49f
--- /dev/null
+++ b/rb/demo/IceDiscovery/README
@@ -0,0 +1,5 @@
+Demos in this directory:
+
+- hello
+
+  The Ice hello world demo configured to use IceDiscovery
diff --git a/rb/demo/IceDiscovery/hello/README b/rb/demo/IceDiscovery/hello/README
index 10dad712bcb..c461b528ba5 100644
--- a/rb/demo/IceDiscovery/hello/README
+++ b/rb/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.
 
 The Ice extension for Ruby currently supports only client-side
 functionality, therefore you must use a server from any other language
@@ -9,10 +8,6 @@ After starting the server, run the Ruby client:
 
 $ ruby Client.rb
 
-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 uses IceDiscovery to enable the location of the Ice hello
+object. See the config.client file for details on the IceDiscovery
+configuration.
\ No newline at end of file
diff --git a/py/demo/book/README b/rb/demo/manual/README
index 263a2495643..6226ad7d8a3 100644
--- a/py/demo/book/README
+++ b/rb/demo/manual/README
@@ -3,7 +3,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/rb/demo/book/printer/Client.rb b/rb/demo/manual/printer/Client.rb
index c1482d125a4..c1482d125a4 100755
--- a/rb/demo/book/printer/Client.rb
+++ b/rb/demo/manual/printer/Client.rb
diff --git a/rb/demo/book/printer/Printer.ice b/rb/demo/manual/printer/Printer.ice
index 343fd8e627b..343fd8e627b 100644
--- a/rb/demo/book/printer/Printer.ice
+++ b/rb/demo/manual/printer/Printer.ice
diff --git a/rb/demo/book/printer/README b/rb/demo/manual/printer/README
index 8cf8da6baa6..8cf8da6baa6 100644
--- a/rb/demo/book/printer/README
+++ b/rb/demo/manual/printer/README
diff --git a/rb/demo/book/printer/expect.py b/rb/demo/manual/printer/expect.py
index 03adf7de6cc..03adf7de6cc 100755
--- a/rb/demo/book/printer/expect.py
+++ b/rb/demo/manual/printer/expect.py
diff --git a/rb/demo/book/simple_filesystem/Client.rb b/rb/demo/manual/simple_filesystem/Client.rb
index 333406fcd09..333406fcd09 100755
--- a/rb/demo/book/simple_filesystem/Client.rb
+++ b/rb/demo/manual/simple_filesystem/Client.rb
diff --git a/rb/demo/book/simple_filesystem/Filesystem.ice b/rb/demo/manual/simple_filesystem/Filesystem.ice
index 21e8a435fcb..21e8a435fcb 100644
--- a/rb/demo/book/simple_filesystem/Filesystem.ice
+++ b/rb/demo/manual/simple_filesystem/Filesystem.ice
diff --git a/rb/demo/book/simple_filesystem/README b/rb/demo/manual/simple_filesystem/README
index 3190a79b40d..3190a79b40d 100644
--- a/rb/demo/book/simple_filesystem/README
+++ b/rb/demo/manual/simple_filesystem/README
diff --git a/rb/demo/book/simple_filesystem/expect.py b/rb/demo/manual/simple_filesystem/expect.py
index 3083c182742..3083c182742 100755
--- a/rb/demo/book/simple_filesystem/expect.py
+++ b/rb/demo/manual/simple_filesystem/expect.py
diff --git a/vb/allDemos.py b/vb/allDemos.py
index b0fae1fcdc1..20f2876f762 100755
--- a/vb/allDemos.py
+++ b/vb/allDemos.py
@@ -39,8 +39,8 @@ demos = [
     "IceStorm/clock",
     "IceGrid/simple",
     "Glacier2/callback",
-    "book/simple_filesystem",
-    "book/printer",
+    "manual/simple_filesystem",
+    "manual/printer",
     ]
 
 Util.run(demos)
diff --git a/vb/demo/Makefile.mak b/vb/demo/Makefile.mak
index aee3bb03d51..d7e3dbf8ffd 100644
--- a/vb/demo/Makefile.mak
+++ b/vb/demo/Makefile.mak
@@ -11,7 +11,7 @@ top_srcdir	= ..
 
 !include $(top_srcdir)\config\Make.rules.mak.vb
 
-SUBDIRS		= Ice Glacier2 IceGrid IceStorm IceBox book
+SUBDIRS		= Ice Glacier2 IceGrid IceStorm IceBox manual
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/vb/demo/README b/vb/demo/README
index 11ec1cdf672..e5003ae4296 100644
--- a/vb/demo/README
+++ b/vb/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 various 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/vb/demo/demo.sln b/vb/demo/demo.sln
index 3625ffdae10..20d7ecfaf6e 100755
--- a/vb/demo/demo.sln
+++ b/vb/demo/demo.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Book", "Book", "{2834C028-85E0-4C3B-9577-244D4E1C7249}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{2834C028-85E0-4C3B-9577-244D4E1C7249}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "printer", "printer", "{7FA58D0B-884E-4F0A-B89F-343E93812200}"
 EndProject
@@ -46,20 +46,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IceStorm", "IceStorm", "{4D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clock", "clock", "{B9505670-4369-461A-935A-4CF2529D4060}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slice", "book\printer\slice.csproj", "{5114D39A-6EC0-4869-B43A-A85FDF899D12}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slice", "manual\printer\slice.csproj", "{5114D39A-6EC0-4869-B43A-A85FDF899D12}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "client", "book\printer\client.vbproj", "{A9808C9D-94C3-43FC-9100-BB55328865BD}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "client", "manual\printer\client.vbproj", "{A9808C9D-94C3-43FC-9100-BB55328865BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EAD5FEB2-1CA9-44C6-AD31-B1939BF83104} = {EAD5FEB2-1CA9-44C6-AD31-B1939BF83104}
 	EndProjectSection
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "server", "book\printer\server.vbproj", "{EAD5FEB2-1CA9-44C6-AD31-B1939BF83104}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "server", "manual\printer\server.vbproj", "{EAD5FEB2-1CA9-44C6-AD31-B1939BF83104}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slice", "book\simple_filesystem\slice.csproj", "{73CD4F2C-BF98-404C-B29E-BE0F53A2D19B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slice", "manual\simple_filesystem\slice.csproj", "{73CD4F2C-BF98-404C-B29E-BE0F53A2D19B}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "server", "book\simple_filesystem\server.vbproj", "{357ADC23-03C4-4A8B-8017-07810895F3AF}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "server", "manual\simple_filesystem\server.vbproj", "{357ADC23-03C4-4A8B-8017-07810895F3AF}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "client", "book\simple_filesystem\client.vbproj", "{1BEB3E09-5C48-4F9D-9295-C91FD52E662D}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "client", "manual\simple_filesystem\client.vbproj", "{1BEB3E09-5C48-4F9D-9295-C91FD52E662D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{357ADC23-03C4-4A8B-8017-07810895F3AF} = {357ADC23-03C4-4A8B-8017-07810895F3AF}
 	EndProjectSection
diff --git a/vb/demo/book/Makefile.mak b/vb/demo/manual/Makefile.mak
index d6e6a2b8240..d6e6a2b8240 100644
--- a/vb/demo/book/Makefile.mak
+++ b/vb/demo/manual/Makefile.mak
diff --git a/vb/demo/book/README b/vb/demo/manual/README
index 07162207955..9ae970503bc 100644
--- a/vb/demo/book/README
+++ b/vb/demo/manual/README
@@ -9,7 +9,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/vb/demo/book/evictor/EvictorBase.vb b/vb/demo/manual/evictor/EvictorBase.vb
index ea6b579489e..ea6b579489e 100644
--- a/vb/demo/book/evictor/EvictorBase.vb
+++ b/vb/demo/manual/evictor/EvictorBase.vb
diff --git a/vb/demo/book/evictor/LinkedList.vb b/vb/demo/manual/evictor/LinkedList.vb
index a11aeeab054..a11aeeab054 100644
--- a/vb/demo/book/evictor/LinkedList.vb
+++ b/vb/demo/manual/evictor/LinkedList.vb
diff --git a/vb/demo/book/evictor/README b/vb/demo/manual/evictor/README
index 43d14243bcc..43d14243bcc 100644
--- a/vb/demo/book/evictor/README
+++ b/vb/demo/manual/evictor/README
diff --git a/vb/demo/book/printer/.depend.mak b/vb/demo/manual/printer/.depend.mak
index c299f744012..c299f744012 100644
--- a/vb/demo/book/printer/.depend.mak
+++ b/vb/demo/manual/printer/.depend.mak
diff --git a/vb/demo/book/printer/Client.vb b/vb/demo/manual/printer/Client.vb
index cf8b9a48275..cf8b9a48275 100644
--- a/vb/demo/book/printer/Client.vb
+++ b/vb/demo/manual/printer/Client.vb
diff --git a/vb/demo/book/printer/Makefile.mak b/vb/demo/manual/printer/Makefile.mak
index b3415334a77..b3415334a77 100644
--- a/vb/demo/book/printer/Makefile.mak
+++ b/vb/demo/manual/printer/Makefile.mak
diff --git a/vb/demo/book/printer/Printer.ice b/vb/demo/manual/printer/Printer.ice
index 302af9e2abc..302af9e2abc 100644
--- a/vb/demo/book/printer/Printer.ice
+++ b/vb/demo/manual/printer/Printer.ice
diff --git a/vb/demo/book/printer/README b/vb/demo/manual/printer/README
index b63688254f4..b63688254f4 100644
--- a/vb/demo/book/printer/README
+++ b/vb/demo/manual/printer/README
diff --git a/vb/demo/book/printer/Server.vb b/vb/demo/manual/printer/Server.vb
index ac29c4956b0..ac29c4956b0 100644
--- a/vb/demo/book/printer/Server.vb
+++ b/vb/demo/manual/printer/Server.vb
diff --git a/vb/demo/book/printer/client.exe.config b/vb/demo/manual/printer/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/vb/demo/book/printer/client.exe.config
+++ b/vb/demo/manual/printer/client.exe.config
diff --git a/vb/demo/book/printer/client.vbproj b/vb/demo/manual/printer/client.vbproj
index 99a8b181ea8..99a8b181ea8 100644
--- a/vb/demo/book/printer/client.vbproj
+++ b/vb/demo/manual/printer/client.vbproj
diff --git a/vb/demo/book/printer/expect.py b/vb/demo/manual/printer/expect.py
index 1d7df752262..1d7df752262 100755
--- a/vb/demo/book/printer/expect.py
+++ b/vb/demo/manual/printer/expect.py
diff --git a/vb/demo/book/printer/generated/.gitignore b/vb/demo/manual/printer/generated/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/vb/demo/book/printer/generated/.gitignore
+++ b/vb/demo/manual/printer/generated/.gitignore
diff --git a/vb/demo/book/printer/server.exe.config b/vb/demo/manual/printer/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/vb/demo/book/printer/server.exe.config
+++ b/vb/demo/manual/printer/server.exe.config
diff --git a/vb/demo/book/printer/server.vbproj b/vb/demo/manual/printer/server.vbproj
index a754342cc1c..a754342cc1c 100644
--- a/vb/demo/book/printer/server.vbproj
+++ b/vb/demo/manual/printer/server.vbproj
diff --git a/vb/demo/book/printer/slice.csproj b/vb/demo/manual/printer/slice.csproj
index 8e4174b4f65..8e4174b4f65 100644
--- a/vb/demo/book/printer/slice.csproj
+++ b/vb/demo/manual/printer/slice.csproj
diff --git a/vb/demo/book/simple_filesystem/.depend.mak b/vb/demo/manual/simple_filesystem/.depend.mak
index c127329cf37..c127329cf37 100644
--- a/vb/demo/book/simple_filesystem/.depend.mak
+++ b/vb/demo/manual/simple_filesystem/.depend.mak
diff --git a/vb/demo/book/simple_filesystem/Client.vb b/vb/demo/manual/simple_filesystem/Client.vb
index a341d55a989..a341d55a989 100644
--- a/vb/demo/book/simple_filesystem/Client.vb
+++ b/vb/demo/manual/simple_filesystem/Client.vb
diff --git a/vb/demo/book/simple_filesystem/DirectoryI.vb b/vb/demo/manual/simple_filesystem/DirectoryI.vb
index 06c19747465..06c19747465 100644
--- a/vb/demo/book/simple_filesystem/DirectoryI.vb
+++ b/vb/demo/manual/simple_filesystem/DirectoryI.vb
diff --git a/vb/demo/book/simple_filesystem/FileI.vb b/vb/demo/manual/simple_filesystem/FileI.vb
index 9c03b10d6dd..9c03b10d6dd 100644
--- a/vb/demo/book/simple_filesystem/FileI.vb
+++ b/vb/demo/manual/simple_filesystem/FileI.vb
diff --git a/vb/demo/book/simple_filesystem/Filesystem.ice b/vb/demo/manual/simple_filesystem/Filesystem.ice
index 21e8a435fcb..21e8a435fcb 100644
--- a/vb/demo/book/simple_filesystem/Filesystem.ice
+++ b/vb/demo/manual/simple_filesystem/Filesystem.ice
diff --git a/vb/demo/book/simple_filesystem/Makefile.mak b/vb/demo/manual/simple_filesystem/Makefile.mak
index 06d3a0aa26e..06d3a0aa26e 100644
--- a/vb/demo/book/simple_filesystem/Makefile.mak
+++ b/vb/demo/manual/simple_filesystem/Makefile.mak
diff --git a/vb/demo/book/simple_filesystem/README b/vb/demo/manual/simple_filesystem/README
index 395c52e416a..395c52e416a 100644
--- a/vb/demo/book/simple_filesystem/README
+++ b/vb/demo/manual/simple_filesystem/README
diff --git a/vb/demo/book/simple_filesystem/Server.vb b/vb/demo/manual/simple_filesystem/Server.vb
index 88d43dc4522..88d43dc4522 100644
--- a/vb/demo/book/simple_filesystem/Server.vb
+++ b/vb/demo/manual/simple_filesystem/Server.vb
diff --git a/vb/demo/book/simple_filesystem/client.exe.config b/vb/demo/manual/simple_filesystem/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/vb/demo/book/simple_filesystem/client.exe.config
+++ b/vb/demo/manual/simple_filesystem/client.exe.config
diff --git a/vb/demo/book/simple_filesystem/client.vbproj b/vb/demo/manual/simple_filesystem/client.vbproj
index 22cd703d056..22cd703d056 100644
--- a/vb/demo/book/simple_filesystem/client.vbproj
+++ b/vb/demo/manual/simple_filesystem/client.vbproj
diff --git a/vb/demo/book/simple_filesystem/expect.py b/vb/demo/manual/simple_filesystem/expect.py
index 4261bee3b2c..4261bee3b2c 100755
--- a/vb/demo/book/simple_filesystem/expect.py
+++ b/vb/demo/manual/simple_filesystem/expect.py
diff --git a/vb/demo/book/simple_filesystem/generated/.gitignore b/vb/demo/manual/simple_filesystem/generated/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/vb/demo/book/simple_filesystem/generated/.gitignore
+++ b/vb/demo/manual/simple_filesystem/generated/.gitignore
diff --git a/vb/demo/book/simple_filesystem/server.exe.config b/vb/demo/manual/simple_filesystem/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/vb/demo/book/simple_filesystem/server.exe.config
+++ b/vb/demo/manual/simple_filesystem/server.exe.config
diff --git a/vb/demo/book/simple_filesystem/server.vbproj b/vb/demo/manual/simple_filesystem/server.vbproj
index c301baaf9bd..c301baaf9bd 100644
--- a/vb/demo/book/simple_filesystem/server.vbproj
+++ b/vb/demo/manual/simple_filesystem/server.vbproj
diff --git a/vb/demo/book/simple_filesystem/slice.csproj b/vb/demo/manual/simple_filesystem/slice.csproj
index 0856824e88c..0856824e88c 100644
--- a/vb/demo/book/simple_filesystem/slice.csproj
+++ b/vb/demo/manual/simple_filesystem/slice.csproj