Incorporate Glen Morris' changes in downstream Emacs

doc/org.texi

@@ -6970,7 +6970,7 @@ Toggle the time grid on and off.  See also the variables
 @kindex r
 @item r
 Recreate the agenda buffer, for example to reflect the changes after
-modification of the timestamps of items with S-@key{left} and
+modification of the timestamps of items with @kbd{S-@key{left}} and
 @kbd{S-@key{right}}.  When the buffer is the global TODO list, a prefix
 argument is interpreted to create a selective list for a specific TODO
 keyword.

lisp/org-ascii.el

@@ -602,5 +602,4 @@ publishing directory."
 (provide 'org-ascii)
 
 ;; arch-tag: aa96f882-f477-4e13-86f5-70d43e7adf3c
-
 ;;; org-ascii.el ends here

lisp/org-docbook.el

@@ -9,10 +9,9 @@
 ;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Keywords: org, wp, docbook
 ;; Description: Converts an org-mode buffer into DocBook
-;; $Id: org-docbook.el 35 2009-03-23 01:03:21Z baoqiu $
 ;; URL:
 
-;; This file is NOT part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

lisp/org-feed.el

@@ -660,6 +660,4 @@ formatted as a string, not the original XML data."
 (provide 'org-feed)
 
 ;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
-
 ;;; org-feed.el ends here
-

lisp/org-html.el

@@ -2080,5 +2080,4 @@ Replaces invalid characters with \"_\" and then prepends a prefix."
 (provide 'org-html)
 
 ;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
-
 ;;; org-html.el ends here

lisp/org-icalendar.el

@@ -577,5 +577,4 @@ a time), or the day by one (if it does not contain a time)."
 (provide 'org-icalendar)
 
 ;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
-
 ;;; org-icalendar.el ends here

lisp/org-indent.el

@@ -1,5 +1,5 @@
 ;;; org-indent.el --- Dynamic indentation for  Org-mode
-;; Copyright (C) 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2009 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -8,20 +8,19 @@
 ;;
 ;; This file is part of GNU Emacs.
 ;;
-;; This file is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-
+;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
@@ -279,5 +278,3 @@ Point is assumed to be at the beginning of a headline."
 (provide 'org-indent)
 
 ;;; org-indent.el ends here
-
-

lisp/org-inlinetask.el

@@ -1,17 +1,19 @@
 ;;; org-inlinetask.el --- Tasks independent of outline hierarchy
+
 ;; Copyright (C) 2009 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
 ;; Version: 6.29trans
-;;
-;; This file is not yet part of GNU Emacs.
-;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +21,8 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
@@ -196,4 +197,3 @@ Either remove headline and meta data, or do special formatting."
 (provide 'org-inlinetask)
 
 ;;; org-inlinetask.el ends here
-

lisp/org-protocol.el

@@ -1,6 +1,6 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
 ;;
-;; Copyright (c) 2008, 2009
+;; Copyright (C) 2008, 2009
 ;;          Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
@@ -633,4 +633,5 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
       (customize-save-variable 'org-protocol-project-alist org-protocol-project-alist))))
 
 (provide 'org-protocol)
+
 ;;; org-protocol.el ends here

lisp/org-src.el

@@ -467,5 +467,4 @@ the language, a switch telling of the content should be in a single line."
 (provide 'org-src)
 
 ;; arch-tag: 6a1fc84f-dec7-47be-a416-64be56bea5d8
-
 ;;; org-src.el ends here

lisp/org-xoxo.el

@@ -119,6 +119,4 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 (provide 'org-xoxo)
 
 ;; arch-tag: 16e6a31f-f4f5-46f1-af18-48dc89faa702
-
-
 ;;; org-xoxo.el ends here