Fix deprecation warnings and correct README

jkaye2012 · jkaye2012 · commit 6458a0b33c62 · 2020-12-13T11:44:17.000-07:00
- Replace .Hugo and .RSSLink with their newer counterparts
  - sidebarDescription included in the README and example, but this
    parameter is not actually used.
diff --git a/README.md b/README.md
@@ -38,18 +38,14 @@ Next, open the `config.toml` file in the base of the Hugo folder and ensure the
 
 There are various options you can easily set from your `config.toml` file.
 
-This text will appear after the Title of your site in your `<title>` meta tag:
+This text will appear after the Title of your site in your `<title>` meta tag, and after the Title in the sidebar:
 
 	description = "A Hugo Theme built with Bootstrap"
 
 
 ### Sidebar
 
-This text will appear in the sidebar immediately under your site's Title:
-
-	sidebarDescription = "A Hugo Theme built with Bootstrap"
-
-This text will appear in a free paragraph below the Title & sidebarDescription and above the menu links. Set it to "" if you don't want it.
+This text will appear in a free paragraph below the Title & Description and above the menu links. Set it to "" if you don't want it.
 
 	sidebarFreeText = "A optional paragraph of free text. Set to blank in config.toml to clear..."
 
@@ -94,7 +90,6 @@ Using a theme is as simple as changing the `colorScheme` param in your `config.t
 		colorScheme = "scheme-darkbrown"
 		DateFormat = "2 Jan 2006"
 		description = "A Hugo Theme built with Bootstrap"
-		sidebarDescription = "A Hugo Theme built with Bootstrap"
 		sidebarFreeText = "A optional paragraph of free text. Set to blank in config.toml to clear..."
 
 
@@ -150,7 +145,6 @@ Here is a full example `config.toml`:
 		colorScheme = "scheme-darkbrown"
 		DateFormat = "2 Jan 2006"
 		description = "A blog about content"
-		sidebarDescription = "This is my blog about content"
 		sidebarFreeText = "A optional paragraph of free text. Set to blank in config.toml to clear..."
 		piwikSiteID = ""
 		piwikURL = ""
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -13,7 +13,6 @@ theme = "strange-case"
 	colorScheme = "scheme-darkbrown"
 	dateformat = "Jan 2, 2006"
 	description = "A Hugo Theme built with Bootstrap"
-	sidebarDescription = "A Hugo Theme built with Bootstrap"
 	sidebarFreeText = "A optional paragraph of free text. Set to blank in config.toml to clear..."
 	piwikSiteID = ""
 	piwikURL = ""
@@ -26,4 +25,4 @@ theme = "strange-case"
 [[menu.main]]
 	name = "Bootstrap"
 	post = "<span class='glyphicon glyphicon-ok'></span>"
-	url = "http://getbootstrap.com"
+	url = "http://getbootstrap.com"
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	{{ .Hugo.Generator }}
+	{{ hugo.Generator }}
 	<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
 	<title>{{ .Title }} - {{ .Site.Params.description }}</title>
 
@@ -24,6 +24,6 @@
 	{{ "<![endif]-->" | safeHTML }}
 
 	<!-- RSS -->
-	<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+	<link href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
 </head>
-<body class="{{ .Site.Params.colorScheme }}">
+<body class="{{ .Site.Params.colorScheme }}">
