move about / contact to top level

2012-01-04 23:50:08 -05:00 · 2012-01-04 23:50:08 -05:00 · 1ae363f416
commit 1ae363f416
parent 66dadeaa82
4 changed files with 3 additions and 2 deletions
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -22,9 +22,9 @@
  <nav role="navigation">
    <ul class="navigation">
      <li><a href="/">Home</a></li>
-      <li><a href="/about/">About</a></li>
+      <li><a href="/about.html">About</a></li>
      <li><a href="/blog/">Blog</a></li>
-      <li><a href="/contact/">Contact</a></li>
+      <li><a href="/contact.html">Contact</a></li>
    </ul>
  </nav>
  <section id="main">
--- a/about/index.md
+++ b/about/index.md
--- a/contact/index.md
+++ b/contact/index.md
--- a/1
+++ b/1
@ -3,6 +3,7 @@ layout: nil
 permalink: .htaccess
 ---
 ErrorDocument 404 /404.html
+Options +Multiviews

 Redirect permanent /james-walker /about/