Merge branch 'edge' of github.com:imathis/octopress into edge

This commit is contained in:
Brandon Mathis 2011-07-11 11:57:20 -04:00
commit 866c7d8b62
2 changed files with 2 additions and 2 deletions

View File

@ -12,5 +12,5 @@
</form> </form>
<ul role="main-nav"> <ul role="main-nav">
<li><a href="/">Blog</a></li> <li><a href="/">Blog</a></li>
<li><a href="/archives.html">Archives</a></li> <li><a href="/blog/archives.html">Archives</a></li>
</ul> </ul>

View File

@ -13,7 +13,7 @@ blog_index: true
{% if paginator.next_page %} {% if paginator.next_page %}
<a href="/page{{paginator.next_page}}/">&larr; Older</a> <a href="/page{{paginator.next_page}}/">&larr; Older</a>
{% endif %} {% endif %}
<a href="/archive.html">Blog Archive</a> <a href="/blog/archives.html">Blog Archive</a>
{% if paginator.previous_page %} {% if paginator.previous_page %}
<a href="/page{{paginator.previous_page}}/">Newer &rarr;</a> <a href="/page{{paginator.previous_page}}/">Newer &rarr;</a>
{% endif %} {% endif %}