From 46e6c358940e6a8475c00b6b42659100abcf6aa8 Mon Sep 17 00:00:00 2001 From: Sarah Clayton Date: Fri, 23 Dec 2016 10:50:08 +0000 Subject: [PATCH 1/4] Changing Language under General Information Related with #367. As we are getting more participants from the social sciences and humanities, we have gotten some feedback that the first paragraph under General Information is a bit exclusive. We have tweaked the language to make it more inclusive. --- index.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 1544d12..fee6383 100644 --- a/index.html +++ b/index.html @@ -61,14 +61,14 @@

General Information

the pitch. -->

- Software Carpentry's mission - is to help scientists and engineers get more research done in less - time and with less pain by teaching them basic lab skills for - scientific computing. This hands-on workshop will cover basic - concepts and tools, including program design, version control, data - management, and task automation. Participants will be encouraged to - help one another and to apply what they have learned to their own - research problems. + Software Carpentry + teaches researchers the basics of writing and maintaining code + to help them get more done in less time with less pain. + This hands-on workshop will cover basic concepts and tools, + including program design, version control, data management, + and task automation. + Participants will be encouraged to help one another + and to apply what they have learned to their own research problems.

From 4add06cdc522313108683506e4c843f3959923d1 Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Fri, 23 Dec 2016 10:59:44 +0000 Subject: [PATCH 2/4] We teach more than writing and maintaining code This addresses @lexnederbragt comment on @sclayton29 suggestion to change language. --- index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index fee6383..e39b25e 100644 --- a/index.html +++ b/index.html @@ -62,8 +62,9 @@

General Information

-->

Software Carpentry - teaches researchers the basics of writing and maintaining code - to help them get more done in less time with less pain. + teaches researchers how to get their work done + in less time and with less pain + by using basic research computing skills. This hands-on workshop will cover basic concepts and tools, including program design, version control, data management, and task automation. From 7af3151095e2165f3d5c0abefba2dff07e3f4ce0 Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Fri, 23 Dec 2016 11:00:55 +0000 Subject: [PATCH 3/4] Replace scientists with researchers in index.html --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index e39b25e..9e3485c 100644 --- a/index.html +++ b/index.html @@ -588,8 +588,8 @@

Python

Python is a popular language for - scientific computing, and great for general-purpose programming as - well. Installing all of its scientific packages individually can be + research computing, and great for general-purpose programming as + well. Installing all of its research packages individually can be a bit difficult, so we recommend Anaconda, an all-in-one installer. From 6a5464ec0bb75f5fc83b735e36e8f7952f72a95e Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Tue, 3 Jan 2017 14:14:17 +0000 Subject: [PATCH 4/4] Change language as suggested by @lexnederbragt on #371 --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 9e3485c..0d4ae0d 100644 --- a/index.html +++ b/index.html @@ -62,9 +62,9 @@

General Information

-->

Software Carpentry - teaches researchers how to get their work done + aims to help researchers get their work done in less time and with less pain - by using basic research computing skills. + by teaching them basic research computing skills. This hands-on workshop will cover basic concepts and tools, including program design, version control, data management, and task automation.