(Program Modes): Add Conf mode and DNS mode.

diff --git a/man/ChangeLog b/man/ChangeLog
index 78c3804274ff42103fb47355c5f4d1d3e2e09a8d..9c3279b211d0ea1c34101234eb910928c5dcebd6 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,28 @@
+2005-03-28  Richard M. Stallman  <rms@gnu.org>
+
+       * emacs.texi (Top): Update list of subnodes of Dired.
+       Likewise for building.texi.
+
+       * files.texi (File Conveniences): Delete Auto Image File mode.
+
+2005-03-28  Chong Yidong  <cyd@stupidchicken.com>
+
+       * building.texi (Flymake): New node.
+
+       * custom.texi (Function Keys): Document kp- event types and
+       keypad-setup package.
+
+       * dired.texi (Wdired): New node.
+
+       * files.texi (File Conveniences): Reorder entries.
+       Explain how to turn on Auto-image-file mode.
+       Document Thumbs mode.
+
+       * mule.texi (Specify Coding): Document recode-region and
+       recode-file-name.
+
+       * programs.texi (Program Modes): Add Conf mode and DNS mode.
+
 2005-03-27  Luc Teirlinck  <teirllm@auburn.edu>
 
        * commands.texi (Keys): M-o is now a prefix key.

diff --git a/man/programs.texi b/man/programs.texi
index 62e0c31f331a4530a9aeafbc5f231e385acdaa9d..67262e99e9609a6769b6eb03808e4a3394233923 100644 (file)
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -81,17 +81,19 @@ and you can select it by typing @kbd{M-x @var{l}-mode @key{RET}}.
 @cindex Shell-script mode
 @cindex Delphi mode
 @cindex PostScript mode
+@cindex Conf mode
+@cindex DNS mode
   The existing programming language major modes include Lisp, Scheme (a
 variant of Lisp) and the Scheme-based DSSSL expression language, Ada,
 ASM, AWK, C, C++, Delphi (Object Pascal), Fortran (free format and fixed
 format), Icon, IDL (CORBA), IDLWAVE, Java, Metafont (@TeX{}'s
 companion for font creation), Modula2, Objective-C, Octave, Pascal,
-Perl, Pike, PostScript, Prolog, Python, Simula, Tcl, and VHDL.  There is
-also a major mode for makefiles, called Makefile mode.  An alternative
-mode for Perl is called CPerl mode.  Modes are available for the
-scripting languages of the common GNU and Unix shells, VMS DCL, and
+Perl, Pike, PostScript, Prolog, Python, Simula, Tcl, and VHDL.  An
+alternative mode for Perl is called CPerl mode.  Modes are available for
+the scripting languages of the common GNU and Unix shells, VMS DCL, and
 MS-DOS/MS-Windows @samp{BAT} files.  There are also major modes for
-editing various sorts of configuration files.
+editing makefiles, DNS master files, and various sorts of configuration
+files.
 
 @kindex DEL @r{(programming modes)}
 @findex c-electric-backspace