diff options
author | Brandon Mathis <brandon@imathis.com> | 2011-07-16 15:21:09 -0400 |
---|---|---|
committer | Brandon Mathis <brandon@imathis.com> | 2011-07-16 15:21:09 -0400 |
commit | ccda3a565655d057530cf6a75cbbbfb430f52e79 (patch) | |
tree | e663ee8410c5d4c3dc2011a72d98e472747d3f8c | |
parent | 7c715829909dc33091a1daad9b6a3388d1550986 (diff) | |
download | my_new_personal_website-ccda3a565655d057530cf6a75cbbbfb430f52e79.tar.xz my_new_personal_website-ccda3a565655d057530cf6a75cbbbfb430f52e79.zip |
Minor update to navigation, Updated Copyright, added beginning upgrade
instructions.
-rw-r--r-- | .themes/classic/source/_includes/navigation.html | 2 | ||||
-rw-r--r-- | README.markdown | 8 | ||||
-rw-r--r-- | upgrading.markdown | 26 |
3 files changed, 6 insertions, 30 deletions
diff --git a/.themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html index 81571389..4518fcd8 100644 --- a/.themes/classic/source/_includes/navigation.html +++ b/.themes/classic/source/_includes/navigation.html @@ -10,7 +10,7 @@ <input class="search" type="text" name="q" results="0" placeholder="Search"/> </fieldset> </form> -<ul role="main-nav"> +<ul role="navigation"> <li><a href="{{ site.root }}/">Blog</a></li> <li><a href="{{ site.root }}/blog/archives">Archives</a></li> </ul> diff --git a/README.markdown b/README.markdown index 4e09b3e3..c4d5aeb0 100644 --- a/README.markdown +++ b/README.markdown @@ -122,7 +122,7 @@ Github will queue your site for publishing (which usually occurs instantly or wi ### Deploying to a Subdirectory (Github Project Pages does this) If you're deploying to a subdirectory on your site, or if you're using Github's project pages, make sure you set up your urls correctly in your configs. -You can do this automatically: +You can do this *almost* automatically: rake set_root_dir[your/path] @@ -131,10 +131,10 @@ You can do this automatically: Then update your `_config.yml` and `Rakefile` as follows: - # Change the url in _config.yml + # _config.yml url: http://yoursite.com/your/path - # If deploying with rsync, update your Rakefile path + # Rakefile (if deploying with rsync) document_root = "~/yoursite.com/your/path" To manually configure deployment to a subdirectory, you'll change `_config.yml`, `config.rb` and `Rakefile` @@ -162,7 +162,7 @@ To manually configure deployment to a subdirectory, you'll change `_config.yml`, ## License (The MIT License) -Copyright © 2009 Brandon Mathis +Copyright © 2009-2011 Brandon Mathis 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: diff --git a/upgrading.markdown b/upgrading.markdown index 3d2fcce8..a13f7ec0 100644 --- a/upgrading.markdown +++ b/upgrading.markdown @@ -11,26 +11,6 @@ for a year and a half, I can see that it's far better for Octopress to be able t Some new features make the transition worth it. You can write your own [plugins](https://github.com/mojombo/jekyll/wiki/Plugins) which consist of generators, converters, and liquid tags. Now it's much easier to hack Jekyll without forking. I expect to see some great plugins emerge from the Jekyll community, and I'll be adding my favorites into Octopress. - -## More Than a Starting Point - -I initially saw Octopress as the fastest way to get started with a fairly nice Jekyll blog, but now that Jekyll is so hackable, I'm hoping that Octopress will also become a great introduction to hacking Jekyll and a place to find great plugins from the community. - -I've already been combing through plugins that other people are writing and I've found some gems. Octopress now has: - -- **Sitemap generator** - suitable xml for submitting to search engines -- **Haml converter** - currently pages and posts can be converted, but not layouts -- **Liquid tag Github gists** - embeds gists in a noscript tag for RSS readers and crawlers, then uses Github's javascript to display gists to site visitors - -Octopress also has custom filters which work through Liquid's filtering system. I've added these for now: - -- **Smart quotes** for posts and pages -- **Title case** an adaptation of John Gruber's intelligent title capitalization script -- **Absolute urls** using '/' as a url opener for relative paths gets converted to an absolute url for RSS readers -- **Ordinal dates** dates are output like "October 5th" or "July 3rd" - -Of course Octopress still supports simple setup for Twitter, Disqus Comments, Google Custom Search, Google Analytics, Delicious Bookmarks, and now Pinboard Bookmarks. - ## Upgrading Unfortunately upgrading isn't as smooth as I would like. Some things have changed that require a bit of fiddling on your part. It's less than ideal, but if you were adverse to fiddling, you'd be using Wordpress right? @@ -44,8 +24,4 @@ If you want to keep the time-stamp data, you can now add dates to the post in th I've updated the new post rake task `rake post[title for your new post]` to correctly name new posts, and to automatically insert the time-stamp into the yaml front-matter for a new post. This way you can set the time when you want to publish without having to write out the whole post date. - - -Here are some steps you can take to get your blog running again on this update: - -1. +TODO: add more steps for upgrading |