Merge from mainline.

1 files changed, 2 insertions, 1 deletions

diff --git a/info/dir b/info/dir
index cecc0d00f47..b6ec2845c3d 100644
--- a/info/dir
+++ b/info/dir
@@ -36,7 +36,7 @@ Emacs editing modes
                                   Java, Pike, AWK, and CORBA IDL code.
 * IDLWAVE: (idlwave).           Major mode and shell for IDL files.
 * nXML Mode: (nxml-mode).       XML editing mode with RELAX NG support.
-* Org Mode: (org).              Outline-based notes management and organizer
+* Org Mode: (org).              Outline-based notes management and organizer.
 
 Emacs network features
 * EUDC: (eudc).                 Emacs client for directory servers (LDAP, PH).
@@ -86,6 +86,7 @@ Emacs misc features
 * Wisent: (wisent).             Semantic Wisent parser development.
 * SES: (ses).                   Simple Emacs Spreadsheet.
 * Speedbar: (speedbar).         File/Tag summarizing utility.
+* Todo Mode: (todo-mode).       Make and maintain todo lists.
 * VIP: (vip).                   An older VI-emulation for Emacs.
 * VIPER: (viper).               A VI-emulation mode for Emacs.
 * WoMan: (woman).               Browse UN*X Manual Pages "W.O. (without) Man".