diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2008-06-16 17:05:31 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2008-06-16 17:05:31 +0200 |
commit | 69673b3c1f2b2083104c70f8099016d17ea19af3 (patch) | |
tree | 58beb2df7099ced63fdda5b2757a1858a38fe013 | |
parent | be026ff5ad8746814870e5f9eced0cbb5b5c4a6c (diff) | |
download | org-mode-69673b3c1f2b2083104c70f8099016d17ea19af3.tar.gz |
Put the examples in the manual under GPL.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 1 | ||||
-rwxr-xr-x | UTILITIES/gplmanual.pl | 21 | ||||
-rw-r--r-- | doc/org.texi | 13 |
4 files changed, 33 insertions, 3 deletions
@@ -29,6 +29,7 @@ org-install.el org-*.tar.gz org-*.zip manual +org_dual_license.texi # aspell word and replacement lists @@ -218,6 +218,7 @@ release: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi make distfile make doc + UTILITIES/gplmanual.pl make html_manual rm -rf RELEASEDIR $(MKDIR) RELEASEDIR diff --git a/UTILITIES/gplmanual.pl b/UTILITIES/gplmanual.pl new file mode 100755 index 0000000..d7171a5 --- /dev/null +++ b/UTILITIES/gplmanual.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +# This command creates a version of the manual to is both GFDL and GPL +# To allow DEBIAN to include the manual in its main section. + +$gpl = +' + +Permission is also granted to copy, distribute and/or modify this document +under the terms of the GNU General Public License (GPL). +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see @url{http://www.gnu.org/licenses/}. +'; + +open IN, "<doc/org.texi" or die "Cannot open doc/org.texi\n"; +open OUT, ">doc/org_dual_license.texi" or die "Cannot open doc/org.texi\n"; + +while (<IN>) { + print OUT $gpl if /end quotation/; + print OUT $_; + } diff --git a/doc/org.texi b/doc/org.texi index 9f5c6b0..a57fad7 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -42,13 +42,20 @@ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' -and with the Back-Cover Texts as in (a) below. You should have received a -copy of the ``GNU Free Documentation License'' with GNU Emacs. If not, see -@url{http://www.gnu.org/licenses/}. +and with the Back-Cover Texts as in (a) below. You should have received +a copy of the ``GNU Free Documentation License'' with GNU Emacs. If +not, see @url{http://www.gnu.org/licenses/}. (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development.'' + +You have permission to copy, distribute and/or modify all code examples +in this manual under the terms of the GNU General Public License, +Version 2 or any later version published by the Free Software +Foundation. You should have received a copy of the GNU General Public +License along with GNU Emacs. If not, see +@url{http://www.gnu.org/licenses/}. @end quotation @end copying |