Merge from emacs-24; up to 2014-07-20T16:14:58Z!dmantipov@yandex.ru

[gnu-emacs] / doc / misc / vip.texi

diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index e7a53e768a768a4ef9478d759eb9c401e0b8ec5d..a6c6d3067eafd4198788e5de55f90d18646fffb0 100644 (file)
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1,5 +1,5 @@
 \input texinfo
-@setfilename ../../info/vip
+@setfilename ../../info/vip.info
 @settitle VIP
 
 @documentencoding UTF-8
@@ -38,7 +38,7 @@ modify this GNU manual.''
 
 @dircategory Emacs misc features
 @direntry
-* VIP: (vip).                   An older VI-emulation for Emacs.
+* VIP: (vip).                   An obsolete VI-emulation for Emacs.
 @end direntry
 
 @ifnottex
@@ -53,6 +53,9 @@ are fairly accustomed to Vi but not so much with Emacs.  Also we will
 concentrate mainly on differences from Vi, especially features unique to
 VIP.
 
+VIP is obsolete since Emacs 24.5---consider using Viper instead.
+@xref{Top, Viper,, viper, The Viper VI-emulation mode for Emacs}.
+
 It is recommended that you read nodes on survey and on customization before
 you start using VIP@.  Other nodes may be visited as needed.
 
@@ -83,6 +86,9 @@ fairly accustomed to Vi but not so much with Emacs.  Also we will
 concentrate mainly on differences from Vi, especially features unique to
 VIP.
 
+VIP is obsolete since Emacs 24.5---consider using Viper instead.
+@xref{Top, Viper,, viper, The Viper VI-emulation mode for Emacs}.
+
 It is recommended that you read chapters on survey and on customization
 before you start using VIP@.  Other chapters may be used as future
 references.