1.0.13.13: Actually export RESOLVE-CONFLICT et al from SB-EXT

[sbcl.git] / doc / manual / sbcl.texinfo

diff --git a/doc/manual/sbcl.texinfo b/doc/manual/sbcl.texinfo
index fecadc3..1bb042d 100644 (file)
--- a/doc/manual/sbcl.texinfo
+++ b/doc/manual/sbcl.texinfo
@@ -4,7 +4,7 @@
 @settitle SBCL User Manual
 @c %**end of header
 
-
+@include texinfo-macros.texinfo
 @include variables.texinfo
 @set EDITION 0.1
 @settitle SBCL @value{VERSION} User Manual 
@@ -16,7 +16,6 @@
 @end direntry
 
 @copying
-
 @quotation
 This manual is part of the SBCL software system. See the
 @file{README} file for more information.
@@ -27,7 +26,6 @@ into the public domain. This manual is in the public domain and is
 provided with absolutely no warranty. See the @file{COPYING} and
 @file{CREDITS} files for more information.
 @end quotation
-
 @end copying
 
 @titlepage
@@ -37,7 +35,6 @@ provided with absolutely no warranty. See the @file{COPYING} and
 @subtitle @value{UPDATE-MONTH}
 @c @author The CMUCL and SBCL teams
 
-
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
@@ -57,14 +54,18 @@ provided with absolutely no warranty. See the @file{COPYING} and
 
 @menu
 * Introduction::                
+* Starting and Stopping::
 * Compiler::                    
 * Debugger::                    
 * Efficiency::                  
 * Beyond the ANSI Standard::    
 * Foreign Function Interface::  
+* Pathnames::
 * Extensible Streams::          
 * Package Locks::               
-* Networking::                  
+* Threading::
+* Timers::
+* Networking::
 * Profiling::                   
 * Contributed Modules::         
 * Concept Index::               
@@ -77,13 +78,17 @@ provided with absolutely no warranty. See the @file{COPYING} and
 @end ifnottex
 
 @include intro.texinfo
+@include start-stop.texinfo
 @include compiler.texinfo
 @include debugger.texinfo
 @include efficiency.texinfo
 @include beyond-ansi.texinfo
 @include ffi.texinfo
+@include pathnames.texinfo
 @include streams.texinfo
 @include package-locks.texi-temp
+@include threading.texinfo
+@include timers.texinfo
 @include sb-bsd-sockets/sb-bsd-sockets.texinfo
 @include profiling.texinfo
 @include contrib-modules.texinfo