X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=doc%2Fmanual%2Fstart-stop.texinfo;h=a4e1e5519d00c7891cff421cc23649a6c1e896bf;hb=b0b221088b889b6d3ae67e551b93fe1a6cfec878;hp=f97aef480d02eb8aecaa671185189d4eba0ba844;hpb=92e62aeb1e845740b3ecb60ffcb825dbf1994ccc;p=sbcl.git

diff --git a/doc/manual/start-stop.texinfo b/doc/manual/start-stop.texinfo
index f97aef4..a4e1e55 100644
--- a/doc/manual/start-stop.texinfo
+++ b/doc/manual/start-stop.texinfo
@@ -41,7 +41,7 @@ distribution for more information.
 * (+ 2 2)
 
 4
-* (quit)
+* (exit)
 $
 @end smallexample
 
@@ -96,22 +96,21 @@ Hello, World!
 @section Stopping SBCL
 
 @menu
-* Quit::                        
+* Exit::
 * End of File::                 
 * Saving a Core Image::         
 * Exit on Errors::              
 @end menu
 
-@node Quit
+@node Exit
 @comment  node-name,  next,  previous,  up
-@subsection Quit
+@subsection Exit
 
-SBCL can be stopped at any time by calling @code{sb-ext:quit},
+SBCL can be stopped at any time by calling @code{sb-ext:exit},
 optionally returning a specified numeric value to the calling process.
-See notes in @ref{Threading} about the interaction between this
-feature and sessions.
+See @ref{Threading} for information about terminating individual threads.
 
-@include fun-sb-ext-quit.texinfo
+@include fun-sb-ext-exit.texinfo
 
 @node End of File
 @comment  node-name,  next,  previous,  up
@@ -245,6 +244,26 @@ description of @code{--script} as a toplevel option below. If there
 are no other commandline arguments following @code{--script}, the
 filename argument can be omitted.
 
+
+@item --merge-core-pages
+When platform support is present, provide hints to the operating system
+that identical pages may be shared between processes until they are
+written to.  This can be useful to reduce the memory usage on systems
+with multiple SBCL processes started from similar but differently-named
+core files, or from compressed cores.  Without platform support, do
+nothing.
+
+
+@item --no-merge-core-pages
+Ensures that no sharing hint is provided to the operating system.
+
+
+@item --default-merge-core-pages
+Reverts the sharing hint policy to the default: only compressed cores
+trigger hinting.  Uncompressed cores are mapped directly from the core
+file, which is usually enough to ensure sharing.
+
+
 @item --help
 Print some basic information about SBCL, then exit.
 
@@ -294,9 +313,9 @@ special syntax is intended to reduce quoting headaches when invoking
 SBCL from shell scripts.
 
 @item --noprint
-When ordinarily the toplevel "read-eval-print loop" would be exe-
-cuted, execute a "read-eval loop" instead, i.e. don't print a prompt
-and don't echo results. Combined with the @code{--noinform} runtime
+When ordinarily the toplevel "read-eval-print loop" would be executed,
+execute a "read-eval loop" instead, i.e. don't print a prompt and
+don't echo results. Combined with the @code{--noinform} runtime
 option, this makes it easier to write Lisp "scripts" which work
 cleanly in Unix pipelines.
 
@@ -322,9 +341,9 @@ can be omitted: this causes the script to be loaded from standard
 input instead. Shebang lines in standard input script are currently
 @emph{not} ignored.
 
-In either case, if there is an unhandled error (eg. end of file, or a
+In either case, if there is an unhandled error (e.g. end of file, or a
 broken pipe) on either standard input, standard output, or standard
-error, the script silently exits with code 0. This allows eg. safely
+error, the script silently exits with code 0. This allows e.g. safely
 piping output from SBCL to @code{head -n1} or similar.
 
 @end table