Branch for in-progress User's Guide changes.

1 files changed, 30 insertions, 46 deletions

diff --git a/doc/user/main.sgml b/doc/user/main.sgml
index b285696..68bc59c 100644
--- a/doc/user/main.sgml
+++ b/doc/user/main.sgml
@@ -47,19 +47,15 @@
     <!ENTITY help SYSTEM "help.sgml">
     <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
     <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY library SYSTEM "library.sgml">
     <!ENTITY make SYSTEM "make.sgml">
-    <!ENTITY more SYSTEM "more.sgml">
-    <!ENTITY object SYSTEM "object.sgml">
     <!ENTITY precious SYSTEM "precious.sgml">
     <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY program SYSTEM "program.sgml">
-    <!ENTITY reference SYSTEM "reference.sgml">
     <!ENTITY repositories SYSTEM "repositories.sgml">
     <!ENTITY run SYSTEM "run.sgml">
     <!ENTITY scanners SYSTEM "scanners.sgml">
     <!ENTITY separate SYSTEM "separate.sgml">
     <!ENTITY simple SYSTEM "simple.sgml">
+    <!ENTITY sourcecode SYSTEM "sourcecode.sgml">
     <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
     <!ENTITY variants SYSTEM "variants.sgml">
 
@@ -111,8 +107,6 @@
     &depends;
   </chapter>
 
-
-
   <chapter id="chap-default">
     <title>Default Targets</title>
     &default;
@@ -128,31 +122,6 @@
     &install;
   </chapter>
 
-  <chapter id="chap-program">
-    <title>The Program Builder</title>
-    &program;
-  </chapter>
-
-  <chapter id="chap-library">
-    <title>The Library Builder</title>
-    &library;
-  </chapter>
-
-  <chapter id="chap-more">
-    <title>More Things to Do With Builds</title>
-    &more;
-  </chapter>
-
-  <chapter id="chap-command">
-    <title>The Command Builder</title>
-    &command;
-  </chapter>
-
-  <chapter id="chap-object">
-    <title>The Object Builder</title>
-    &object;
-  </chapter>
-
   <chapter id="chap-precious">
     <title>Preventing Removal of Targets</title>
     &precious;
@@ -178,6 +147,11 @@
     &builders;
   </chapter>
 
+  <chapter id="chap-command">
+    <title>Avoiding Having to Write Builders</title>
+    &command;
+  </chapter>
+
   <chapter id="chap-actions">
     <title>SCons Actions</title>
     &actions;
@@ -193,35 +167,45 @@
     &repositories;
   </chapter>
 
+  <chapter id="chap-sourcecode">
+    <title>Fetching Files From Source Code Management Systems</title>
+    &sourcecode;
+  </chapter>
+
   <chapter id="chap-caching">
     <title>Caching Built Files</title>
     &caching;
   </chapter>
 
-  <chapter id="chap-run">
-    <title>How to Run &SCons;</title>
-    &run;
-  </chapter>
-
   <chapter id="chap-alias">
     <title>Alias Targets</title>
     &alias;
   </chapter>
 
+  <chapter id="chap-run">
+    <title>How to Run &SCons;</title>
+    &run;
+  </chapter>
+
   <chapter id="chap-troubleshooting">
     <title>Troubleshooting</title>
     &troubleshoot;
   </chapter>
 
-  <appendix id="app-quick">
-    <title>Quick Reference</title>
-    &reference;
-  </appendix>
-
-  <appendix id="app-errors">
-    <title>Errors Generated by &SCons;</title>
-    &errors;
-  </appendix>
+  <!--
+  AddPostAction()
+  AddPreAction()
+  Clean()
+  Dir()
+  File()
+  FindFile()
+  GetJobs()
+  SetJobs()
+  SideEffect()
+  ParseConfig()
+  Platform()
+  Tools()
+  -->
 
   <appendix id="app-example">
     <title>Complex &SCons; Example</title>