From b1275252c5c7bd8d52abab69fa335a2b9beb7462 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sun, 29 Dec 2013 01:46:21 -0600 Subject: [PATCH] add page around licensing content --- _includes/footer.html | 2 +- about.md | 1 - content.md | 9 +++++++++ index.html | 2 +- terms-of-service.md | 1 - 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 content.md diff --git a/_includes/footer.html b/_includes/footer.html index 0cbe58b..5d30735 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,7 +5,7 @@

If you have questions or issues, it is always best to consult a legal professional.
- This site is licensed under the + The content of this site is licensed under the Creative Commons Attribution 3.0 Unported License.

diff --git a/about.md b/about.md index b8ae7e9..9549c4f 100644 --- a/about.md +++ b/about.md @@ -1,5 +1,4 @@ --- -title: About layout: default permalink: /about/ title: What’s this about? diff --git a/content.md b/content.md new file mode 100644 index 0000000..96983bb --- /dev/null +++ b/content.md @@ -0,0 +1,9 @@ +--- +title: Licensing Content +layout: default +permalink: /content/ +--- + +While the focus of this site is open source software, we recommend checking out [Creative Commons](http://creativecommons.org/choose/) for other types of projects. + +If your project contains a mix of software and content, you can include multiple licenses, as long as you are explicit about which license applies to what segments of the project. See [the license disclaimer for this site](https://github.com/github/choosealicense.com#license) as an example. diff --git a/index.html b/index.html index 355158f..99d18bc 100644 --- a/index.html +++ b/index.html @@ -58,7 +58,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
  • My content isn’t code.

    - Check out Creative Commons. + There are licenses for that.

  • diff --git a/terms-of-service.md b/terms-of-service.md index 4181269..bb211e4 100644 --- a/terms-of-service.md +++ b/terms-of-service.md @@ -2,7 +2,6 @@ title: Terms of Service layout: default permalink: /terms-of-service/ - --- ### 1. Introduction