Permalink
Browse files

updates from master

  • Loading branch information...
2 parents 8155007 + 29eaa2f commit ae0858d7de257b1093f0e439152a69a2925f3968 @lmullen committed Oct 26, 2012
Showing with 25 additions and 25 deletions.
  1. +19 −14 README.markdown
  2. +1 −1 _config.yml
  3. +5 −10 _source/_includes/license.html
View
@@ -1,11 +1,9 @@
-This is the source code for the website of the [*Journal of Southern
-Religion*](http://jsr.fsu.edu), a peer-reviewed, open-access scholarly
-journal devoted to the study of religion in the American South.
+This is the source code for the [website][] of the *Journal of Southern
+Religion*, a peer-reviewed, open-access scholarly journal devoted to the
+study of religion in the American South.
-This site is generated by [Jekyll](http://jekyllrb.com). It includes
-other libraries, notably
-[Bootstrap](http://twitter.github.com/bootstrap/), [MediaElement.js](http://mediaelementjs.com/), and
-[Footnotify](http://openideas.ideon.co/2011/footnotify-0-6-5-released).
+This site is generated by [Jekyll][]. It includes other libraries,
+notably [Bootstrap][], [MediaElement.js][], and [Footnotify][].
## Branches
@@ -22,16 +20,23 @@ files outside of the `issues/`, `_posts/`, and other content
directories. See the file `LICENSE-code.txt` for the full license.
The content for this site is copyrighted by the Journal of Southern
-Religion, and (for now) all rights are reserved. The content files
-include but are not limited to those in the `issues/`, `_posts`, and
-`assets/podcast/` directories. In the future this content may be
-released under an open-access license.
+Religion, and licensed [CC-BY][]. The content files include but are not
+limited to those in the `issues/`, `_posts`, and `assets/podcast/`
+directories.
The site includes other libraries, which are available under their
respective licenses.
## Contact
-Lincoln Mullen
-Web Editor, *Journal of Southern Religion*
-[lincoln+jsr@lincolnmullen.com](mailto:lincoln+jsr@lincolnmullen.com)
+Lincoln Mullen\
+Web Editor, *Journal of Southern Religion*\
+[lincoln+jsr@lincolnmullen.com][]
+
+ [website]: http://jsr.fsu.edu
+ [Jekyll]: http://jekyllrb.com
+ [Bootstrap]: http://twitter.github.com/bootstrap/
+ [MediaElement.js]: http://mediaelementjs.com/
+ [Footnotify]: http://openideas.ideon.co/2011/footnotify-0-6-5-released
+ [CC-BY]: http://creativecommons.org/licenses/by/3.0/deed.en_US
+ [lincoln+jsr@lincolnmullen.com]: mailto:lincoln+jsr@lincolnmullen.com
View
@@ -25,6 +25,6 @@ exclude: _working/, Rakefile, _bootstrap/, _backups/
markdown: maruku
auto: false
server: false
-server_port: 4000
+server_port: 5000
permalink: /:categories/:title.html
# baseurl and url are passed as command line options
@@ -1,12 +1,7 @@
<p id="license">
-This work is licensed under a <a rel="license"
- href="http://creativecommons.org/licenses/by/3.0/deed.en_US">Creative
- Commons Attribution 3.0 Unported License</a>. You are encouraged to
-make free use of this publication. Please see our <a
- href="http://jsr.fsu.edu/about/policies-and-submissions.html">open-access
- policies</a>.<br/>
-<a rel="license"
- href="http://creativecommons.org/licenses/by/3.0/deed.en_US"><img
- alt="Creative Commons License" style="border-width:0"
- src="http://i.creativecommons.org/l/by/3.0/80x15.png" /></a>
+This work is licensed <a rel="license" href="http://creativecommons.org/licenses/by/3.0/deed.en_US">CC-BY</a>. You are encouraged to
+make <a href="http://jsr.fsu.edu/about/policies-and-submissions.html">free use of this publication</a>.<br/>
+<a rel="license" href="http://creativecommons.org/licenses/by/3.0/deed.en_US">
+ <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by/3.0/80x15.png" />
+</a>
</p>

0 comments on commit ae0858d

Please sign in to comment.