Commit graph

22 commits

Author SHA1 Message Date
Bradley M. Kuhn
be0abd7b1e Document the One Rule for merging into master. 2016-10-25 15:34:29 -07:00
Bradley M. Kuhn
c7bf90446e Correct reference to wrong section. 2016-10-25 15:24:07 -07:00
Bradley M. Kuhn
f1106e4c34 Note new commit bits given out to three others. 2016-10-25 15:22:18 -07:00
Bradley M. Kuhn
4dcf545108 Gitorious Apocalypse: recovery existing clone
These instructions are simple and I've tested them.
2015-04-02 20:51:35 -07:00
Bradley M. Kuhn
0a5d6db003 Gitorious Apocalypse: remove all gitorious URLs
The Gitorious URLs will disappear in the next few hours.  The canonical
hosting location of this project is now on copyleft.org.  Specific
gitorious URLs are generally replaced with k.copyleft.org, which is
copyleft.org's self-hosted Kallithea instance.
2015-04-02 20:32:33 -07:00
Bradley M. Kuhn
0e49270eb1 Contributing text from third-party works.
Integration of text from third-party works is complicated, since the
text must be incorporated to flow properly with the rest of the Guide.
Also, historical archiving commits are particularly useful in such
situations.  This tutorial explains how to contribute such additions for
this project.
2014-12-22 21:16:33 -05:00
Mike Linksvayer
27739cd92e copyleft.org tutorial, not conservancy policies 2014-12-22 19:18:23 -05:00
Bradley M. Kuhn
ce9168a9af Citations of third-party works in appendix only.
As alluded to in 2ea19b71d4 's commit
message on 2014-12-17 19:52:15 -0500, keeping any information on a
part-by-part basis is difficult and error-prone, since there exists no
reliable way to auto-generate such information accurately.

Therefore, citations to third-party works, in addition to remaining
fully documented in the commit log as they always have been, are now
placed in specifically one location in the body of the text itself: a
single appendix specifically designed for that purpose.

In this manner, contributors have no house-keeping work regarding
citations.  Contributors need only list third party works and links in
one place: third-party-citations.tex.

Documentation in CONTRIBUTING.md for making contributions of third-party
works is left as a TODO.
2014-12-22 16:30:00 -05:00
Bradley M. Kuhn
cd25fdd2c9 Document work-around for 'next' branch rebases.
Upstream in the copyleft.org tutorial repository, the next branch is
sometimes rebased against the master branch.  (For example, this occurs
when there have been quick fixes done on 'master' while new drafting
occurs on 'next'.)

This procedure, while convoluted, is the best way I've found to
compensate for this problem.  Hosting sites like Gitorious really aren't
designed for rebased branches.
2014-12-20 19:34:05 -05:00
Bradley M. Kuhn
81157b3136 No instructions for 'master';just note possibility
Ultimately, users will probably pick either 'master' or 'next' to submit
changes anyway, so just leave the instructions to refer to 'next' and
note that they could replace 'next' with 'master'.
2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
ea09b83e00 It's useful to post merge requests on mailing list 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
c830d8b51b Typo fixes. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
fd2318650e Detailed merge request instructions for Gitorious.
Most Gitorious users know this procedure, but it seems useful to
document it in great detail here, since copyleft.org seeks contributions
from those who might be knew to Git, and those who are more familiar
with procedures of other collaboration sites.
2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
57e8fa1cb2 Note merge request should usually target next.
Some targets to master are acceptable, though.
2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
e1373883c9 More about the next branch. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
6b441fa057 Note TODO list and lack of bugtracker. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
756748a79b Wordsmith this text. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
fd8fdee5bf Rewrite text to not sound so BDFL-ish. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
b855c3f4ca Note that our tools are themselves copylefted. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
883e2078ec Logs have more than just committers. 2014-12-20 19:31:57 -05:00
Bradley M. Kuhn
71c4a74974 Begin section on merge/patch workflow. 2014-12-20 19:31:56 -05:00
Bradley M. Kuhn
cacdffc192 First draft of CONTRIBUTING.md file. 2014-12-20 19:31:56 -05:00