Merge branch 'release/2.0.0-beta.2' into production

Author: craigfowler

Tools/appveyor-publish-docs-site.ps1

@@ -36,22 +36,32 @@ if ($Env:APPVEYOR_REPO_BRANCH -eq "production") {
 if($Env:APPVEYOR -eq "True") {
     Write-Host "Setting up git to publish site"
     git config --global user.name "AppVeyor (on behalf of Craig Fowler)"
-    git config --global  user.email "craig+appveyor@csf-dev.com"
+    git config --global user.email "craig+appveyor@csf-dev.com"
     git config --global credential.helper store
     Set-Content -Path "$HOME\.git-credentials" -Value "https://$($Env:GITHUB_SECRET_KEY):x-oauth-basic@github.com`n" -NoNewline
 }
 
-# Because of autocrlf, the git add command could report warnings which cause the script to
+# The git commands below could report warnings which cause the script to
 # stop unless I change the error preference first
 $ErrorActionPreference = "silentlycontinue"
 
+Write-Host "Switching to a temp branch"
+git checkout -b temp/publish-docs
+
 Write-Host "Adding content"
 git add --all docs/
 
 Write-Host "Creating commit"
 git commit -m "Auto-publish docs website [skip ci]"
 
-if($Env:APPVEYOR -eq "True") {
+if($Env:APPVEYOR -eq "True" -and $Env:APPVEYOR_REPO_BRANCH -eq "production") {
+    Write-Host "Pushing to origin"
+    git checkout master
+    git pull
+    git merge temp/publish-docs --no-ff -m "Merge newly-published docs [skip ci]"
+    git push origin master
+}
+elseif ($Env:APPVEYOR -eq "True") {
     Write-Host "Pushing to origin"
-    git push origin HEAD:$Env:APPVEYOR_REPO_BRANCH
+    git push origin temp/publish-docs:master
 }

docs/_vnext/articles/index.html

@@ -81,10 +81,12 @@ <h2 id="get-started">Get started</h2>
 <h2 id="reference-documentation">Reference documentation</h2>
 <ul>
 <li><a href="ViewEngines.html">ZptSharp MVC view engines</a></li>
+<li><a href="NuGetPackages.html">The NuGet packages</a></li>
 <li><a href="../api/index.html">Consuming the API</a></li>
 <li><a href="ZptReference/Index.html">ZPT syntax</a></li>
 <li><a href="CliRenderer.html">The command line renderer</a></li>
 <li><a href="Compatibility.html">Compatibility</a></li>
+<li><a href="Logging.html">Logging</a></li>
 </ul>
 <h2 id="contributing--extending">Contributing &amp; extending</h2>
 <p>ZptSharp is an extensible library which may be customised to your desired usage.
@@ -95,6 +97,15 @@ <h2 id="contributing--extending">Contributing &amp; extending</h2>
 <li><a href="WritingDocumentProviders.html">Writing new document providers</a></li>
 <li><a href="WritingExpressionEvaluators.html">Writing new expression evaluators</a></li>
 </ul>
+<h2 id="documentation-for-previous-versions">Documentation for previous versions</h2>
+<p>Documentation is available for previous versions of ZptSharp:</p>
+<ul>
+<li><a href="https://csf-dev.github.io/ZPT-Sharp/_legacy/v1.x/">ZPT-Sharp <strong>version 1.x</strong></a>
+<ul>
+<li><em>In these versions, ZptSharp was distributed under a different name and with different NuGet packages.</em></li>
+</ul>
+</li>
+</ul>
 </article>
           </div>
 

docs/_vnext/index.html

@@ -63,8 +63,11 @@
 
 <div class="homepage">
 <h1 id="intuitive-html--xml-document-templates-for-net">Intuitive HTML &amp; XML document templates for .NET</h1>
+<p>ZptSharp is a document template language &amp; renderer for .NET Framework, .NET Core &amp; .NET 5+.
+It may be used as a <strong>View Engine</strong> for AS<span>P.N</span>ET MVC5 or AS<span>P.N</span>ET Core MVC.
+It also comes with a command-line rendering tool and may be consumed by your own applications as an API.</p>
 <section class="sample">
-<h2 id="sample-zptsharp-markup">Sample ZptSharp markup</h2>
+<h2 id="sample-zpt-markup">Sample ZPT markup</h2>
 <pre><code class="lang-html">&lt;ul&gt;
   &lt;li tal:repeat=&quot;todo here/Todos&quot;&gt;
     Remember to
@@ -75,6 +78,8 @@ <h2 id="sample-zptsharp-markup">Sample ZptSharp markup</h2>
 </section>
 <section class="get_started">
 <h2 id="get-started">Get started</h2>
+<p>Here are some recommended first steps to get learning about ZptSharp and the ZPT syntax.
+You may also visit <a href="articles/index.html">the documentation home page</a> for more links &amp; info.</p>
 <ul>
 <li><a href="articles/WhatIsZptSharp.html">What is ZptSharp?</a></li>
 <li>Quick start

docs/_vnext/manifest.json

@@ -4869,7 +4869,7 @@
       "output": {
         ".html": {
           "relative_path": "articles/index.html",
-          "hash": "M98+n0HQ34q9ONZv224kNw=="
+          "hash": "ARZM8VFgJuPZTAVSA7INVQ=="
         }
       },
       "is_incremental": false,
@@ -4904,7 +4904,7 @@
       "output": {
         ".html": {
           "relative_path": "index.html",
-          "hash": "S/nKzhA4Yhi3oYG4Xt9c6A=="
+          "hash": "nMDCniL0kmAKoLURpe39nA=="
         }
       },
       "is_incremental": false,