projects / blog / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 85ce3b4)
Merge branch 'master' into gh-pages
authorMark Otto <markdotto@gmail.com>
Thu, 25 Sep 2014 17:45:46 +0000 (10:45 -0700)
committerMark Otto <markdotto@gmail.com>
Thu, 25 Sep 2014 17:45:46 +0000 (10:45 -0700)
Conflicts:
_includes/head.html

_config.yml patch | blob | history
_includes/head.html patch | blob | history
_layouts/default.html patch | blob | history
about.md patch | blob | history
atom.xml patch | blob | history
index.html patch | blob | history

diff --git a/_config.yml b/_config.yml
index 463c92d9c7693b40a9b095da7fd7d8c162a438bb..8bd7786eb5dbb986f769ff8cb74c7517cf22a6df 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,6 @@
 # Dependencies
 markdown:         redcarpet
-pygments:         true
+highlighter:      pygments
 
 # Permalinks
 permalink:        pretty
diff --git a/_includes/head.html b/_includes/head.html
index a63329a547ab689b68106d97267badb3efa60571..fc3ffb63148bfffb8d6951efb7071e15e2da24cb 100644 (file)
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,6 +1,6 @@
 <head>
+  <meta charset="UTF-8">
   <link href="http://gmpg.org/xfn/11" rel="profile">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
   <!-- Enable responsiveness on mobile devices-->
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
@@ -22,7 +22,7 @@
   <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
 
   <!-- RSS -->
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
+  <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ site.baseurl }}atom.xml">
 
   <!-- Google Analytics -->
   <script>
diff --git a/_layouts/default.html b/_layouts/default.html
index 61620f22a4a05083c5730b33ddf7846ed8bd3c8e..87ee3eb730a66b6a33adae77ef270bf5159b4ff6 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<html lang="en">
 
   {% include head.html %}
 
diff --git a/about.md b/about.md
index 9165fa96cee716727ff819292d7d3993c90771c4..7f90d43bf60c0ecf1aeab0b6d48e6bc49ed11e3a 100644 (file)
--- a/about.md
+++ b/about.md
@@ -25,6 +25,6 @@ Some fun facts about the setup of this project include:
 * Coded with [Sublime Text 2](http://sublimetext.com), an amazing code editor
 * Designed and developed while listening to music like [Blood Bros Trilogy](https://soundcloud.com/maddecent/sets/blood-bros-series)
 
-Have questions or suggestions? Feel free to [open an issue on GitHub](https://github.com/poole/issues/new) or [ask me on Twitter](https://twitter.com/mdo).
+Have questions or suggestions? Feel free to [open an issue on GitHub](https://github.com/poole/poole/issues/new) or [ask me on Twitter](https://twitter.com/mdo).
 
 Thanks for reading!
diff --git a/atom.xml b/atom.xml
index 2e355d85b0889a87caee4606f5f05a90f3149709..229c82d3e14512466c24fcfe3dc914c6ad7577da 100644 (file)
--- a/atom.xml
+++ b/atom.xml
@@ -1,5 +1,5 @@
 ---
-layout: nil
+layout: null
 ---
 
 <?xml version="1.0" encoding="utf-8"?>
diff --git a/index.html b/index.html
index fe093d17710c2d7f75daaeb8f211262894158587..bdd4f4d7d085cfa0b36fe6c3d6e1390a1b981601 100644 (file)
--- a/index.html
+++ b/index.html
@@ -34,4 +34,4 @@ title: Home
   {% else %}
     <span class="pagination-item newer">Newer</span>
   {% endif %}
-</div>
\ No newline at end of file
+</div>
Unnamed repository; edit this file 'description' to name the repository.