From: Chong Yidong <cyd@gnu.org>
Date: Wed, 4 Jan 2012 06:39:31 +0000 (+0800)
Subject: Fix copyright headers for etc/org/ files.
X-Git-Tag: emacs-pretest-24.0.93~97^2~55^2~53
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b900cf87161313a1ab11981a3a27367df80ca7cb;p=emacs.git

Fix copyright headers for etc/org/ files.

Rename etc/org/COPYRIGHT-AND-LICENSE to etc/org/README for consistency
with other copyright files, and add a reference to it in the .xml
files.
---

diff --git a/etc/org/COPYRIGHT-AND-LICENSE b/etc/org/COPYRIGHT-AND-LICENSE
deleted file mode 100644
index e4438bb84a9..00000000000
--- a/etc/org/COPYRIGHT-AND-LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-OrgOdtContentTemplate.xml --- Aux XML file (Org-mode's OpenDocument export)
-OrgOdtStyles.xml	  --- Aux XML file (Org-mode's OpenDocument export)
-
-Copyright (C) 2010-2011 Free Software Foundation, Inc.
-
-Author: Jambunathan K <kjambunathan at gmail dot com>
-Keywords: outlines, hypermedia, calendar, wp
-Homepage: http://orgmode.org
-
-These file are not (yet) part of GNU Emacs.
-However, it is distributed under the same license.
-
-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 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.  If not, see <http://www.gnu.org/licenses/>.
-
-Commentary:
-
-Above files are part of Org-mode's OpenDocument export module.
-
-OrgOdtContentTemplate.xml provides a template within which the content
-of an exported document is enclosed.  This file contributes to
-"content.xml" file within an exported document and acts as a
-repository of automatic styles.
-
-OrgOdtStyles.xml contributes to "styles.xml" file within an exported
-document and acts as a repository of custom styles.
diff --git a/etc/org/OrgOdtContentTemplate.xml b/etc/org/OrgOdtContentTemplate.xml
index f4982f6203b..f50588b2adb 100644
--- a/etc/org/OrgOdtContentTemplate.xml
+++ b/etc/org/OrgOdtContentTemplate.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- See etc/org/README for copyright information -->
 <office:document-content
     xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
     xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
diff --git a/etc/org/OrgOdtStyles.xml b/etc/org/OrgOdtStyles.xml
index 762d56abc6d..4fb282064b0 100644
--- a/etc/org/OrgOdtStyles.xml
+++ b/etc/org/OrgOdtStyles.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- See etc/org/README for copyright information -->
 <office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" office:version="1.2">
  <office:font-face-decls>
   <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/>
diff --git a/etc/org/README b/etc/org/README
new file mode 100644
index 00000000000..a14b0cb9af3
--- /dev/null
+++ b/etc/org/README
@@ -0,0 +1,36 @@
+The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
+following copyright information:
+
+Copyright (C) 2010-2011 Free Software Foundation, Inc.
+
+These file are 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 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.  If not, see <http://www.gnu.org/licenses/>.
+
+
+Author: Jambunathan K <kjambunathan at gmail dot com>
+Keywords: outlines, hypermedia, calendar, wp
+Homepage: http://orgmode.org
+
+Commentary:
+
+These files are part of Org-mode's OpenDocument export module.
+
+OrgOdtContentTemplate.xml provides a template within which the content
+of an exported document is enclosed.  This file contributes to
+"content.xml" file within an exported document and acts as a
+repository of automatic styles.
+
+OrgOdtStyles.xml contributes to "styles.xml" file within an exported
+document and acts as a repository of custom styles.