Merge branch 'release/2.0.0' into production

Author: craigfowler

Tools/CommonSolutionProperties.props

@@ -23,8 +23,8 @@
         <VersionPrefix>$(ReleaseVersion)</VersionPrefix>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Copyright>Copyright 2020 - ZptSharp contributors</Copyright>
-        <PackageProjectUrl>https://github.com/csf-dev/ZPT-Sharp/</PackageProjectUrl>
-        <RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
+        <PackageProjectUrl>https://csf-dev.github.io/ZPT-Sharp/</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/csf-dev/ZPT-Sharp/</RepositoryUrl>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
         <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>

ZptSharp.Documentation/articles/NuGetPackages.md

@@ -20,7 +20,7 @@ A working ZptSharp environment *must include at least one document provider* pac
 
 [ZptSharp.Abstractions]: https://www.nuget.org/packages/ZptSharp.Abstractions
 [ZptSharp]: https://www.nuget.org/packages/ZptSharp
-[where it sets up dependency injection]: ../API/index.md#adding-zptsharp-to-di
+[where it sets up dependency injection]: ../api/index.md#adding-zptsharp-to-di
 
 ## Document providers
 

ZptSharp.Documentation/articles/WhatIsZptSharp.md

@@ -1,9 +1,10 @@
 # What is ZptSharp?
 
 ZptSharp is an open source [library for .NET] for writing HTML or XML documents based upon page templates.
-It is useable as a library, and packages are available for use:
+It may be used in your own applications as a library.
+Packages are also available to use ZptSharp:
 
-* As an ASP.NET/ASP.NET Core MVC **View Engine**
+* As a **View Engine** for AS<span>P.N</span>ET MVC5 or AS<span>P.N</span>ET Core MVC
 * As a standalone command-line application
 
 ZptSharp is based upon the *Zope Page Templates* specification & syntax.
@@ -16,7 +17,7 @@ ZptSharp is a pure .NET implementation of just the page templates syntax from Zo
 
 ## What is the syntax?
 
-ZPT is *an attribute language* designed specifically for use with HTML and/or XML documents. All of the ZPT directives are placed in **attributes**.
+ZPT is *an attribute language* designed specifically for use with HTML and/or XML documents. All of the ZPT directives are written using **attributes**.
 
 ZPT syntax:
 
@@ -30,17 +31,17 @@ ZPT syntax:
 
 ZPT's syntax is organised into three logical 'modules' of functionality.
 The first of these is an extensible expression syntax for accessing the model, which has the goal of being easy to read & understand without programming knowledge.
-The default syntax looks a lot like a URL path, such as `here/Product/Name`.
+Most expressions will look a lot like a URL path, such as `here/Product/Name`.
 This expression syntax is named **TALES**.
 
 The second is a mechanism (named **METAL**) for reusing markup across document templates and authoring logical parts of a document as separate source files.
 Designers define *macros* of markup for re-use, which may optionally contain *slots* (placeholders).
 At the point of macro usage, markup/content may be supplied to fill the available slots.
 
-The third function of ZPT handles the actual data-binding and manipulation of the document using the model; this a syntax named **TAL**.
-Some aspects of that functionality include (but are not limited to):
+The third function of ZPT handles the actual data-binding and manipulation of the document using the model; this is a syntax named **TAL**.
+Some aspects of that functionality include the following, although this is not a comprehensive list of its capabilities.
 
 * Writing model content to the document
 * Conditionally removing parts of the document
 * Repeating parts of the document for items in a collection
-* Adding/removing/updating attributes & values
+* Adding/removing/updating attributes & values

ZptSharp.Documentation/articles/ZptReference/Tal/Repeat.md

@@ -43,7 +43,7 @@ Can you see the mistake?
 Even though the `tal:repeat` attribute is written before the `tal:define` attribute, _it will be processed afterwards_.
 This means that the `tal:define` attribute will attempt to evaluate the expression `item/name` before the `item` variable has been created, and will almost surely raise an error.
 
-[As noted in the table listing all TAL attributes]: ../index.md#tal-binds-data-to-the-template
+[As noted in the table listing all TAL attributes]: ../Index.md#tal-binds-data-to-the-template
 [`tal:define` attributes]: Define.md
 [`tal:condition` attributes]: Condition.md
 

ZptSharp.Documentation/articles/ZptReference/Tales/GlobalContexts.md

@@ -76,7 +76,7 @@ Please refer to [the individual TAL attributes] for their precise behaviour when
 The general rule-of-thumb for TAL attributes operating upon an abort-action token means that the attribute is processed with the same outcome as if it were not present.
 
 [the abort-action token]: xref:ZptSharp.Expressions.AbortZptActionToken
-[the individual TAL attributes]: ../index.md#tal-binds-data-to-the-template
+[the individual TAL attributes]: ../Index.md#tal-binds-data-to-the-template
 
 ### `attrs`
 

ZptSharp.Documentation/articles/ZptReference/toc.yml

@@ -1,7 +1,7 @@
 - name: Documentation home
   topicHref: ../index.md
 - name: ZPT reference home
-  href: index.md
+  href: Index.md
 - name: METAL attributes
   items:
     - name: define-macro

ZptSharp.Documentation/articles/ZptTutorial/Page6.md

@@ -78,10 +78,10 @@ Indeed, a slot-filler could even make use of a further `metal:use-macro` attribu
 ## End of the ZPT tutorial: What's next?
 
 You have reached the end of the ZPT syntax tutorial; all of the most important concepts have been covered.
-[The ZPT reference](../ZPTReference/index.md) has a lot more detail about many of the concepts you have learned during the tutorial.
+[The ZPT reference](../ZptReference/Index.md) has a lot more detail about many of the concepts you have learned during the tutorial.
 
 There are also a few more advanced concepts not covered in this tutorial; amongst those are:
 
-* [METAL macro extension](../ZPTReference/Metal/ExtendMacro.md) (similar to creating a subclass of a macro)
-* [TAL error handling](../ZPTReference/Tal/OnError.md) (gracefully dealing with errors)
-* [The TALES expression types](../ZPTReference/index.md#tales-is-how-expressions-are-written) (we have only touched upon path and string expressions in this tutorial, there are more!)
+* [METAL macro extension](../ZptReference/Metal/ExtendMacro.md) (similar to creating a subclass of a macro)
+* [TAL error handling](../ZptReference/Tal/OnError.md) (gracefully dealing with errors)
+* [The TALES expression types](../ZptReference/Index.md#tales-is-how-expressions-are-written) (we have only touched upon path and string expressions in this tutorial, there are more!)

ZptSharp.Documentation/articles/index.md

@@ -2,7 +2,9 @@
 
 ## Get started
 
-Those who are new to ZptSharp are recommended to follow one of four short **quick start** guides. These guides each take the developer through a 'hello world' example, giving them a working sample app using ZptSharp. You may also wish to read [a conceptual summary] of what ZptSharp is.
+Those who are new to ZptSharp are recommended to follow one of four short **quick start** guides.
+These guides each take the developer through a 'hello world' example, giving them a working sample app using ZptSharp.
+It is also recommended to read [the short conceptual summary of ZptSharp], which illustrates its fundamental principles.
 
 * [Quick start for ASP.NET Core MVC]
 * [Quick start for ASP.NET MVC 5]
@@ -11,7 +13,7 @@ Those who are new to ZptSharp are recommended to follow one of four short **quic
 
 An ideal follow-up to using a quick start guide is to follow [the ZPT tutorial]. This expands upon what was learned during quick-start teaches the full range of ZptSharp functionality.
 
-[a conceptual summary]: WhatIsZptSharp.md
+[the short conceptual summary of ZptSharp]: WhatIsZptSharp.md
 [Quick start for ASP.NET MVC 5]: QuickStart/Mvc5.md
 [Quick start for ASP.NET Core MVC]: QuickStart/MvcCore.md
 [Quick start for the command line renderer]: QuickStart/CliApp.md
@@ -31,7 +33,7 @@ An ideal follow-up to using a quick start guide is to follow [the ZPT tutorial].
 [ZptSharp MVC view engines]: ViewEngines.md
 [The NuGet packages]: NuGetPackages.md
 [Consuming the API]: ../api/index.md
-[ZPT syntax]: ZPTReference/index.md
+[ZPT syntax]: ZptReference/Index.md
 [The command line renderer]: CliRenderer.md
 [Compatibility]: Compatibility.md
 [Logging]: Logging.md

ZptSharp.Documentation/articles/toc.yml

@@ -24,7 +24,7 @@
     - name: Consuming the API
       topicHref: ../api/index.md
     - name: ZPT syntax
-      topicHref: ZptReference/index.md
+      topicHref: ZptReference/Index.md
     - name: The CLI app
       href: CliRenderer.md
     - name: Compatibility

ZptSharp.Documentation/docfx.json

@@ -61,6 +61,11 @@
       }
     ],
     "dest": "_site",
+    "globalMetadata": {
+      "_gitContribute": {
+        "branch": "master"
+      }
+    },
     "globalMetadataFiles": [],
     "fileMetadataFiles": [],
     "template": [