Fixed ICE-5811: renamed book demos to manual demos

128 files changed, 45 insertions, 35 deletions

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;