1 |
commit: 1cc357373553373fc34d54f52965b855e83d7f56 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 24 19:43:57 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 31 14:40:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=1cc35737 |
7 |
|
8 |
glep-0076: Reformat the certificate of origin. |
9 |
|
10 |
For better readability, format as a block quote instead of a literal |
11 |
block. Use same format for items as will appear in the HTML output, |
12 |
i.e., 1. instead of (1). |
13 |
|
14 |
glep-0076.rst | 53 +++++++++++++++++++++++++++-------------------------- |
15 |
1 file changed, 27 insertions(+), 26 deletions(-) |
16 |
|
17 |
diff --git a/glep-0076.rst b/glep-0076.rst |
18 |
index 4bae039..2012e5c 100644 |
19 |
--- a/glep-0076.rst |
20 |
+++ b/glep-0076.rst |
21 |
@@ -136,34 +136,35 @@ commit message as a separate line. Committers must use their real |
22 |
name, i.e., the name that would appear in an official document like |
23 |
a passport. |
24 |
|
25 |
-The following is the current Gentoo DCO:: |
26 |
- |
27 |
- Gentoo Developer's Certificate of Origin, revision 1 |
28 |
+The following is the current Gentoo Developer's Certificate of Origin, |
29 |
+revision 1: |
30 |
|
31 |
By making a contribution to this project, I certify that: |
32 |
|
33 |
- (1) The contribution was created in whole or in part by me, and I have |
34 |
- the right to submit it under the free software license indicated |
35 |
- in the file; or |
36 |
+ 1. The contribution was created in whole or in part by me, and I |
37 |
+ have the right to submit it under the free software license |
38 |
+ indicated in the file; or |
39 |
|
40 |
- (2) The contribution is based upon previous work that, to the best |
41 |
- of my knowledge, is covered under an appropriate free software |
42 |
- license, and I have the right under that license to submit that |
43 |
- work with modifications, whether created in whole or in part by |
44 |
- me, under the same free software license (unless I am permitted |
45 |
- to submit under a different license), as indicated in the file; or |
46 |
+ 2. The contribution is based upon previous work that, to the best |
47 |
+ of my knowledge, is covered under an appropriate free software |
48 |
+ license, and I have the right under that license to submit that |
49 |
+ work with modifications, whether created in whole or in part by |
50 |
+ me, under the same free software license (unless I am permitted |
51 |
+ to submit under a different license), as indicated in the file; |
52 |
+ or |
53 |
|
54 |
- (3) The contribution is a license text (or a file of similar nature), |
55 |
- and verbatim distribution is allowed; or |
56 |
+ 3. The contribution is a license text (or a file of similar nature), |
57 |
+ and verbatim distribution is allowed; or |
58 |
|
59 |
- (4) The contribution was provided directly to me by some other person |
60 |
- who certified (1), (2), (3), or (4), and I have not modified it. |
61 |
+ 4. The contribution was provided directly to me by some other |
62 |
+ person who certified 1., 2., 3., or 4., and I have not modified |
63 |
+ it. |
64 |
|
65 |
- I understand and agree that this project and the contribution are |
66 |
- public and that a record of the contribution (including all personal |
67 |
- information I submit with it, including my sign-off) is maintained |
68 |
- indefinitely and may be redistributed consistent with this project or |
69 |
- the free software license(s) involved. |
70 |
+ I understand and agree that this project and the contribution |
71 |
+ are public and that a record of the contribution (including all |
72 |
+ personal information I submit with it, including my sign-off) is |
73 |
+ maintained indefinitely and may be redistributed consistent with |
74 |
+ this project or the free software license(s) involved. |
75 |
|
76 |
The Gentoo DCO is licensed under a Creative Commons |
77 |
Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_. |
78 |
@@ -271,13 +272,13 @@ the original: |
79 |
|
80 |
i. The enumeration has been modified to use numeric points. |
81 |
|
82 |
-ii. Additional point (3) has been inserted:: |
83 |
+ii. Additional point 3. has been inserted: |
84 |
|
85 |
- (3) The contribution is a license text (or a file of similar nature), |
86 |
- and verbatim distribution is allowed; or |
87 |
+ 3. The contribution is a license text (or a file of similar |
88 |
+ nature), and verbatim distribution is allowed; or |
89 |
|
90 |
-iii. The original point (c) has shifted to become point (4), and has |
91 |
- been updated to account for the additional point (3). |
92 |
+iii. The original point (c) has shifted to become point 4., and has |
93 |
+ been updated to account for the additional point 3. |
94 |
|
95 |
iv. The original point (d) has been transformed into a stand-alone |
96 |
paragraph following the enumeration. |