Merge branch 'maint'

etc/ORG-NEWS

@@ -1,4 +1,4 @@
-ORG NEWS -- history of user-visible changes.           -*- org -*-
+ORG NEWS -- history of user-visible changes.   -*- mode: org; coding: utf-8 -*-
 
 #+LINK: doc http://orgmode.org/worg/doc.html#%s
 #+LINK: git http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=%s
@@ -2699,7 +2699,7 @@ instead of requiring each Babel library one by one.
 - New option [[doc:org-gnus-no-server][org-gnus-no-server]] to start Gnus with =gnus-no-server=
 - Org is now distributed with =htmlize.el= version 1.43
 - ~org-drill.el~ has been updated to version 2.3.7
-- ~org-mac-iCal.el~ now supports MacOSX version up to 10.8
+- ~org-mac-iCal.el~ now supports OS X versions up to 10.8
 - Various improvements to ~org-contacts.el~ and =orgpan.el=
 
 ** Outside Org

etc/schema/od-manifest-schema-v1.2-os.rnc

@@ -3,11 +3,11 @@
 # Manifest Relax-NG Schema
 # Source: http://docs.oasis-open.org/office/v1.2/os/
 # Copyright (c) OASIS Open 2002-2011, 2013. All Rights Reserved.
-# 
+#
 # All capitalized terms in the following text have the meanings assigned to them
 # in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
 # full Policy may be found at the OASIS website.
-# 
+#
 # This document and translations of it may be copied and furnished to others, and
 # derivative works that comment on or otherwise explain it or assist in its
 # implementation may be prepared, copied, published, and distributed, in whole or
@@ -19,15 +19,15 @@
 # Technical Committee (in which case the rules applicable to copyrights, as set
 # forth in the OASIS IPR Policy, must be followed) or as required to translate it
 # into languages other than English.
-# 
+#
 # The limited permissions granted above are perpetual and will not be revoked by
 # OASIS or its successors or assigns.
-# 
+#
 # This document and the information contained herein is provided on an "AS IS"
 # basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
 # LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
 # INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-# FITNESS FOR A PARTICULAR PURPOSE. 
+# FITNESS FOR A PARTICULAR PURPOSE.
 
 namespace manifest =
   "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"

etc/schema/od-schema-v1.2-os.rnc

@@ -3,11 +3,11 @@
 # Relax-NG Schema
 # Source: http://docs.oasis-open.org/office/v1.2/os/
 # Copyright (c) OASIS Open 2002-2011, 2013. All Rights Reserved.
-# 
+#
 # All capitalized terms in the following text have the meanings assigned to them
 # in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
 # full Policy may be found at the OASIS website.
-# 
+#
 # This document and translations of it may be copied and furnished to others, and
 # derivative works that comment on or otherwise explain it or assist in its
 # implementation may be prepared, copied, published, and distributed, in whole or
@@ -19,15 +19,15 @@
 # Technical Committee (in which case the rules applicable to copyrights, as set
 # forth in the OASIS IPR Policy, must be followed) or as required to translate it
 # into languages other than English.
-# 
+#
 # The limited permissions granted above are perpetual and will not be revoked by
 # OASIS or its successors or assigns.
-# 
+#
 # This document and the information contained herein is provided on an "AS IS"
 # basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
 # LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
 # INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-# FITNESS FOR A PARTICULAR PURPOSE. 
+# FITNESS FOR A PARTICULAR PURPOSE.
 
 namespace anim = "urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
 namespace chart = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0"

etc/styles/README

@@ -1,7 +1,7 @@
 The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
 following copyright information:
 
-Copyright (C) 2010-2014 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 These files are part of GNU Emacs.