diff --git a/01-one.html b/01-one.html index 7cd2b84cbfdaae39ca4196bebb50061148a00877..7622e5587679ac45776b19f29953430b151e5836 100644 --- a/01-one.html +++ b/01-one.html @@ -7,6 +7,7 @@ + @@ -16,7 +17,7 @@
-
@@ -26,13 +27,17 @@
Paragraphs of text --- possibly including key word 1 --- mixed with:
some code:
to be displayed
@@ -41,17 +46,25 @@ from
program
error reports from program (if any)
and possibly including:
-An aside of some kind.
or an image from the figs directory:
this is the image's title
Description of a single challenge. There may be several challenges.
+
@@ -26,13 +27,17 @@
Paragraphs of text --- possibly including key word 2 --- mixed with:
some code:
to be displayed
@@ -41,13 +46,21 @@ from
program
error reports from program (if any)
and possibly including:
-An aside of some kind.
Description of a single challenge. There may be several challenges that make reference to Challenge Title.
+
@@ -26,7 +27,7 @@
All Software Carpentry instructional material is made available under the Creative Commons Attribution license. The following is a human-readable summary of (and not a substitute for) the full legal text of the CC BY 4.0 license.
You are free:
Except where otherwise noted, the example programs and other software provided by Software Carpentry are made available under the OSI-approved MIT license.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Our code of conduct is taken from this site, and is made available under the same MIT License as our software.
-"Software Carpentry" and the Software Carpentry logo are registered trademarks of Software Carpentry, Ltd.
+"Software Carpentry" and the Software Carpentry logo are registered trademarks of NumFOCUS.
diff --git a/index.html b/index.html
index eb078dce31598b7444e38a560a890b93449a7df4..9494c01cb4d068717e81650a3abb3896a3b6233c 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,7 @@
+
@@ -16,7 +17,7 @@
-
@@ -27,10 +28,14 @@
Paragraph of introductory material.
-A short paragraph describing what learners need to know before tackling this lesson.