Misc small doc updates

* doc/emacs/ack.texi (Acknowledgments): No longer mention obsolete xesam.el.

* lisp/woman.el (woman-default-faces, woman-monochrome-faces):
Fix obsolescence specification.

* etc/NEWS: Related markup.

5 files changed, 16 insertions, 4 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8ef2f4699ec..bcb9e69230d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-24  Glenn Morris  <rgm@gnu.org>
 
+        * ack.texi (Acknowledgments): No longer mention obsolete xesam.el.
+
         * files.texi (Interlocking): Copyedit.
 
 2014-01-23  Glenn Morris  <rgm@gnu.org>
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index a7df1544aef..b3b21a277e9 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -51,8 +51,12 @@ files.
 @item
 Michael Albinus wrote @file{dbus.el}, a package that implements the
 D-Bus message bus protocol; @file{zeroconf.el}, a mode for browsing
-Avahi services; @file{xesam.el}, a Xesam-based search engine
-interface; and @file{secrets.el}, an interface to keyring daemons for
+Avahi services;
+@ignore
+@c obsolete
+@file{xesam.el}, a Xesam-based search engine interface;
+@end ignore
+and @file{secrets.el}, an interface to keyring daemons for
 storing confidential data.  He and Kai Großjohann wrote the Tramp package, which
 provides transparent remote file editing using rcp, ssh, ftp, and
 other network protocols.  He and Daniel Pittman wrote
diff --git a/etc/NEWS b/etc/NEWS
index 39fdefeb8f0..89d78d79efb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -851,6 +851,7 @@ because it is moved to vc-cvs.el.
 ---
 *** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'.
 
+---
 ** The Woman commands `woman-default-faces' and `woman-monochrome-faces'
 are obsolete.  Customize the `woman-*' faces instead.
 
@@ -867,6 +868,7 @@ are obsolete.  Customize the `woman-*' faces instead.
 
 *** The previous version of todo-mode.el is obsolete and renamed otodo-mode.el.
 
+---
 *** xesam.el is obsolete, because the XESAM project has been canceled.
 
 +++
@@ -1293,6 +1295,7 @@ meant to be used by other packages.
 
 * Changes in Emacs 24.4 on Non-Free Operating Systems
 
+---
 ** The procedure for building Emacs on MS-Windows has changed.
 It is now built by running the same configure script as on all other
 platforms.  This requires the MSYS environment and MinGW development
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 896d1da9393..193ac3ec71c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,9 @@
 
 2014-01-24  Glenn Morris  <rgm@gnu.org>
 
+        * woman.el (woman-default-faces, woman-monochrome-faces):
+        Fix obsolescence specification.
+
         * subr.el (with-demoted-errors): Doc fix.
 
 2014-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/woman.el b/lisp/woman.el
index 7100e4b61cf..e28f1c9cace 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -949,7 +949,7 @@ or different fonts."
 
 (defun woman-default-faces ()
   "Set foreground colors of italic and bold faces to their default values."
-  (declare (obsolete choose-completion-guess-base-position "23.2"))
+  (declare (obsolete "customize the woman-* faces instead." "24.4"))
   (interactive)
   (face-spec-set 'woman-italic (face-user-default-spec 'woman-italic))
   (face-spec-set 'woman-bold (face-user-default-spec 'woman-bold)))
@@ -957,7 +957,7 @@ or different fonts."
 (defun woman-monochrome-faces ()
   "Set foreground colors of italic and bold faces to that of the default face.
 This is usually either black or white."
-  (declare (obsolete choose-completion-guess-base-position "23.2"))
+  (declare (obsolete "customize the woman-* faces instead." "24.4"))
   (interactive)
   (set-face-foreground 'woman-italic 'unspecified)
   (set-face-foreground 'woman-bold 'unspecified))