[slime-cvs] CVS update: slime/doc/slime.texi

[Luke Gorrie]

Update of /project/slime/cvsroot/slime/doc
In directory common-lisp.net:/tmp/cvs-serv12180

Modified Files:
	slime.texi 
Log Message:
s/compliment/complement/

Date: Thu Sep  9 17:04:33 2004
Author: lgorrie

Index: slime/doc/slime.texi
diff -u slime/doc/slime.texi:1.28 slime/doc/slime.texi:1.29
--- slime/doc/slime.texi:1.28	Sat Sep  4 18:18:01 2004
+++ slime/doc/slime.texi	Thu Sep  9 17:04:32 2004
@@ -45,8 +45,13 @@
 @code{\command\}@*
 @end macro
 
+<<<<<<< slime.texi
 @set EDITION 1.0
- at set UPDATED @code{$Date: 2004/09/04 16:18:01 $}
+ at set UPDATED @code{$Date: 2004/09/09 15:04:32 $}
+=======
+ at set EDITION 1.0
+ at set UPDATED @code{$Date: 2004/09/09 15:04:32 $}
+>>>>>>> 1.28
 
 @titlepage
 @title SLIME User Manual
@@ -64,12 +69,8 @@
 @ifinfo
 @top SLIME
 
- at SLIME{} is the ``Superior Lisp Interaction Mode for Emacs.''
-
-Like @SLIME{}, this manual is a work in progress. It documents an
-unreleased version of @SLIME{}.
-
-For a list of hackers who've worked on @SLIME{}, @ref{Credits}.
+ at SLIME{} is the ``Superior Lisp Interaction Mode for Emacs''. This is
+the manual for version 1.0.
 
 @end ifinfo
 @menu
@@ -169,7 +170,7 @@
 
 @SLIME{} extends Emacs with new support for interactive programming in
 Common Lisp. The features are centred around @code{slime-mode}, an Emacs
-minor-mode that compliments the standard @code{lisp-mode}. While
+minor-mode that complements the standard @code{lisp-mode}. While
 @code{lisp-mode} supports editing Lisp source files, @code{slime-mode}
 adds support for interacting with a running Common Lisp process for
 compilation, debugging, documentation lookup, and so on.