From: Peter Amstutz Date: Tue, 26 Apr 2022 18:27:09 +0000 (-0400) Subject: Remove text stating this was produced by Software Carpentries X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/commitdiff_plain/98b2dc0b51684f4a1b6869df288931fbbe1b1b03 Remove text stating this was produced by Software Carpentries refs #18696 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c3b9669..05efad9 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -3,9 +3,9 @@ layout: page title: "Contributor Code of Conduct" --- As contributors and maintainers of this project, -we pledge to follow the [Carpentry Code of Conduct][coc]. +we pledge to follow the [Arvados Code of Conduct][coc]. Instances of abusive, harassing, or otherwise unacceptable behavior -may be reported by following our [reporting guidelines][coc-reporting]. +may be reported by contacting [Curii Corporation][coc-reporting]. {% include links.md %} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f5158b0..93c903e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,19 @@ +--- +layout: page +title: "Contributing" +--- # Contributing -[The Carpentries][c-site] ([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]) are open source projects, +[Arvados](https://arvados.org) 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 welcome. +The source to this lesson can be found at [git.arvados.org/rnaseq-cwl-training.git](https://git.arvados.org/rnaseq-cwl-training.git/), it is also +mirrored at . + ## Contributor Agreement By contributing, @@ -14,7 +21,7 @@ you agree that we may redistribute your work under [our license](LICENSE.md). In exchange, we will address your issues and/or assess your change proposal as promptly as we can, and help you become a member of our community. -Everyone involved in [The Carpentries][c-site] +Everyone involved agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md). ## How to Contribute @@ -46,23 +53,7 @@ and to meet some of our community members. ## Where to Contribute 1. If you wish to change this lesson, - please work in , - which can be viewed at . - -2. If you wish to change the example lesson, - please work in , - which documents the format of our lessons - and can be viewed at . - -3. If you wish to change the template used for workshop websites, - please work in . - The home page of that repository explains how to set up workshop websites, - while the extra pages in - provide more background on our design choices. - -4. If you wish to change CSS style files, tools, - or HTML boilerplate for lessons or workshops stored in `_includes` or `_layouts`, - please work in . + please make a pull request against . ## What to Contribute @@ -72,9 +63,7 @@ to updating or filling in the documentation and submitting [bug reports][issues] about things that do not work, aren not clear, or are missing. If you are looking for ideas, please see the 'Issues' tab for -a list of issues associated with this repository, -or you may also look at the issues for [Data Carpentry][dc-issues], -[Software Carpentry][swc-issues], and [Library Carpentry][lc-issues] projects. +a list of issues associated with this repository. Comments on issues and reviews of pull requests are just as welcome: we are smarter together than we are on our own. @@ -83,27 +72,11 @@ it is easy for people who have been using these lessons for a while to forget how impenetrable some of this material can be, so fresh eyes are always welcome. -## What *Not* to Contribute - -Our lessons already contain more material than we can cover in a typical workshop, -so we are usually *not* looking for more concepts or tools to add to them. -As a rule, -if you want to introduce a new idea, -you must (a) estimate how long it will take to teach -and (b) explain what you would take out to make room for it. -The first encourages contributors to be honest about requirements; -the second, to think hard about priorities. - -We are also not looking for exercises or other material that only run on one platform. -Our workshops typically contain a mixture of Windows, macOS, and Linux users; -in order to be usable, -our lessons must run equally well on all three. ## Using GitHub If you choose to contribute via GitHub, you may want to look at [How to Contribute to an Open Source Project on GitHub][how-contribute]. -To manage changes, we follow [GitHub flow][github-flow]. Each lesson has two maintainers who review issues and pull requests or encourage others to do so. The maintainers are community volunteers and have final say over what gets merged into the lesson. To use the web interface for contributing to a lesson: diff --git a/LICENSE.md b/LICENSE.md index e6a3398..cdb7790 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,7 +5,7 @@ root: . --- ## Instructional Material -All Software Carpentry, Data Carpentry, and Library Carpentry instructional material is +All instructional material is made available under the [Creative Commons Attribution license][cc-by-human]. The following is a human-readable summary of (and not a substitute for) the [full legal text of the CC BY 4.0 @@ -24,9 +24,8 @@ license terms. Under the following terms: * **Attribution**---You must give appropriate credit (mentioning that - your work is derived from work that is Copyright © Software - Carpentry and, where practical, linking to - http://software-carpentry.org/), provide a [link to the + your work is derived from work that is Copyright © Arvados Project and, where practical, linking to + http://arvados.org/), provide a [link to the license][cc-by-human], and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. @@ -48,9 +47,8 @@ Notices: ## Software Except where otherwise noted, the example programs and other software -provided by Software Carpentry and Data Carpentry are made available under the -[OSI][osi]-approved -[MIT license][mit-license]. +provided in Arvados documentation and training are made available under the +[OSI][osi]-approved [Apache 2.0 license](https://opensource.org/licenses/Apache-2.0). Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -73,11 +71,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ## Trademark -"Software Carpentry" and "Data Carpentry" and their respective logos -are registered trademarks of [Community Initiatives][CI]. +"Arvados" is a registered trademarks of [Curii Corporation][curii]. [cc-by-human]: https://creativecommons.org/licenses/by/4.0/ [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode [mit-license]: https://opensource.org/licenses/mit-license.html [ci]: http://communityin.org/ [osi]: https://opensource.org +[curii]: https://curii.com diff --git a/Makefile b/Makefile index 60bd888..09d2d34 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,8 @@ MARKDOWN_SRC = \ $(sort $(wildcard _episodes/*.md)) \ reference.md \ $(sort $(wildcard _extras/*.md)) \ - LICENSE.md + LICENSE.md \ + CONTRIBUTING.md # Generated lesson files in the order they appear in the navigation menu. HTML_DST = \ diff --git a/_config.yml b/_config.yml index 9fc41fc..d57ec7c 100644 --- a/_config.yml +++ b/_config.yml @@ -16,7 +16,7 @@ title: "Getting started with CWL" # Life cycle stage of the lesson # See this page for more details: https://cdh.carpentries.org/the-lesson-life-cycle.html # Possible values: "pre-alpha", "alpha", "beta", "stable" -life_cycle: "beta" +life_cycle: "stable" #------------------------------------------------------------ # Generic settings (should not need to change). diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index b0eb299..0498eed 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -7,40 +7,13 @@