getting build to work; added docinfo

infochimps-labs · Jan 26, 2014 · 6ccfdc3 · 6ccfdc3
1 parent bd00deb
commit 6ccfdc3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/25c-references.asciidoc b/25c-references.asciidoc
@@ -34,21 +34,5 @@
 
 * https://github.com/yohasebe/wp2txt[wp2txt], by http://yohasebe.com[Yoichiro Hasebe]
 
-
-
-
 the http://github.com/schacon/git-scribe[git-scribe toolchain] was very useful creating this book. Instructions on how to install the tool and use it for things like editing this book, submitting errata and providing translations can be found at that site.
 
-
-
-==== Other Libraries
-
-Hadoop:
-
-* HIPI for image processing
-
-Machine Learning:
-
-* Scikit-learn
-* Tooldiag
-* 
diff --git a/25f-glossary.asciidoc b/25f-glossary.asciidoc
@@ -22,19 +22,17 @@
 Questions:
 
 * "task process" or "job process" for child process?
-* 
-
 
 === Storm+Trident Glossary ===
 
 Storm Execution
 
 * Worker
 * Daemons
-    * Nimbus
+  - Nimbus
-    * UI
+  - UI
-    * Supervisor
+  - Supervisor
-    * Child Process
+  - Child Process
 * Executor
 * Task
 * Trident Function

diff --git a/book.asciidoc b/book.asciidoc
@@ -36,12 +36,14 @@ include::11-geographic.asciidoc[]
 
 include::11g-end_of_geographic.asciidoc[]
 
-include::12-conceptual_model.asciidoc[]
+include::12-placeholder.asciidoc[]
 
 include::13-data_munging.asciidoc[]
 
 include::14-organizing_data.asciidoc[]
 
+include::15-placeholder.asciidoc[]
+
 include::16-conceptual_model.asciidoc[]
 
 include::17-machine_learning.asciidoc[]