From b900cf87161313a1ab11981a3a27367df80ca7cb Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 4 Jan 2012 14:39:31 +0800 Subject: [PATCH] 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/OrgOdtContentTemplate.xml | 1 + etc/org/OrgOdtStyles.xml | 1 + etc/org/{COPYRIGHT-AND-LICENSE => README} | 18 +++++++++--------- 3 files changed, 11 insertions(+), 9 deletions(-) rename etc/org/{COPYRIGHT-AND-LICENSE => README} (79%) 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/COPYRIGHT-AND-LICENSE b/etc/org/README similarity index 79% rename from etc/org/COPYRIGHT-AND-LICENSE rename to etc/org/README index e4438bb84a9..a14b0cb9af3 100644 --- a/etc/org/COPYRIGHT-AND-LICENSE +++ b/etc/org/README @@ -1,14 +1,9 @@ -OrgOdtContentTemplate.xml --- Aux XML file (Org-mode's OpenDocument export) -OrgOdtStyles.xml --- Aux XML file (Org-mode's OpenDocument export) +The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the +following copyright information: 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. +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 @@ -23,9 +18,14 @@ 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: -Above files are part of Org-mode's OpenDocument export module. +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 -- 2.39.2