Skip to content

Commit

Permalink
updating file locations
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonJWilliamsNY committed May 21, 2016
1 parent be8cd2c commit d3555c4
Show file tree
Hide file tree
Showing 31 changed files with 9,638 additions and 1,320 deletions.
524 changes: 0 additions & 524 deletions _site/lessons/01_the_filesystem.html

This file was deleted.

795 changes: 0 additions & 795 deletions _site/lessons/02_searching_files.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ <h2>Bonus:</h2>
<a class="label swc-blue-bg" href="">Twitter</a>
<a class="label swc-blue-bg" href="">GitHub</a>
<a class="label swc-blue-bg" href="./LICENSE.html">License</a>
<a class="bugreport label swc-blue-bg" href="mailto:?subject=bug%20in%2003_searching_files.md">Bug Report</a>
<a class="bugreport label swc-blue-bg" href="mailto:?subject=bug%20in%20lessons/03_searching_files.md">Bug Report</a>
</div>

</div>
Expand Down
58 changes: 58 additions & 0 deletions _site/lessons/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
### Instructional Material

All Data Carpentry instructional material is made available under
the Creative Commons Attribution license. You are free:

* to **Share**---to copy, distribute and transmit the work
* to **Remix**---to adapt the work

Under the following conditions:

* **Attribution**---You must attribute the work using "Copyright (c)
Data Carpentry" (but not in any way that suggests that we
endorse you or your use of the work). Where practical, you must
also include a hyperlink to http://datacarpentry.org.

With the understanding that:

* **Waiver**---Any of the above conditions can be waived if you get
permission from the copyright holder.
* **Other Rights**---In no way are any of the following rights
affected by the license:
* Your fair dealing or fair use rights;
* The author's moral rights;
* Rights other persons may have either in the work itself or in
how the work is used, such as publicity or privacy rights. *
* **Notice**---For any reuse or distribution, you must make clear to
others the license terms of this work. The best way to do this is
with a link to
[http://creativecommons.org/licenses/by/3.0/](http://creativecommons.org/licenses/by/3.0/).

For the full legal text of this license, please see
[http://creativecommons.org/licenses/by/3.0/legalcode](http://creativecommons.org/licenses/by/3.0/legalcode).

### Software

Except where otherwise noted, the example programs and other software
provided by Data Carpentry are made available under the
[OSI](http://opensource.org)-approved
[MIT license](http://opensource.org/licenses/mit-license.html).

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.
32 changes: 32 additions & 0 deletions _site/lessons/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

all: pages handout-script.R

skeleton-%.R: %.Rmd
Rscript -e "knitr::purl('$<', output='$@', documentation=0L)"

%.html: %.Rmd
Rscript -e "rmarkdown::render('$<', output_format=rmarkdown::html_document(toc=TRUE, highlight='tango'))"

index.html: index.md
pandoc -o $@ $^

motivation.html: motivation.md
pandoc -o $@ $^

handout-script.R: skeleton-00-before-we-start.R skeleton-01-intro-to-R.R skeleton-02-starting-with-data.R skeleton-03-data-frames.R skeleton-04-dplyr.R
for f in $^; do cat $$f; echo "\n"; done > $@
make clean-skeleton

pages: index.html motivation.html 00-before-we-start.html 01-intro-to-R.html 02-starting-with-data.html 03-data-frames.html 04-dplyr.html 05-visualisation-ggplot2.html 06-r-and-sql.html
make clean-md

clean-skeleton:
-rm skeleton-*-*.R

clean-md:
-rm *-*.md

clean-html:
-rm *.html

clean: clean-skeleton clean-html clean-md
Loading

0 comments on commit d3555c4

Please sign in to comment.