* doc/misc/emacs-mime.texi (time-date): Use float-time.

* etc/NEWS: Related edit.

3 files changed, 9 insertions, 5 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c0a47b4db8d..d065f22a97a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-24  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-mime.texi (time-date): Use float-time.
+
 2014-01-22  David Engster  <deng@randomsample.de>
 
         * eieio.texi (Introduction): Move introductory paragraph about
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 601269d405b..7931ab298f0 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1511,7 +1511,7 @@ Here's a bunch of time/date/second/day examples:
 (date-to-time "Sat Sep 12 12:21:54 1998 +0200")
 @result{} (13818 19266)
 
-(time-to-seconds '(13818 19266))
+(float-time '(13818 19266))
 @result{} 905595714.0
 
 (seconds-to-time 905595714.0)
@@ -1583,9 +1583,8 @@ These are the functions available:
 @item date-to-time
 Take a date and return a time.
 
-@item time-to-seconds
-Take a time and return seconds.  Note that Emacs has a built-in
-function, @code{float-time}, that does this.
+@item float-time
+Take a time and return seconds.  (This is a built-in function.)
 
 @item seconds-to-time
 Take seconds and return a time.
diff --git a/etc/NEWS b/etc/NEWS
index 722643378cf..b4c3b001d16 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1263,7 +1263,8 @@ These attributes are only meaningful for coding-systems of type
 `:coding-type' attribute and can be accessed by calling the
 `coding-system-type' function.)
 
-** `time-to-seconds' is not obsolete any more.
+---
+** The `time-to-seconds' alias to `float-time' is no longer marked obsolete.
 
 +++
 ** New functions `group-gid' and `group-real-gid'.