From b900cf87161313a1ab11981a3a27367df80ca7cb Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 4 Jan 2012 14:39:31 +0800 Subject: 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. --- etc/org/COPYRIGHT-AND-LICENSE | 36 ------------------------------------ etc/org/OrgOdtContentTemplate.xml | 1 + etc/org/OrgOdtStyles.xml | 1 + etc/org/README | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 etc/org/COPYRIGHT-AND-LICENSE create mode 100644 etc/org/README (limited to 'etc/org') 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 -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 . - -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 @@ + + 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 . + + +Author: Jambunathan K +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. -- cgit v1.2.1