Merge from emacs-23

5 files changed, 15 insertions, 7 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 872615c43e..3e8adcb1b2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  Glenn Morris  <[email protected]>
+
+	* tutorials/TUTORIAL.bg, tutorials/TUTORIAL.es: Fix typos.
+
 2010-06-09  Michael Albinus  <[email protected]>
 
 	* NEWS: Add notifications.el.
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 23184c4568..122c634b0f 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -760,7 +760,7 @@ not try to give commands in it when no longer really in the debugger.
 * New function `switch-to-buffer-other-window'.
 
 This is the new primitive to select a specified buffer (the
-argument)  in another window.  It is not quite the same as
+argument) in another window.  It is not quite the same as
 `pop-to-buffer', because it is guaranteed to create another
 window (assuming there is room on the screen) so that it can
 leave the current window's old buffer displayed as well.
@@ -971,7 +971,7 @@ once again "unmodified".
 This command creates an inferior Lisp process whose input and output
 appear in the Emacs buffer named `*lisp*'.  That buffer uses a major mode
 called inferior-lisp-mode, which has many of the commands of lisp-mode
-and those of shell-mode.   Calls the value of shell-mode-hook and
+and those of shell-mode.  Calls the value of shell-mode-hook and
 lisp-mode-hook, in that order, if non-nil.
 
 Meanwhile, in lisp-mode, the command C-M-x is defined to
@@ -1421,7 +1421,7 @@ Changes in Emacs 15
  of the executing emacs, for use in run-time conditionalization.
 
  The function  featurep  of one argument may be used to test for the
- presence of a feature. It is just the same as
+ presence of a feature.  It is just the same as
  (not (null (memq FEATURE features))) where FEATURE is its argument.
  For example, (if (featurep 'magic-window-hack)
 		  (transmogrify-window 'vertical)
@@ -1541,13 +1541,13 @@ Changes in Emacs 15
 
  This function returns a cons cell whose car is the object produced
  by reading from the string and whose cdr is a number giving the
- index in the string of the first character not read. That index may
+ index in the string of the first character not read.  That index may
  be passed as the second argument to a later call to  read-from-string
  to read the next form represented by the string.
 
  In addition, the function  read  now accepts a string as its argument.
  In this case, it calls  read-from-string  on the whole string, and
- returns the car of the result. (ie the actual object read.)
+ returns the car of the result (ie the actual object read.)
 
 
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 9124fe1c06..74291bab8a 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -27,6 +27,10 @@ with a prefix argument or by typing C-u C-h C-n.
 
 * Changes in Specialized Modes and Packages in Emacs 23.3
 
+---
+** The appt-add command takes an optional argument for the warning time.
+This can be used in place of the default appt-message-warning-time.
+
 
 * New Modes and Packages in Emacs 23.3
 
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg
index 3f8ea6e2c4..e8300d2665 100644
--- a/etc/tutorials/TUTORIAL.bg
+++ b/etc/tutorials/TUTORIAL.bg
@@ -625,7 +625,7 @@ C-f.  �� ���� ����� ���� �� �������� ����� �� ���� ������� � �����.
 ����� �������.
 
 >> �������� C-x b *Messages* <Return>, �� �� ������ ������ ���
-   �����������.  ���� ���� �������� C-x C-b TUTORIAL <Return>, �� ��
+   �����������.  ���� ���� �������� C-x b TUTORIAL <Return>, �� ��
    �� ������� ��� ���� ���������.
 
 ��� ��������� ������� � ������ �� ���� ���� � ������ �������� ����
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index 1af1b97537..7fb7ac2c2a 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -630,7 +630,7 @@ contiene los mensajes que han aparecido en la l�nea de abajo durante
 su sesi�n de Emacs.
 
 >> Teclee C-x b *Messages* <Return> para ver el buffer de mensajes.
-   Luego teclee C-b TUTORIAL <Return> para regresar a este tutorial.
+   Luego teclee C-x b TUTORIAL <Return> para regresar a este tutorial.
 
 Si hace cambios al texto de un archivo, y luego encuentra otro
 archivo, esto no guarda el primer archivo.  Sus cambios permanecer�n