fixing schema.org tags
diff --git a/src/main/org/freemarker/docgen/templates/footer.ftl b/src/main/org/freemarker/docgen/templates/footer.ftl
index 49f8347..8115617 100644
--- a/src/main/org/freemarker/docgen/templates/footer.ftl
+++ b/src/main/org/freemarker/docgen/templates/footer.ftl
@@ -61,7 +61,7 @@
<p class="copyright">
© <span itemprop="copyrightYear">${copyrightStartYear?string('0')}</span><#rt>
<#lt><#if transformStartTime?string('yyyy')?number != copyrightStartYear>–${transformStartTime?string('yyyy')}</#if>
- <a itemtype="http://schema.org/Person" itemprop="copyrightHolder" href="http://freemarker.org">${copyrightHolder}</a>. All rights reserved.<#t>
+ <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">${copyrightHolder}</a>. All rights reserved.<#t>
</p>
</#macro>
@@ -85,11 +85,16 @@
<ul><#t>
<#local links = columns[columnTitle]>
<#list links?keys as linkTitle>
+ <#if linkTitle == "License">
+ <li><a itemprop="license" href="${links[linkTitle]}">${linkTitle}</a></li><#t>
+ <#else>
<li><a href="${links[linkTitle]}">${linkTitle}</a></li><#t>
+ </#if>
+
</#list>
</ul><#t>
</div><#t>
</#list>
</#macro>
-</#escape>
\ No newline at end of file
+</#escape>
diff --git a/src/main/org/freemarker/docgen/templates/header.ftl b/src/main/org/freemarker/docgen/templates/header.ftl
index 315958c..79d84ed 100644
--- a/src/main/org/freemarker/docgen/templates/header.ftl
+++ b/src/main/org/freemarker/docgen/templates/header.ftl
@@ -11,7 +11,7 @@
<div class="site-width header-top"><#t>
<#if logo??>
<a class="logo" href="${logo.href}" role="banner"><#t>
- <img src="${logo.src}" alt="${logo.alt}">
+ <img itemprop="image" src="${logo.src}" alt="${logo.alt}">
</a><#t>
</#if>
<@nav.tabs /><#t>
@@ -80,4 +80,4 @@
</ul><#t>
</#macro>
-</#escape>
\ No newline at end of file
+</#escape>
diff --git a/src/main/org/freemarker/docgen/templates/node-handlers.ftl b/src/main/org/freemarker/docgen/templates/node-handlers.ftl
index ef45d49..14a1f51 100644
--- a/src/main/org/freemarker/docgen/templates/node-handlers.ftl
+++ b/src/main/org/freemarker/docgen/templates/node-handlers.ftl
@@ -590,7 +590,7 @@
<#local classAtt = "">
<${htmlHElem} class="content-header header-${hierarElem.@docgen_rank}" <#if !disableAnchors && hierarElem.@id[0]??>id="${hierarElem.@id[0]}"</#if><#t>
- <#if htmlHLevel == 1> itemprop="name"</#if>><#t>
+ <#if htmlHLevel == 1> itemprop="headline"</#if>><#t>
<#recurse><#t>
<#local subtitleElem = u.getOptionalSubtitleElement(hierarElem)>
<#if subtitleElem?hasContent>
@@ -743,4 +743,4 @@
</#macro>
<#macro anyNonVisual><#recurse></#macro>
-<#assign info=anyNonVisual titleabbrev=anyNonVisual productname=anyNonVisual productnumber=anyNonVisual>
\ No newline at end of file
+<#assign info=anyNonVisual titleabbrev=anyNonVisual productname=anyNonVisual productnumber=anyNonVisual>
diff --git a/src/main/org/freemarker/docgen/templates/page.ftl b/src/main/org/freemarker/docgen/templates/page.ftl
index 435b7d8..e2e41cf 100644
--- a/src/main/org/freemarker/docgen/templates/page.ftl
+++ b/src/main/org/freemarker/docgen/templates/page.ftl
@@ -1,6 +1,5 @@
<#ftl nsPrefixes={"D":"http://docbook.org/ns/docbook"} stripText = true>
<#escape x as x?html>
-
<#import "util.ftl" as u>
<#import "footer.ftl" as footer>
<#import "header.ftl" as header>
@@ -9,12 +8,12 @@
<#import "node-handlers.ftl" as defaultNodeHandlers>
<#import "customizations.ftl" as customizations>
<#assign nodeHandlers = [customizations, defaultNodeHandlers]>
-
<@page>
<#assign titleElement = u.getRequiredTitleElement(.node)>
<@head />
- <body itemscope itemtype="http://schema.org/Article"><#lt>
+ <body itemscope itemtype="https://schema.org/Code"><#lt>
+ <meta itemprop="version" content="${.version}">
<@browserWarning />
<@header.header />
<div class="main-content site-width">
@@ -36,7 +35,6 @@
<#compress>
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
- <meta name="google-site-verification" content="UfgFHMBMYV7snPYKXIFyFDRwRMszylM3Z9J2WFKvxDU">
<title>${fullTitle}</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -46,7 +44,7 @@
<meta property="og:site_name" content="${siteTitle}">
<meta property="og:title" content="${sectionTitle}">
<#if seoMetaDescription??>
- <meta name="Description" content="${seoMetaDescription}">
+ <meta name="description" content="${seoMetaDescription}">
<meta name="og:description" content="${seoMetaDescription}">
</#if>
<meta property="og:locale" content="${.locale}">
@@ -59,6 +57,7 @@
<#if !offline && onlineTrackerHTML??>
<#noEscape>${onlineTrackerHTML}</#noEscape>
</#if>
+ <meta name="google-site-verification" content="UfgFHMBMYV7snPYKXIFyFDRwRMszylM3Z9J2WFKvxDU">
</head>
</#compress>
</#macro>
