Merge branch 'upstream-master'

exampleSite/config.toml

@@ -9,6 +9,7 @@ paginate = 5
 # optionally override the site's footer with custom copyright text
 # copyright = "Except where otherwise noted, content on this site is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)."
 #googleAnalytics = "UA-123-45"
+#disqusShortname = "XYW"
 
 [permalinks]
   post = "/:year/:month/:title/"

layouts/_default/baseof.html

@@ -12,8 +12,11 @@
     {{ "<!-- combined, minified CSS -->" | safeHTML }}
     <link href="{{ .Site.BaseURL }}css/style.css" rel="stylesheet">
 
+    {{ if .RSSlink }}
     {{ "<!-- RSS 2.0 feed -->" | safeHTML }}
-    <link href="{{ .Site.RSSLink }}" type="application/rss+xml" rel="alternate">
+    <link href="{{ .RSSlink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+    <link href="{{ .RSSlink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" />
+    {{ end }}
 
     {{ template "_internal/google_analytics_async.html" . }}
   </head>

package.json

@@ -18,7 +18,7 @@
   "devDependencies": {
     "bootstrap": "~4.0.0-alpha.5",
     "cssnano-cli": "^1.0.5",
-    "font-awesome": "^4.6.3",
+    "font-awesome": "^4.7.0",
     "node-sass": "latest"
   }
 }