Merge from emacs-23

[bpt/emacs.git] / doc / emacs / ack.texi

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 2d4636d..1e15f82 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-@c   2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
@@ -226,6 +226,10 @@ for compiled Emacs Lisp code.
 Mathias Dahl wrote @file{image-dired.el}, a package for viewing image
 files as ``thumbnails.''
 
+@item
+Julien Danjou wrote an implementation of ``Desktop Notifications''
+(@file{notifications.el}).
+
 @item
 Vivek Dasmohapatra wrote @file{htmlfontify.el}, to convert a buffer or
 source tree to HTML.
@@ -573,6 +577,10 @@ Peter Kleiweg wrote @file{ps-mode.el}, a mode for editing PostScript
 files and running a PostScript interpreter interactively from within
 Emacs.
 
+@item
+Karel Kl@'{@dotless{i}}@v{c} contributed SELinux support, for preserving the
+Security-Enchanced Linux context of files on backup and copy.
+
 @item
 Shuhei Kobayashi wrote @file{hex-util.el}, for operating on hexadecimal
 strings; support for HMAC (Keyed-Hashing for Message Authentication);
@@ -1312,10 +1320,6 @@ time spent on projects; the Baha'i calendar support;
 Directory Client; and @code{eshell}, a command shell implemented
 entirely in Emacs Lisp.  He also contributed to Org mode (q.v.@:).
 
-@item
-Ed Wilkinson wrote @file{b2m.c}, a program to convert mail files from
-RMAIL format to Unix @code{mbox} format.
-
 @item
 Mike Williams wrote @file{mouse-sel.el}, providing enhanced mouse
 selection; and @file{thingatpt.el}, a library of functions for finding
@@ -1410,7 +1414,3 @@ Detlev Zundel wrote @file{re-builder.el}, a package for building regexps
 with visual feedback.
 
 @end itemize
-
-@ignore
-   arch-tag: bb1d0fa4-0240-4992-b5d4-8602d1e3d4ba
-@end ignore