Skip to content

Commit

Permalink
readme/license/tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
dpb587 committed Jan 6, 2013
1 parent 296aa03 commit 67540f1
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 6 deletions.
33 changes: 33 additions & 0 deletions LICENSE
@@ -0,0 +1,33 @@
Unless noted otherwise...

Software code included in this repository is under:

MIT License
http://opensource.org/licenses/mit-license.php

Copyright (c) 2013 Danny Berger <dpb587@gmail.com>

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.

And all other content is under:

Creative Commons Attribute Unported License
http://creativecommons.org/licenses/by/3.0/

Danny Berger <dpb587@gmail.com>
http://dpb587.me
8 changes: 8 additions & 0 deletions README
@@ -0,0 +1,8 @@
This is my personal website.

Unless noted, software code is licensed under MIT License and all other content under CC-BY.

Visit the following for more information:

* http://dpb587.me/
* https://github.com/dpb587/dpb587.github.com/blob/master/LICENSE
2 changes: 1 addition & 1 deletion _includes/footer.html
Expand Up @@ -2,7 +2,7 @@
<footer>
Thanks for visiting! This is a personal blog &ndash; it reflects my own opinions and not those of my employers, past or present.<br />
This site is <a href="https://github.com/dpb587/dpb587.github.com">open-source</a>.
Unless noted, code samples are licensed under <a href="http://opensource.org/licenses/mit-license.php">MIT License</a> and all other content under <a href="http://creativecommons.org/licenses/by/3.0/">CC-BY</a>.
Unless noted, software code is licensed under <a href="http://opensource.org/licenses/mit-license.php">MIT License</a> and all other content under <a href="http://creativecommons.org/licenses/by/3.0/">CC-BY</a>.
</header>
</body>
</html>
2 changes: 1 addition & 1 deletion blog/_posts/2013-01-07-secure-git-repositories.md
Expand Up @@ -74,7 +74,7 @@ $ git reset --hard HEAD

### Summary

With `gitcrypt` I can work with my repository and enjoy extra security on top of the redundancy and version control that
With `gitcrypt` I can work with a repository and enjoy extra security on top of the redundancy and version control that
`git` provides. The only difference from my regular repos is I can't really view my files from [github.com][1] (with the
convenient exception of the README).

Expand Down
8 changes: 4 additions & 4 deletions blog/atom.xml
Expand Up @@ -5,9 +5,9 @@ layout: nil
<feed xmlns="http://www.w3.org/2005/Atom">
<id>http://dpb587.me/</id>
<title>Danny Berger</title>
<link href="http://dpb587.me/atom.xml" rel="self"/>
<link href="http://dpb587.me/blog/atom.xml" rel="self"/>
<link href="http://dpb587.me/"/>
<updated>{{ site.time | date_to_xmlschema }}</updated>
<updated>{{ site.time|date_to_xmlschema }}</updated>
<author>
<name>Danny Berger</name>
<email>dpb587@gmail.com</email>
Expand All @@ -17,8 +17,8 @@ layout: nil
<id>http://dpb587.me{{ post.id }}</id>
<title>{{ post.title }}</title>
<link href="http://dpb587.me{{ post.url }}"/>
<updated>{{ post.date | date_to_xmlschema }}</updated>
<content type="html">{{ post.content | xml_escape }}</content>
<updated>{{ post.date|date_to_xmlschema }}</updated>
<content type="html">{{ post.content|xml_escape }}</content>
</entry>
{% endfor %}
</feed>

0 comments on commit 67540f1

Please sign in to comment.