Преглед на файлове

Merge branch 'master' into gh-pages

Conflicts:
	_includes/head.html
Mark Otto преди 10 години
родител
ревизия
e8b6a60776
променени са 6 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 1 1
      _config.yml
  2. 2 2
      _includes/head.html
  3. 1 1
      _layouts/default.html
  4. 1 1
      about.md
  5. 1 1
      atom.xml
  6. 1 1
      index.html

+ 1 - 1
_config.yml

@@ -1,6 +1,6 @@
 # Dependencies
 markdown:         redcarpet
-pygments:         true
+highlighter:      pygments
 
 # Permalinks
 permalink:        pretty

+ 2 - 2
_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>

+ 1 - 1
_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 %}
 

+ 1 - 1
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!

+ 1 - 1
atom.xml

@@ -1,5 +1,5 @@
 ---
-layout: nil
+layout: null
 ---
 
 <?xml version="1.0" encoding="utf-8"?>

+ 1 - 1
index.html

@@ -34,4 +34,4 @@ title: Home
   {% else %}
     <span class="pagination-item newer">Newer</span>
   {% endif %}
-</div>
+</div>