From 4188e0ea5b8f5728bc3a70ed48d430cdfac0fea9 Mon Sep 17 00:00:00 2001
From: Richard Schneider <makaretu@gmail.com>
Date: Fri, 24 May 2019 14:24:57 +1200
Subject: [PATCH] docs: improve #1

---
 appveyor.yml           |   2 +-
 doc/MSBuild.dll.config | 112 -----------------------------------------
 doc/articles/intro.md  |  18 ++++---
 doc/packages.config    |   7 ---
 doc/toc.yml            |   2 +
 src/DohClient.cs       |   2 +-
 6 files changed, 16 insertions(+), 127 deletions(-)
 delete mode 100644 doc/MSBuild.dll.config
 delete mode 100644 doc/packages.config

diff --git a/appveyor.yml b/appveyor.yml
index e29cb95..1de19e3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -67,7 +67,7 @@ after_test:
         packages\coveralls.net.0.6.0\tools\csmacnz.coveralls.exe 
         --opencover -i ./coverage.xml --useRelativePaths --serviceName appveyor --jobId %APPVEYOR_BUILD_NUMBER%
 # Build documentation in doc\_site
-    - del src\obj\*.* /s /q
+#    - del src\obj\*.* /s /q
     - docfx doc\docfx.json --logLevel Warning
     - 7z a -tzip docs.zip doc\_site
     - appveyor PushArtifact docs.zip
diff --git a/doc/MSBuild.dll.config b/doc/MSBuild.dll.config
deleted file mode 100644
index 3e1c5af..0000000
--- a/doc/MSBuild.dll.config
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <configuration>
-    <configSections>
-      <section name="msbuildToolsets" type="Microsoft.Build.Evaluation.ToolsetConfigurationSection, Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    </configSections>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-    </startup>
-    <runtime>
-      <DisableFXClosureWalk enabled="true" />
-      <generatePublisherEvidence enabled="false" />
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.Framework" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.Conversion.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.Tasks.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.Utilities.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.Engine" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.Conversion.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="System.IO.Compression" culture="neutral" publicKeyToken="b77a5c561934e089" />
-          <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Activities.Build" culture="neutral" publicKeyToken="31bf3856ad364e35" />
-          <bindingRedirect oldVersion="4.0.0.0" newVersion="15.0.0.0" />
-          <codeBase version="15.0.0.0" href=".\amd64\Microsoft.Activities.Build.dll" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="XamlBuildTask" culture="neutral" publicKeyToken="31bf3856ad364e35" />
-          <bindingRedirect oldVersion="4.0.0.0" newVersion="15.0.0.0" />
-          <codeBase version="15.0.0.0" href=".\amd64\XamlBuildTask.dll" />
-        </dependentAssembly>
-
-        <!-- Workaround for crash in C++ CodeAnalysis scenarios due to https://github.com/Microsoft/msbuild/issues/1675 -->
-        <dependentAssembly>
-          <assemblyIdentity name="FxCopTask" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <codeBase version="15.0.0.0" href="..\..\Microsoft\VisualStudio\v15.0\CodeAnalysis\FxCopTask.dll" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.VisualStudio.CodeAnalysis" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <codeBase version="15.0.0.0" href="..\..\Microsoft\VisualStudio\v15.0\CodeAnalysis\Microsoft.VisualStudio.CodeAnalysis.dll" />
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.VisualStudio.CodeAnalysis.Sdk" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <codeBase version="15.0.0.0" href="..\..\Microsoft\VisualStudio\v15.0\CodeAnalysis\Microsoft.VisualStudio.CodeAnalysis.Sdk.dll" />
-        </dependentAssembly>
-      </assemblyBinding>
-    </runtime>
-    <!-- To define one or more new toolsets, add an 'msbuildToolsets' element in this file. -->
-    <msbuildToolsets default="15.0">
-      <toolset toolsVersion="15.0">
-        <property name="MSBuildToolsPath" value="$([MSBuild]::GetCurrentToolsDirectory())" />
-        <property name="MSBuildToolsPath32" value="$([MSBuild]::GetToolsDirectory32())" />
-        <property name="MSBuildToolsPath64" value="$([MSBuild]::GetToolsDirectory64())" />
-        <property name="MSBuildSDKsPath" value="$([MSBuild]::GetMSBuildSDKsPath())" />
-        <property name="FrameworkSDKRoot" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1@InstallationFolder)" />
-        <property name="MSBuildRuntimeVersion" value="4.0.30319" />
-        <property name="MSBuildFrameworkToolsPath" value="$(SystemRoot)\Microsoft.NET\Framework\v$(MSBuildRuntimeVersion)\" />
-        <property name="MSBuildFrameworkToolsPath32" value="$(SystemRoot)\Microsoft.NET\Framework\v$(MSBuildRuntimeVersion)\" />
-        <property name="MSBuildFrameworkToolsPath64" value="$(SystemRoot)\Microsoft.NET\Framework64\v$(MSBuildRuntimeVersion)\" />
-        <property name="MSBuildFrameworkToolsRoot" value="$(SystemRoot)\Microsoft.NET\Framework\" />
-        <property name="SDK35ToolsPath" value="$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx35Tools-x86', 'InstallationFolder', null, RegistryView.Registry32))" />
-        <property name="SDK40ToolsPath" value="$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools-x86', 'InstallationFolder', null, RegistryView.Registry32))" />
-        <property name="WindowsSDK80Path" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1@InstallationFolder)" />
-        <property name="VsInstallRoot" value="$([MSBuild]::GetVsInstallRoot())" />
-        <property name="MSBuildToolsRoot" value="$(VsInstallRoot)\MSBuild" />
-        <property name="MSBuildExtensionsPath" value="$([MSBuild]::GetMSBuildExtensionsPath())" />
-        <property name="MSBuildExtensionsPath32" value="$([MSBuild]::GetMSBuildExtensionsPath())" />
-
-        <property name="RoslynTargetsPath" value="$([MSBuild]::GetToolsDirectory32())\Roslyn" />
-
-        <!-- VC Specific Paths -->
-        <property name="VCTargetsPath" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath)','$(VsInstallRoot)\Common7\IDE\VC\VCTargets\'))" />
-        <property name="VCTargetsPath14" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath14)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\V140\'))" />
-        <property name="VCTargetsPath12" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath12)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\V120\'))" />
-        <property name="VCTargetsPath11" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath11)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\V110\'))" />
-        <property name="VCTargetsPath10" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath10)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\'))" />
-        <property name="AndroidTargetsPath" value="$(MSBuildExtensionsPath32)\Microsoft\MDD\Android\V150\" />
-        <property name="iOSTargetsPath" value="$(MSBuildExtensionsPath32)\Microsoft\MDD\iOS\V150\" />
-        <projectImportSearchPaths>
-          <searchPaths os="windows">
-            <property name="MSBuildExtensionsPath" value="$(MSBuildProgramFiles32)\MSBuild"/>
-            <property name="MSBuildExtensionsPath32" value="$(MSBuildProgramFiles32)\MSBuild"/>
-            <property name="MSBuildExtensionsPath64" value="$(MSBuildProgramFiles32)\MSBuild"/>
-            <property name="VSToolsPath" value="$(MSBuildProgramFiles32)\MSBuild\Microsoft\VisualStudio\v$(VisualStudioVersion)"/>
-          </searchPaths>
-        </projectImportSearchPaths>
-      </toolset>
-    </msbuildToolsets>
-  </configuration>
diff --git a/doc/articles/intro.md b/doc/articles/intro.md
index e82d2cf..3bc0768 100644
--- a/doc/articles/intro.md
+++ b/doc/articles/intro.md
@@ -1,13 +1,19 @@
 # DNS Clients
 
-Various DNS clients that communicate with a DNS server. The source code is on [GitHub](https://github.com/richardschneider/net-udns) and the package is published on [NuGet](https://www.nuget.org/packages/Makaretu.Dns.Unicast).
+This package provides various unicast DNS clients, stub resolvers, that communicate with a DNS server. The source code is on [GitHub](https://github.com/richardschneider/net-udns) and the package is published on [NuGet](https://www.nuget.org/packages/Makaretu.Dns.Unicast).
 
 - [DnsClient](xref:Makaretu.Dns.DnsClient) is used to send a [Message](xref:Makaretu.Dns.Message) 
-  to a standard DNS server and receive a response; uses UPD and then TCP (if needed).
-- [DohClient](xref:Makaretu.Dns.DohClient) is used to send a [Message](xref:Makaretu.Dns.Message) 
-  to a DNS over HTTPS server and receive a response.
-- [DotClient](xref:Makaretu.Dns.DotClient) is used to send a [Message](xref:Makaretu.Dns.Message) 
-  to a DNS over TLS server and receive a response.
+  to a standard DNS server and receive a response; uses UPD and then TCP (if needed). There is no privacy.
+
+- [DohClient](xref:Makaretu.Dns.DohClient), DNS over HTTPS (DoH), is an experimental protocol for performing remote 
+Domain Name System (DNS) resolution via the HTTPS protocol. The goal
+is to increase user privacy and security by preventing eavesdropping and 
+manipulation of DNS data by man-in-the-middle attacks.
+
+- [DotClient](xref:Makaretu.Dns.DotClient), DNS over TLS (DoT), is a security protocol for encrypting and wrapping 
+DNS queries and answers via the Transport Layer Security (TLS) protocol. The goal 
+is to increase user privacy and security by preventing eavesdropping and 
+manipulation of DNS data via man-in-the-middle attacks.
 
 ## Usage
 
diff --git a/doc/packages.config b/doc/packages.config
deleted file mode 100644
index cad44f5..0000000
--- a/doc/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="docfx.console" version="2.9.3" targetFramework="net452" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net452" />
-  <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
-  <package id="msdn.4.5.2" version="0.1.0-alpha-1611021200" targetFramework="net452" />
-</packages>
\ No newline at end of file
diff --git a/doc/toc.yml b/doc/toc.yml
index c3ae452..d070daf 100644
--- a/doc/toc.yml
+++ b/doc/toc.yml
@@ -2,3 +2,5 @@
   href: articles/
 - name: Api Documentation
   href: api/
+- name: Github
+  href: https://github.com/richardschneider/net-udns
diff --git a/src/DohClient.cs b/src/DohClient.cs
index b59aae0..6c43574 100644
--- a/src/DohClient.cs
+++ b/src/DohClient.cs
@@ -23,7 +23,7 @@ namespace Makaretu.Dns
     ///   manipulation of DNS data by man-in-the-middle attacks.
     ///   <para>
     ///   The <b>DohClient</b> uses the HTTP POST method to hide as much
-    ///   information as is possible.  Also, it tends to generated smaller
+    ///   information as is possible.  Also, it tends to generate smaller
     ///   requests.
     ///   </para>
     /// </remarks>