Merge branch 'core' of github.com:swcarpentry/lesson-template into me…

…rge-core

.gitignore

@@ -2,6 +2,7 @@ README.html
 LAYOUT.html
 FAQ.html
 DESIGN.html
+CONTRIBUTING.html
 *~
 *.pyc
 _site

CONTRIBUTING.md

@@ -0,0 +1,46 @@
+Software Carpentry is an open source project,
+and we welcome contributions of all kinds:
+new lessons,
+fixes to existing material,
+bug reports,
+and reviews of proposed changes are all equally welcome.
+
+By contributing,
+you are agreeing that Software Carpentry may redistribute your work under
+[these licenses][license].
+
+## Getting Started
+
+1.  We use GitHub flow to manage changes,
+    which is explained in the chapter [Contributing to a Project][pro-git-chapter]
+    in Scott Chacon's book *Pro Git*.
+
+2.  For our lessons,
+    you should branch from and submit pull requests against the `gh-pages` branch.
+
+3.  When editing lesson pages, you need only commit changes to the Markdown source files.
+
+4.  If you're looking for things to work on,
+    please see [the list of issues for this repository][lesson-template-issues],
+    or for [our other lessons][swc-lessons].
+    Comments on issues and reviews of pull requests are equally welcome.
+
+## Other Resources
+
+1.  This lesson is based on the template found at
+    [https://github.com/swcarpentry/lesson-template](https://github.com/swcarpentry/lesson-template).
+    That repository has instructions on formatting and previewing lessons.
+
+2.  For a list of helpful commands run `make` in this directory.
+
+3.  The [list of maintainers][swc-maintainers]
+    on the [Software Carpentry website][swc-website]
+    lists the people currently responsible for managing this repository.
+    Feel free to contact them if you have any questions or languishing pull requests.
+
+[lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues
+[license]: LICENSE.md
+[pro-git-chapter]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
+[swc-lessons]: http://software-carpentry.org/lessons.html
+[swc-maintainers]: http://software-carpentry.org/lessons.html#maintainers
+[swc-website]: http://software-carpentry.org

Makefile

@@ -4,7 +4,7 @@ DST_RMD = $(patsubst %.Rmd,%.md,$(SRC_RMD))
 
 # All Markdown files (hand-written and generated).
 ALL_MD = $(wildcard *.md) $(DST_RMD)
-EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md
+EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md CONTRIBUTING.md
 SRC_MD = $(filter-out $(EXCLUDE_MD),$(ALL_MD))
 DST_HTML = $(patsubst %.md,%.html,$(SRC_MD))
 

tools/setup-labels

@@ -30,9 +30,9 @@ fi
 OWNER=$1
 REPO=$2
 GITHUB_URL=https://github.com/${OWNER}/${REPO}
-LABELS=(bug defer discussion duplicate enhancement filed-by-newcomer getting-started help-wanted left-as-was suitable-for-newcomer work-in-progress)
-COLORS=(FF0000 66FF00 0000FF 98FB98 E0115F FFFF00 808000 89CFF0 568203 FCE883 545AA7)
-LABELS_TO_DELETE=(help%20wanted invalid question wontfix)
+LABELS=(bug    build  defer  discussion documentation enhancement newcomer-friendly upstream work-in-progress)
+COLORS=(FF0000 551033 66FF00 0000FF     D4318C        E0115F      FCE883            83F52C   545AA7)
+LABELS_TO_DELETE=(duplicate filed-by-newcomer getting-started help%20wanted help-wanted invalid left-as-was suitable-for-newcomer question wontfix)
 
 # Test if repository exists
 curl -s --head ${GITHUB_URL} | head -n 1 | grep -q "HTTP/1.[01] [23].."