Skip to content

Commit dd52c4c

Browse files
jcebjceb
committed
- change licensing of the documentation to GNU Free Documentation License
- integrate orgguide (closes issue #57)
1 parent a5e4d10 commit dd52c4c

File tree

3 files changed

+69
-31
lines changed

3 files changed

+69
-31
lines changed

‎LICENSE

+49-15
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,60 @@
1+
---------------------------------------------------------------------
2+
All source code is licensed under the terms of the following license:
3+
---------------------------------------------------------------------
4+
15
Copyright (C) 2010,2011 Jan Christoph Ebersbach
26

37
http://www.e-jc.de/
48

59
All rights reserved.
610

7-
The source code of this program is made available
8-
under the terms of the GNU Affero General Public License version 3
9-
(GNU AGPL V3) as published by the Free Software Foundation.
11+
The source code of this program is made available under the terms of the
12+
GNU Affero General Public License version 3 (GNU AGPL V3) as published
13+
by the Free Software Foundation.
1014

11-
Binary versions of this program provided by Univention to you as
12-
well as other copyrighted, protected or trademarked materials like
13-
Logos, graphics, fonts, specific documentations and configurations,
14-
cryptographic keys etc. are subject to a license agreement between
15-
you and Univention and not subject to the GNU AGPL V3.
15+
Binary versions of this program provided by Univention to you as well as
16+
other copyrighted, protected or trademarked materials like Logos,
17+
graphics, fonts, specific documentations and configurations,
18+
cryptographic keys etc. are subject to a license agreement between you
19+
and Univention and not subject to the GNU AGPL V3.
1620

17-
In the case you use this program under the terms of the GNU AGPL V3,
18-
the program is provided in the hope that it will be useful,
19-
but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
GNU Affero General Public License for more details.
21+
In the case you use this program under the terms of the GNU AGPL V3, the
22+
program is provided in the hope that it will be useful, but WITHOUT ANY
23+
WARRANTY; without even the implied warranty of MERCHANTABILITY or
24+
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
25+
License for more details.
2226

23-
You should have received a copy of the GNU Affero General Public
24-
License with the Debian GNU/Linux or Univention distribution in file
27+
You should have received a copy of the GNU Affero General Public License
28+
with the Debian GNU/Linux or Univention distribution in file
2529
/usr/share/common-licenses/AGPL-3; if not, see
2630
<http://www.gnu.org/licenses/>.
31+
32+
33+
--------------------------------------------------------------------
34+
All documentation found in the directories doc and documentation are
35+
licensed under the terms of the following license:
36+
--------------------------------------------------------------------
37+
38+
doc/org.txt
39+
Copyright (C) 2010,2011 Jan Christoph Ebersbach
40+
41+
doc/orgguide.txt
42+
documentation/emacs_orgguide.org
43+
documentation/emacs_orgguide.texi
44+
Copyright (C) 2010 Free Software Foundation
45+
46+
Permission is granted to copy, distribute and/or modify this document
47+
under the terms of the GNU Free Documentation License, Version 1.3 or
48+
any later version published by the Free Software Foundation; with no
49+
Invariant Sections, with the Front-Cover texts being “A GNU Manual,” and
50+
with the Back-Cover Texts as in (a) below. A copy of the license is
51+
included in the section entitled “GNU Free Documentation License.”
52+
53+
(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
54+
modify this GNU manual. Buying copies from the FSF supports it in
55+
developing GNU and promoting software freedom.”
56+
57+
This document is part of a collection distributed under the GNU Free
58+
Documentation License. If you want to distribute this document
59+
separately from the collection, you can do so by adding a copy of the
60+
license to the document, as described in section 6 of the license.

‎doc/org.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,9 @@ LINKS *org-links*
444444
CHANGELOG *org-changelog*
445445

446446
0.4.0-0
447-
- replace DIRECTION_* with an enum (closed issue #56 and issue #49)
447+
- change licensing of the documentation to GNU Free Documentation License
448+
- integrate orgguide (closes issue #57)
449+
- replace DIRECTION_* with an enum (closes issue #56 and issue #49)
448450

449451
0.3.0-0, 2011-08-09
450452
- fix completion menu popup that disappeared because of the usage of vim.command

‎doc/orgguide.txt

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*orgguide.txt* For Vim version 7.3 Last change: 2011 August 5
1+
*orgguide.txt* For Vim version 7.3 Last change: 2011 August 14
22

33
==============================================================================
44
TABLE OF CONTENTS *orgguide* *orgguide-toc*
@@ -24,21 +24,21 @@ ORG MODE GUIDE *orgguide-about*
2424

2525
Copyright © 2010 Free Software Foundation
2626

27-
Permission is granted to copy, distribute and/or modify this document
28-
under the terms of the GNU Free Documentation License, Version 1.3 or
29-
any later version published by the Free Software Foundation; with no
30-
Invariant Sections, with the Front-Cover texts being “A GNU Manual,”
31-
and with the Back-Cover Texts as in (a) below. A copy of the license
32-
is included in the section entitled “GNU Free Documentation License.”
27+
Permission is granted to copy, distribute and/or modify this document under
28+
the terms of the GNU Free Documentation License, Version 1.3 or any later
29+
version published by the Free Software Foundation; with no Invariant
30+
Sections, with the Front-Cover texts being “A GNU Manual,” and with the
31+
Back-Cover Texts as in (a) below. A copy of the license is included in the
32+
section entitled “GNU Free Documentation License.”
3333

34-
(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
35-
modify this GNU manual. Buying copies from the FSF supports it in
36-
developing GNU and promoting software freedom.”
34+
(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify
35+
this GNU manual. Buying copies from the FSF supports it in developing GNU and
36+
promoting software freedom.”
3737

3838
This document is part of a collection distributed under the GNU Free
39-
Documentation License. If you want to distribute this document
40-
separately from the collection, you can do so by adding a copy of the
41-
license to the document, as described in section 6 of the license.
39+
Documentation License. If you want to distribute this document separately
40+
from the collection, you can do so by adding a copy of the license to the
41+
document, as described in section 6 of the license.
4242

4343
==============================================================================
4444
INTRODUCTION *orgguide-introduction*
@@ -49,7 +49,7 @@ Preface~
4949
an authoring and publishing system.
5050

5151
This document is a a copy of the orgmode-guide for emacs with modifications
52-
for vim. It contains all basic features and commands, along with important
52+
for vim. It contains all basic features and commands, along with important
5353
hints for customization.
5454

5555

@@ -63,7 +63,7 @@ Feedback~
6363
If you find problems with Org, or if you have questions, remarks, or
6464
ideas about it, please create a ticket on
6565
https://github.com/jceb/vim-orgmode
66-
66+
6767

6868
==============================================================================
6969
DOCUMENT STRUCTURE *orgguide-docstructure*
@@ -228,3 +228,5 @@ TODO
228228
MISCELLANEOUS *orgguide-misc*
229229

230230
TODO
231+
232+
vim:tw=78:ts=8:ft=help:norl:

0 commit comments

Comments
 (0)