diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..dd12a2a469 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,37 @@ +# Contributing to Learn.co Curriculum + +We're really exited that you're about to contribute to the [open curriculum](https://learn.co/content-license) on [Learn.co](https://learn.co). If this is your first time contributing, please continue reading to learn how to make the most meaningful and useful impact possible. + +## Raising an Issue to Encourage a Contribution + +If you notice a problem with the curriculum that you believe needs improvement +but you're unable to make the change yourself, you should raise a Github issue +containing a clear description of the problem. Include relevant snippets of +the content and/or screenshots if applicable. Curriculum owners regularly review +issue lists and your issue will be prioritized and addressed as appropriate. + +## Submitting a Pull Request to Suggest an Improvement + +If you see an opportunity for improvement and can make the change yourself go +ahead and use a typical git workflow to make it happen: + +* Fork this curriculum repository +* Make the change on your fork, with descriptive commits in the standard format +* Open a Pull Request against this repo + +A curriculum owner will review your change and approve or comment on it in due +course. + +# Why Contribute? + +Curriculum on Learn is publicly and freely available under Learn's +[Educational Content License](https://learn.co/content-license). By +embracing an open-source contribution model, our goal is for the curriculum +on Learn to become, in time, the best educational content the world has +ever seen. + +We need help from the community of Learners to maintain and improve the +educational content. Everything from fixing typos, to correcting +out-dated information, to improving exposition, to adding better examples, +to fixing tests—all contributions to making the curriculum more effective are +welcome. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..a297d511e1 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,23 @@ +# Learn.co Educational Content License + +Copyright (c) 2018 Flatiron School, Inc + +The Flatiron School, Inc. owns this Educational Content. However, the Flatiron +School supports the development and availability of educational materials in +the public domain. Therefore, the Flatiron School grants Users of the Flatiron +Educational Content set forth in this repository certain rights to reuse, build +upon and share such Educational Content subject to the terms of the Educational +Content License set forth [here](http://learn.co/content-license) +(http://learn.co/content-license). You must read carefully the terms and +conditions contained in the Educational Content License as such terms govern +access to and use of the Educational Content. + +Flatiron School is willing to allow you access to and use of the Educational +Content only on the condition that you accept all of the terms and conditions +contained in the Educational Content License set forth +[here](http://learn.co/content-license) (http://learn.co/content-license). By +accessing and/or using the Educational Content, you are agreeing to all of the +terms and conditions contained in the Educational Content License. If you do +not agree to any or all of the terms of the Educational Content License, you +are prohibited from accessing, reviewing or using in any way the Educational +Content. diff --git a/README.md b/README.md index 102eff9bd4..8eb9df394d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ > -- Phil Karlton -> "...But ordinary language is all right." +> "...But ordinary language is all right." > Ludwig Wittgenstein @@ -49,7 +49,7 @@ In programming terms, we say that we just declared a variable, `email`, and assi variable = data -Now that we have assigned a variable `email` to a string, we just type the word `email` to see the string again. +Now that we have assigned a variable `email` to a string, we just type the word `email` to see the string again. ```python @@ -80,7 +80,7 @@ name in () ----> 1 name - + NameError: name 'name' is not defined @@ -89,7 +89,7 @@ So that error tells us that `name` is not defined. We just fix this by declarin ```python -name = 'Art Vandalay' +name = 'Art Vandelay' name ``` @@ -157,14 +157,14 @@ Now that we have this data, we can imagine using it for some kind of instruction ```python -"Send an email to Art Vandalay at 'art.vandelay@vandelay.com' to say how nice it was meeting yesterday." +"Send an email to Art Vandelay at 'art.vandelay@vandelay.com' to say how nice it was meeting yesterday." ``` If we construct this message with variables, we can write the following: ```python -name = "Art Vandalay" +name = "Art Vandelay" email = "art.vandelay@vandelay.com" ``` @@ -252,4 +252,4 @@ name In this lesson, we got a taste for what makes computer programs so powerful. By using variables, we can write programs that know how to combine data. This can save us time by avoiding boring, repetitive tasks. We declare and assign a variable with the pattern of `variable = data`, and reassign a variable with the same pattern. To reference a variable, we simply type the variable's name. -We also saw that one of the things to pay attention to when working with variables is that they are sometimes different from what we expect. So we just type the name of the variable, to see what it really is and make any necessary changes. +We also saw that one of the things to pay attention to when working with variables is that they are sometimes different from what we expect. So we just type the name of the variable, to see what it really is and make any necessary changes. diff --git a/index.ipynb b/index.ipynb index 77264b95d0..60b5fa0199 100644 --- a/index.ipynb +++ b/index.ipynb @@ -192,7 +192,7 @@ }, "outputs": [], "source": [ - "name = 'Art Vandalay'\n", + "name = 'Art Vandelay'\n", "name" ] }, @@ -349,7 +349,7 @@ }, "outputs": [], "source": [ - "\"Send an email to Art Vandalay at 'art.vandelay@vandelay.com' to say how nice it was meeting yesterday.\"" + "\"Send an email to Art Vandelay at 'art.vandelay@vandelay.com' to say how nice it was meeting yesterday.\"" ] }, { @@ -367,7 +367,7 @@ }, "outputs": [], "source": [ - "name = \"Art Vandalay\"\n", + "name = \"Art Vandelay\"\n", "email = \"art.vandelay@vandelay.com\"" ] }, @@ -583,21 +583,21 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 2", + "display_name": "Python 3", "language": "python", - "name": "python2" + "name": "python3" }, "language_info": { "codemirror_mode": { "name": "ipython", - "version": 2 + "version": 3 }, "file_extension": ".py", "mimetype": "text/x-python", "name": "python", "nbconvert_exporter": "python", - "pygments_lexer": "ipython2", - "version": "2.7.14" + "pygments_lexer": "ipython3", + "version": "3.6.4" } }, "nbformat": 4,