diff --git a/01-one.html b/01-one.html index 7cd2b84cbfdaae39ca4196bebb50061148a00877..710b0184d31bda1caae2f05eb28c3a12a90a061c 100644 --- a/01-one.html +++ b/01-one.html @@ -7,6 +7,7 @@ + @@ -26,13 +27,17 @@

Lesson Title

Topic Title One

-
-

Learning Objectives

+
+
+

Learning Objectives

+
+
  • Learning objective 1
  • Learning objective 2
+

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:

-
-

Callout Box

+
+
+

Callout Box

+
+

An aside of some kind.

+

or an image from the figs directory:

this is the image's title

this is the image's title

-
-

Challenge Title

+
+
+

Challenge Title

+
+

Description of a single challenge. There may be several challenges.

+
diff --git a/02-two.html b/02-two.html index 03052d2c6b9bb2c532caa3fafee2b85f56da6ef1..51ddf55ba9a3677d417ce6328eda4e8fd2684adb 100644 --- a/02-two.html +++ b/02-two.html @@ -7,6 +7,7 @@ + @@ -26,13 +27,17 @@

Lesson Title

Topic Title Two

-
-

Learning Objectives

+
+
+

Learning Objectives

+
+
  • Learning objective 1
  • Learning objective 2
+

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:

-
-

Callout Box

+
+
+

Callout Box

+
+

An aside of some kind.

-
-

Challenge Title

+
+
+
+

Challenge Title

+
+

Description of a single challenge. There may be several challenges that make reference to Challenge Title.

+
diff --git a/LICENSE.html b/LICENSE.html index 44f920ba5b019b5214b584f18799b799f48137f5..1cc2694f4b1ead1514c12964e5689fb111a4ea49 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -7,6 +7,7 @@ + @@ -26,7 +27,7 @@

Licenses

-

Instructional Material

+

Instructional Material

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:

    @@ -45,15 +46,13 @@
  • You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
  • No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
-

Software

+

Software

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.

-

Other Material

-

Our code of conduct is taken from this site, and is made available under the same MIT License as our software.

-

Trademark

-

"Software Carpentry" and the Software Carpentry logo are registered trademarks of Software Carpentry, Ltd.

+

Trademark

+

"Software Carpentry" and the Software Carpentry logo are registered trademarks of NumFOCUS.