Commit graph

810 commits

Author SHA1 Message Date
Richard Fontana
ff7790d608 "business people" -> "businesspeople" 2014-12-20 20:04:56 -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
d3baa07f5f CONTRIBUTING.md now canonical such information. 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
8498c557d5 Correct title and formatting.
There was a typo in the title and a stray comma.
2014-12-20 19:31:56 -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
Andrew Engelbrecht
daced43610 move long parenthetical text out of short sentence
it's easier to read this way.
2014-12-20 19:22:44 -05:00
Andrew Engelbrecht
5879dd3344 correct literal meaning of phrase
GPL protected code-bases don't demand industry trust, modern industry
trusts GPL protected code-bases.
2014-12-20 18:49:36 -05:00
Joshua Wells
07912cb5fc Fix broken link 2014-12-20 18:34:44 -05:00
Bradley M. Kuhn
1ed31baa28 Gerund use was incorrect grammar here. 2014-12-20 18:09:52 -05:00
Bradley M. Kuhn
b0801a2b8a Clarify sentence.
Make this sentence a bit clearer.
2014-12-19 19:09:01 -05:00
Bradley M. Kuhn
e01c6bf303 Remove spurious line.
This line was carried over as a paste from a previous version of the
paragraph above it, and is now no longer needed.
2014-12-17 23:34:50 -05:00
Bradley M. Kuhn
6a0567ac6f Make descriptions uniform.
Descriptions in this list should be uniformly worded.
2014-12-17 23:31:39 -05:00
Bradley M. Kuhn
48e517cb83 Additional published work.
This publish work was also referenced in the old commit logs already,
but now that we have a list in the work itself, it can also be listed
here.
2014-12-17 23:26:26 -05:00
Bradley M. Kuhn
bd80fd4703 List missing co-author on this published work.
Karen Sandler was co-author of the work herein referenced, and was
accidentally left off the list of authors in an earlier commit.
2014-12-17 23:24:59 -05:00
Bradley M. Kuhn
22fe0956db Add hyperlinks to remixed published works.
Now that a list of published works is part of the document proper, it is
reasonably practicable to add hyperlinks to those works.
2014-12-17 23:21:07 -05:00
Bradley M. Kuhn
b75c05d7bb Provide additional href link command.
Add additional command that can be used in place of href where
appropriate.
2014-12-17 23:11:56 -05:00
Bradley M. Kuhn
2ea19b71d4 Remove incomplete lists of authors entirely.
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.
2014-12-17 19:52:15 -05:00
Bradley M. Kuhn
3605394f30 List published works & link to Git logs.
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.
2014-12-17 18:33:10 -05:00
Bradley M. Kuhn
19c75b012c Link to sponsors. 2014-12-02 20:49:50 -05:00
Bradley M. Kuhn
251bcc6947 Typo fix. 2014-12-02 20:48:42 -05:00
Bradley M. Kuhn
30e4942891 Reword paragraph; Include ref: "standard requests"
Mostly these changes are wordsmith, but I added a note that violators
should ask for the "standard requests" for compliance to be adequate.
2014-11-19 12:56:28 -05:00
Bradley M. Kuhn
b9f7a402a6 Rewrite paragraph for readability. 2014-11-19 12:53:29 -05:00
Bradley M. Kuhn
39ead95e9b Rewrite paragraph to fix better with section.
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.
2014-11-19 12:48:45 -05:00
Bradley M. Kuhn
3e88116a43 Small grammar fix. 2014-11-19 12:46:15 -05:00
Martin Michlmayr
cbfa27466e Update references to gitorious repo 2014-11-16 11:10:38 -05:00
Mike Linksvayer
5ffc615320 Reword mind-reading statements.
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.
2014-11-16 11:01:54 -05:00
Bradley M. Kuhn
b920a7a4b8 Change links to copyleft.org site (now it exists) 2014-11-16 10:55:46 -05:00
Mike Linksvayer
312718cda0 it's is 2014-11-16 10:38:12 -05:00
Mike Linksvayer
a5fa6ca556 2 paras in a row start with However, 2014-11-16 10:38:12 -05:00
Mike Linksvayer
b35e89a8d8 more powerful interest*s* implicitly allied 2014-11-16 10:38:11 -05:00
Mike Linksvayer
a867743eb3 para prohibit*s* anyone 2014-11-16 10:38:11 -05:00
Mike Linksvayer
784976f1e3 consistent singular 2014-11-16 10:38:11 -05:00
Mike Linksvayer
38329c1b5a "an set" 2014-11-16 10:38:11 -05:00
Mike Linksvayer
126d4fc041 cap The in middle of sentence 2014-11-16 10:38:11 -05:00
Mike Linksvayer
b8ec5dbbe9 it indicate*s* 2014-11-16 10:37:45 -05:00
Mike Linksvayer
5f18dfd82f add needed connecting word/punctuation 2014-11-16 10:37:45 -05:00
Mike Linksvayer
4b25ade520 two "Furthermore..." sentences in a row 2014-11-16 10:37:45 -05:00
Mike Linksvayer
e52a3d32dc relate sections -> related sections 2014-11-16 10:37:45 -05:00