* lisp/electric.el (electric-newline-and-maybe-indent): New command.

[bpt/emacs.git] / doc / misc / srecode.texi

diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index c2045e8..a0fcd9e 100644 (file)
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -342,7 +342,7 @@ area will modify the other linked areas.  Pressing TAB will move
 between editable fields in the template.
 
 Once the cursor moves out of the are inserted by the template, all the
-fields are cancelled.
+fields are canceled.
 
 @b{NOTE}: Some conveniences in templates, such as completion, or
 character restrictions are lost when using field editing mode.
@@ -822,7 +822,7 @@ from the name, like this:
 @node Contexts
 @section Context
 
-Each template belongs to a context.  When promting for a template by
+Each template belongs to a context.  When prompting for a template by
 name, such as with @kbd{C-c / /}, the name is prefixed by the current
 context.  If there is no context, it defaults to @code{declaration}.