Doc updates for SELinux support.

* ack.texi, emacs.texi (Acknowledgments): Add SELinux support.

* etc/NEWS: Mention SELinux support.

4 files changed, 25 insertions, 6 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7c050b83af7..a2cc7a08ef6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-21  Glenn Morris  <rgm@gnu.org>
+
+        * ack.texi, emacs.texi (Acknowledgments): Add SELinux support.
+
 2010-04-18  Chong Yidong  <cyd@stupidchicken.com>
 
         * programs.texi (Semantic): New node.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 2d4636dd74f..0f6e57d8f8b 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -574,6 +574,10 @@ 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);
 and a Lisp implementation of the SHA1 Secure Hash Algorithm.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index d4f6c1af92c..28a9a8d014b 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1375,12 +1375,12 @@ Janik, Paul Jarc, Ulf Jasper, Michael K. Johnson, Kyle Jones, Terry
 Jones, Simon Josefsson, Arne J@o{}rgensen, Tomoji Kagatani, Brewster
 Kahle, Tokuya Kameshima, Lute Kamstra, David Kastrup, David Kaufman,
 Henry Kautz, Taichi Kawabata, Howard Kaye, Michael Kifer, Richard King,
-Peter Kleiweg, Shuhei Kobayashi, Pavel Kobiakov, Larry K.@: Kolodney,
-David M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian
-Kremer, Ryszard Kubiak, David K@aa{}gedal, Daniel LaLiberte, Karl
-Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose
-Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Lars
-Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov,
+Peter Kleiweg, Karel Kl@'{@dotless{i}}@v{c}, Shuhei Kobayashi, Pavel
+Kobiakov, Larry K.@: Kolodney, David M.@: Koppelman, Koseki Yoshinori,
+Robert Krawitz, Sebastian Kremer, Ryszard Kubiak, David K@aa{}gedal, Daniel
+LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus,
+Vinicius Jose Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg,
+Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov,
 Francis Litterio, Emilio C. Lopes, K@'{a}roly L@H{o}rentey, Dave Love,
 Sascha L@"{u}decke, Eric Ludlam, Alan Mackenzie, Christopher J.@:
 Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon
diff --git a/etc/NEWS b/etc/NEWS
index fcd293781b6..3510b66b616 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -30,6 +30,9 @@ so we will look at it and add it to the manual.
 These provide no new functionality, they just remove the need to edit
 lib-src/Makefile by hand in order to use the associated features.
 
+** Configure links against libselinux if it is found.
+You can disable this by using --without-selinux.
+
 
 * Startup Changes in Emacs 24.1
 
@@ -68,6 +71,14 @@ Use `set-scroll-bar-mode' to change this.
 ** Lucid menus and dialogs can display antialiased fonts if Emacs is built
 with Xft.
 
+** Basic SELinux support has been added.
+This requires Emacs to be linked with libselinux at build time.
+
+*** Emacs preserves the SELinux file context when backing up or copying files.
+
+*** The new functions file-selinux-context and set-file-selinux-context
+get and set the SELinux context of a file.
+
 ** New scrolling commands `scroll-up-command' and `scroll-down-command'
 (bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom
 of buffer at first key-press (instead moves to top/bottom of buffer)