From: W. Trevor King Date: Mon, 21 Apr 2014 21:17:57 +0000 (-0700) Subject: README.md: Convert 'boot camp' -> 'workshop' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f293fcf8b91dc2fd4ac1a0348d78bdb71f67559;p=swc-boot-camp.git README.md: Convert 'boot camp' -> 'workshop' Following Amy Brown's [1]: > We borrowed the "bootcamp" terminology from Hacker Within and also > various fitness training camps, but as we branch out into parts of > the world with a more violent recent history I'm less comfortable > with the term. The consensus on that issue was to change back to our old 'workshop' terminology. The swcarpentry/bc repository hasn't made the shift yet, but there's no reason I can't embrace the future here ;). [1]: https://github.com/swcarpentry/bc/issues/240 --- diff --git a/README.md b/README.md index e7c5193..ad118cc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Students ======== This directory contains scripts for testing your machine to make sure -you have the software you'll need for your boot camp installed. See +you have the software you'll need for your workshop installed. See the comments at the head of each script for more details, but you'll basically want to see something like: @@ -54,16 +54,16 @@ they'll be able to parse `swc-installation-test-2.py`. The latter checks for a list of dependencies and prints error messages if a package is not installed, or if the installed version is not current enough. By default, the script checks for pretty much anything that -has ever been used at a Software Carpentry boot camp, which is -probably not what you want for your particular boot camp. +has ever been used at a Software Carpentry workshop, which is probably +not what you want for your particular workshop. -Before your boot camp, you should go through +Before your workshop, you should go through `swc-installation-test-2.py` and comment any dependencies you don't need out of the `CHECKS` list. You might also want to skim through the minimum version numbers listed where particular dependencies are defined (e.g. `('git', 'Git', (1, 7, 0), None)`). For the most part, fairly conservative values have been selected, so students with modern -machines should be fine. If your boot camp has stricter version +machines should be fine. If your workshop has stricter version requirements, feel free to bump them accordingly. Similarly, the virtual dependencies can be satisfied by any of several