* doc/emacs/xresources.texi (Motif Resources):

Rename from LessTif Resources.  Update xrefs.

* doc/emacs/emacs.texi: Update menu.

* doc/man/emacs.1: Update manual links.

Fixes: debbugs:15145

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2dd245a92ba0e0c27dd418812d4d1badd229b9ca..e4ab9a1e466bd07f3baf7f9079610ef2a96744b6 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+       * xresources.texi (Motif Resources):
+       Rename from LessTif Resources.  Update xrefs.  (Bug#15145)
+       * emacs.texi: Update menu.
+
 2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 8a518b82abbc7f7351bb4a187b99a1781964395f..985466810f2d81957abf3a4de308dc79f73cdd99 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1189,7 +1189,7 @@ X Options and Resources
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 
 GTK resources

diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 3723c8e5e1db24df088d7a0b8f59fe590f19b11f..b2ebf634ba0ee616738223cc3072a8b006c7c917 100644 (file)
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -27,7 +27,7 @@ system registry (@pxref{MS-Windows Registry}).
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 @end menu
 
@@ -260,7 +260,7 @@ compiled with GTK+ support.
 @ifnottex
 @item @code{selectionFont} (class @code{SelectionFont})
 Font name for pop-up menu items, in non-toolkit versions of Emacs.  (For
-toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif
+toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
 Resources}.)
 
 @item @code{selectionTimeout} (class @code{SelectionTimeout})
@@ -370,15 +370,15 @@ elements.  Default is 1.
 Margin of the menu bar, in characters.  Default is 1.
 @end table
 
-@node LessTif Resources
-@appendixsec LessTif Menu X Resources
-@cindex Menu X Resources (LessTif widgets)
-@cindex LessTif Widget X Resources
+@node Motif Resources
+@appendixsec Motif Menu X Resources
+@cindex Menu X Resources (Motif widgets)
+@cindex Motif Widget X Resources
 
-  If Emacs is compiled with the X toolkit support using LessTif or
-Motif widgets, you can use X resources to customize the appearance of
-the menu bar, pop-up menus, and dialog boxes.  However, the resources
-are organized differently from Lucid widgets.
+  If Emacs is compiled with the X toolkit support using Motif or
+LessTif widgets, you can use X resources to customize the appearance
+of the menu bar, pop-up menus, and dialog boxes.  However, the
+resources are organized differently from Lucid widgets.
 
   The resource names for the menu bar are in the @samp{pane.menubar}
 class, and they must be specified in this form:

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8b550dc4417209238e26617a923f022be22137fa..0235b5f7b9b1a37a9e6cbf0e3f07baea257c8255 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+       * emacs.1: Update manual links.
+
 2013-04-20  Petr Hracek  <phracek@redhat.com>  (tiny change)
 
        * emacs.1: Add some more command-line options.  (Bug#14165)

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 9149be2c52370a963930b5bb6f7b63dbbeed26bf..a306edc3ca9d4eb47f1d8633e32a54453c27a25c 100644 (file)
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -445,7 +445,7 @@ Gives frames menu bars if
 .IR on ;
 don't have menu bars if
 .IR off .
-See the Emacs manual, sections "Lucid Resources" and "LessTif
+See the Emacs manual, sections "Lucid Resources" and "Motif
 Resources", for how to control the appearance of the menu bar
 if you have one.
 .TP
@@ -492,7 +492,7 @@ The scroll bar width in pixels, equivalent to the frame parameter
 Font name for pop-up menu items, in non-toolkit versions of
 .IR Emacs .
 (For toolkit versions, see the Emacs manual, sections
-"Lucid Resources" and "LessTif Resources".)
+"Lucid Resources" and "Motif Resources".)
 .TP
 .BR selectionTimeout " (class " SelectionTimeout )
 Number of milliseconds to wait for a selection reply.