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.
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'.
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.
The lists of authors in each part has been continually out of date and
incomplete. There are multiple examples, here are a few:
* In September 2005, John Sullivan made improvements and was not placed on
the Authors lists until I did so in a March 2014 commit.
* In March 2014, Martin Michlmayr submitted many patches, but was not
placed on the Authors lists until I did so in an April 2014 commit.
There is no easy way to keep these Authors lists current, and they aren't
necessary under CC-BY-SA-4.0 anyway, so I herein remove the Authors lists.
Additionally, previous commit added "published sources" in each part, which
is more static and easier to keep up to date and provides similar
information.
References and details regarding these published works from which some
text was incorporated already appeared in the commit logs in great
detail. The information, already fully available in the Guide's Git
logs in full compliance with CC-BY-SA-4.0 §3(a)(1-2), now appears in
summary form additionally in the compiled PDF/HTML/Postscript output.
This paragraph was from text brought through from another document, and
as such, while this section was built "around it", the text itself was
stylistically different and otherwise problematic. This change brings
it into form with the rest of the document.
Merge requested proposed by @mlinksva has been changed slightly by
@bkuhn because there were changes to the README.md file since the
merge request was submitted that made some of the changes moot.