Merge from emacs-23

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

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index e6dba48..1e15f82 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1,6 +1,7 @@
 @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 Free Software Foundation, Inc.
+@c   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @node Acknowledgments, Screen, Concept Index, Top
@@ -225,6 +226,14 @@ 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.
+
 @item
 Michael DeCorte wrote @file{emacs.csh}, a C-shell script that starts a
 new Emacs job, or restarts a paused Emacs if one exists.
@@ -247,11 +256,11 @@ Jan Dj@"{a}rv added support for the GTK+ toolkit and X drag-and-drop.
 Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
 cross-references in La@TeX{} documents; and co-wrote IDLWAVE mode
 (q.v.@:).  He was the main author of Org mode, for maintaining notes,
-todo lists, and project planning.  Thomas Baumann, Baoqiu Cui, Daniel
-German, Bastien Guerry, Tassilo Horn, Philip Jackson, Tokuya Kameshima,
-Ross Patterson, Sebastian Rose, Eric Schulte, Andy Stewart, David
-O'Toole, John Wiegley, and Piotr Zielinski also wrote various Org mode
-components.
+todo lists, and project planning.  Thomas Baumann, Jan Böcker, Lennart
+Borgman, Baoqiu Cui, Daniel German, Bastien Guerry, Tassilo Horn, Philip
+Jackson, Tokuya Kameshima, Ross Patterson, Sebastian Rose, Eric Schulte,
+Paul Sexton, Ulf Stegemann, Andy Stewart, David O'Toole, John Wiegley,
+and Piotr Zielinski also wrote various Org mode components.
 
 @item
 Scott Draves wrote @file{tq.el}, help functions for maintaining
@@ -568,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);
@@ -596,8 +609,7 @@ R.@: Dodd.  He also wrote @file{ls-lisp.el}, a Lisp emulation of the
 program.
 
 @item
-Geoff Kuenning and Ken Stevens wrote @file{ispell.el}, a spell-checker
-interface.
+Ken Stevens wrote @file{ispell.el}, a spell-checker interface.
 
 @item
 David K@ringaccent{a}gedal wrote @file{tempo.el}, providing support for
@@ -797,8 +809,9 @@ a directory-level front end to the CVS version control system;
 @file{reveal.el}, a minor mode for automatically revealing invisible
 text; @file{smerge-mode.el}, a minor mode for resolving @code{diff3}
 conflicts; @file{diff-mode.el}, a mode for viewing and editing context
-diffs; @file{css-mode.el} for Cascading Style Sheets; and
-@file{bibtex-style.el} for BibTeX Style files.
+diffs; @file{css-mode.el} for Cascading Style Sheets;
+@file{bibtex-style.el} for BibTeX Style files; and @file{mpc.el}, a
+client for the ``Music Player Daemon''.
 
 @item
 Morioka Tomohiko wrote several packages for MIME support in Gnus and
@@ -1307,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
@@ -1405,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