Permalink
Browse files

Updated readme.

  • Loading branch information...
1 parent 22c1887 commit 3e514fbc413272ad153acef23012f00679bbadda @Networc committed Apr 2, 2012
Showing with 13 additions and 42 deletions.
  1. 0 license.txt → LICENSE.txt
  2. +13 −0 README.md
  3. +0 −42 README.txt
File renamed without changes.
View
@@ -0,0 +1,13 @@
+##[andrewcreed.com](http://andrewcreed.com)
+
+This repository contains the source code and content for my personal website and blog at [andrewcreed.com](http://andrewcreed.com).
+
+All "original content" is Copyright Andrew C. Reed. This includes, but is not necessarily limited to:
+ * all of my blog posts (which are located in "_posts/")
+ * images, pictures, and diagrams (which are located in "images/")
+ * exclusions include any images that are in the public domain (e.g. RSS icon)
+ * any other original ideas which are displayed on my webpages when viewed in a web browser
+
+All other directories and files are MIT licensed. This includes the code used to generate my webpages.
+
+As an example, the content of a blog post would be Copyright Andrew C. Reed; however, any custom YAML variables (and associated code) would be MIT licensed.
View
@@ -1,42 +0,0 @@
-# Jekyll-Bootstrap
-
-The quickest way to start and publish your Jekyll powered blog. 100% compatible with GitHub pages
-
-## Usage
-
-For all usage and documentation please see: <http://jekyllbootstrap.com>
-
-## Version
-
-0.2.9 - stable and versioned using [semantic versioning](http://semver.org/).
-
-## Contributing
-
-This repository tracks 2 projects:
-
-- **Jekyll-Bootstrap Framework.**
- The framework for which users should clone and build their blog on top of is available in the master branch.
-
- To contribute to the framework please make sure to checkout your branch based on `jb-development`!!
- This is very important as it allows me to accept your pull request without having to publish a public version release.
-
- Small, atomic Features, bugs, etc.
- Use the `jb-development` branch but note it will likely change fast as pull requests are accepted.
- Please rebase as often as possible when working.
- Work on small, atomic features/bugs to avoid upstream commits affecting/breaking your development work.
-
- For Big Features or major API extensions/edits:
- This is the one case where I'll accept pull-requests based off the master branch.
- This allows you to work in isolation but it means I'll have to manually merge your work into the next public release.
- Translation : it might take a bit longer so please be patient! (but sincerely thank you).
-
-- **Jekyll-Bootstrap Documentation Website.**
- The documentation website at <http://jekyllbootstrap.com> is maintained in the gh-pages branch.
- Please fork and contribute documentation additions to this branch only.
-
-The master and gh-pages branch do not share the same ancestry. Please treat them as completely separate git repositories!
-
-
-## License
-
-[Creative Commons](http://creativecommons.org/licenses/by-nc-sa/3.0/)

0 comments on commit 3e514fb

Please sign in to comment.