Swap
Compare Revisions
Showing 4 commits
Ancestor: 85bbbf1ec649
4 2016-10-25 22:34:29
bkuhn
be0abd7b1e18 next
Document the One Rule for merging into master.
3 2016-10-25 22:24:07
bkuhn
c7bf90446e45
Correct reference to wrong section.
2 2016-10-25 22:22:18
bkuhn
f1106e4c34e4
Note new commit bits given out to three others.
1 2016-08-16 10:02:02
bkuhn
0ad08b92d532
Would help online contributors send small changes? HT: Loïc Dachary <loic@dachary.org> ... who told me about this project.
2 files changed with 37 insertions and 4 deletions:
↑ Collapse Diff ↑
CONTRIBUTING.md | tip tip
...
 
@@ -9,8 +9,11 @@ Free Software project.
9 9
 
## Who Is In Charge?
10 10
 

	
11 11
 
Currently, [Bradley M. Kuhn](http://ebb.org/bkuhn/) is the editor-in-chief of
12
 
this Guide project.  However, many other contributors have given patches and
13
 
improvements to the text.  Review the
12
 
this Guide project.  Bradley shares commit access with Ben Cotton, Donald
13
 
Roberston, and Engel Nyst.
14
 

	
15
 
Also, many other contributors have given patches and improvements to the
16
 
text.  Review the
14 17
 
[commit log in the Git repository](https://k.copyleft.org/guide/changelog)
15 18
 
for more details on who has contributed to the project.
16 19
 

	
...
 
@@ -80,7 +83,8 @@ procedures when doing so:
80 83
 

	
81 84
 
0. Target all changes for the 'next' branch (see below).  Likely, use of a
82 85
 
   secondary branch will be useful for the following steps (perhaps use the
83
 
   procedure below entitled "Contributing via Gitorious" to do so).
86
 
   procedure below entitled "Contributing via copyleft.org's Kallithea
87
 
   instance" to do so).
84 88
 

	
85 89
 
1. If possible, follow this procedure for the first commit that begins the
86 90
 
   work of integrating the third party text.
...
 
@@ -171,7 +175,9 @@ spelling, grammar, formatting or anything urgent, submitting a patch against
171 175
 
'master' may make more sense.
172 176
 

	
173 177
 
To use the instructions below for proposals against the 'master' branch, just
174
 
replace 'next' everywhere below with 'master'.
178
 
replace 'next' everywhere below with 'master'.  However, please read below
179
 
the section entitled "Why Changes Should Target 'next' Branch" below before
180
 
pushing anything to the master branch.
175 181
 

	
176 182
 

	
177 183
 
### Contributing via copyleft.org's Kallithea instance
...
 
@@ -280,6 +286,31 @@ request.
280 286
 
   about the merge request.  Include the URL of the merge request in the
281 287
 
   post.
282 288
 

	
289
 
## Why Changes Should Target 'next' Branch
290
 

	
291
 
The instructions above encourage you to submit your changes to the 'next'
292
 
branch, which is found
293
 
[on k.copyleft.org](https://k.copyleft.org/guide/files/next), and is
294
 
auto-deployed to
295
 
[copyleft.org/guide-next/](https://copyleft.org/guide-next/).
296
 

	
297
 
The "official" Copyleft Guide is published on
298
 
[copyleft.org/guide/](https://copyleft.org/guide/) automatically from the
299
 
'master' branch of the repository.
300
 

	
301
 
Since many use this Guide as a reference, non-trivial changes are merged into
302
 
the "official" Copyleft Guide carefully and only after
303
 
discussion on
304
 
[the mailing list](http://lists.copyleft.org/cgi-bin/mailman/listinfo/discuss).
305
 

	
306
 
There is one key rule with regard to merging changes from 'next' to 'master':
307
 

	
308
 
> Treat 'master' branch as if by committing there, you have single-handledly
309
 
> defined for the world what copyleft is.
310
 

	
311
 
If you have commit access to the public master branch, please carefully head
312
 
this.
313
 

	
283 314
 
## Gitorious Apocalypse Recovery
284 315
 

	
285 316
 
If you used to contribute via Gitorious, *don't panic*!  We were careful to
TODO.md | tip tip
...
 
@@ -8,3 +8,5 @@
8 8
 
  copyleft.org/guide/  I set a few of these up by hand already, but perhaps
9 9
 
  there's a way that tex4ht could dump an list of URL redirects automatically
10 10
 
  when it builds the HTML.
11
 
* https://hypothes.is/ might be useful for quickly allowing web readers
12
 
  to add changes.