Moved epa-dired example to the individual section.

diff --git a/epa.texi b/epa.texi
index cc945cc..405067c 100644 (file)
--- a/epa.texi
+++ b/epa.texi
@@ -46,6 +46,9 @@ Free Documentation License".
 
 @end tex
 
+@summarycontents
+@contents
+
 @node Top
 @top EasyPG Assistant user's manual
 
@@ -56,6 +59,7 @@ EasyPG Assistant is a part of the package called EasyPG, an all-in-one
 GnuPG interface for Emacs.  EasyPG also contains the library interface
 called EasyPG Library.
 
+@noindent
 This manual covers EasyPG version @value{VERSION}.
 
 @menu
@@ -83,18 +87,24 @@ EasyPG Assistant provides the following features.
 
 To install, just follow the standard CMMI installation instructions.
 
+@cartouche
 @example
 $ ./configure
 $ sudo make install
 @end example
+@end cartouche
 
+@noindent
 Then, add the following line to your @file{~/.emacs}
 
+@cartouche
 @lisp
 (require 'epa-setup)
 @end lisp
+@end cartouche
 
-That's all.  Restart emacs and type @kbd{M-x epa- TAB}, and you will see a
+@noindent
+That's all.  Restart emacs and type @kbd{M-x epa- @key{TAB}}, and you will see a
 lot of commands available.  For example,
 
 @itemize @bullet
@@ -103,15 +113,6 @@ lot of commands available.  For example,
 @item To create a cleartext signature of the region, type @kbd{M-x epa-sign-region}
 @end itemize
 
-You can also do some cryptographic operations from dired.
-
-@example
-M-x dired
-(mark some files)
-: e (or M-x epa-dired-do-encrypt)
-(select recipients by 'm' and click [OK])
-@end example
-
 @node Commands
 @chapter Commands
 
@@ -136,18 +137,21 @@ keyring.  @kbd{M-x epa-list-keys} is corresponding to @samp{gpg
 Show all keys matched with @var{name} from the public keyring.
 @end deffn
 
+@noindent
 The output looks as follows.
 
 @example
   u A5B6B2D4B15813FE Daiki Ueno <ueno@@unixuser.org>
 @end example
 
+@noindent
 A character on the leftmost column indicates the trust level of the
 key.  If it is @samp{u}, the key is marked as ultimately trusted.  The
 second column is the key ID, and the rest is the user ID.
 
+@noindent
 You can move over entries by @key{TAB}.  If you type @key{RET} or
-clicked button1 on an entry, you will see more detailed information
+click button1 on an entry, you will see more detailed information
 about the key you selected.
 
 @example
@@ -164,12 +168,14 @@ about the key you selected.
        Fingerprint: 9003 D76B 73B7 4A8A E588  10AF 4447 461B 2A9B EA2D
 @end example
 
+@noindent
 To browse your private keyring, use @kbd{M-x epa-list-secret-keys}.
 
 @deffn Command epa-list-secret-keys name
 Show all keys matched with @var{name} from the private keyring.
 @end deffn
 
+@noindent
 In @samp{*Keys*} buffer, several commands are available.  The common
 use case is to export some keys to a file.  To do that, type @kbd{m}
 to select keys, type @kbd{o}, and then supply the filename.
@@ -274,8 +280,16 @@ Encrypt @var{file}.  It will let you select recipients.
 @section Dired integration
 
 EasyPG Assistant extends Dired Mode for GNU Emacs to allow users to
-easily do cryptographic operations on files.  The following keys are
-assigned.
+easily do cryptographic operations on files.  For example,
+
+@example
+M-x dired
+(mark some files)
+: e (or M-x epa-dired-do-encrypt)
+(select recipients by 'm' and click [OK])
+@end example
+
+The following keys are assigned.
 
 @table @kbd
 @item : d
@@ -329,14 +343,17 @@ Disable automatic encryption/decryption of *.gpg files.
 Enable automatic encryption/decryption of *.gpg files.
 @end deffn
 
+@noindent
 @code{epa-file} will let you select recipients.  If you want to
 suppress this question, it might be a good idea to put the following
 line on the first line of the text being encrypted.
 @vindex epa-file-encrypt-to
 
+@cartouche
 @lisp
 ;; -*- epa-file-encrypt-to: ("ueno@@unixuser.org") -*-
 @end lisp
+@end cartouche
 
 Other variables which control the automatic encryption/decryption
 behavior are below.
@@ -351,8 +368,6 @@ If non-@code{nil}, disable auto-saving when opening an encrypted file.
 The default value is @code{t}.
 @end defvar
 
-@summarycontents
-@contents
 @bye
 
 @c End: