From c021b76cff8dc3a1b5146e09ff58d5f001fe85b0 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 27 Aug 2020 20:09:38 -0700
Subject: [PATCH 1/3] Update references to Documentation.

---
 Chemistry/src/Jupyter/BroombridgeMagic.cs        | 2 +-
 Chemistry/src/Jupyter/ChemistryEncodeMagic.cs    | 2 +-
 Chemistry/src/Jupyter/FermionHamiltonianMagic.cs | 7 +++++--
 Chemistry/src/Jupyter/WavefunctionMagic.cs       | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Chemistry/src/Jupyter/BroombridgeMagic.cs b/Chemistry/src/Jupyter/BroombridgeMagic.cs
index abf5f8f5340..d3bbcc3bf9d 100644
--- a/Chemistry/src/Jupyter/BroombridgeMagic.cs
+++ b/Chemistry/src/Jupyter/BroombridgeMagic.cs
@@ -16,7 +16,7 @@ public class BroombridgeMagic : MagicSymbol
         public BroombridgeMagic()
         {
             this.Name = $"%chemistry.broombridge";
-            this.Documentation = new Documentation() { Summary = "Loads and returns Broombridge electronic structure problem representation from a given .yaml file." };
+            this.Documentation = new Microsoft.Jupyter.Core.Documentation() { Summary = "Loads and returns Broombridge electronic structure problem representation from a given .yaml file." };
             this.Kind = SymbolKind.Magic;
             this.Execute = this.Run;
         }
diff --git a/Chemistry/src/Jupyter/ChemistryEncodeMagic.cs b/Chemistry/src/Jupyter/ChemistryEncodeMagic.cs
index 8eac3a69ca3..6e88be2b0be 100644
--- a/Chemistry/src/Jupyter/ChemistryEncodeMagic.cs
+++ b/Chemistry/src/Jupyter/ChemistryEncodeMagic.cs
@@ -17,7 +17,7 @@ public class ChemistryEncodeMagic : MagicSymbol
         public ChemistryEncodeMagic()
         {
             this.Name = $"%chemistry.encode";
-            this.Documentation = new Documentation() { Summary = "Encodes a fermion Hamiltonian to a format consumable by Q#." };
+            this.Documentation = new Microsoft.Jupyter.Core.Documentation() { Summary = "Encodes a fermion Hamiltonian to a format consumable by Q#." };
             this.Kind = SymbolKind.Magic;
             this.Execute = this.Run;
         }
diff --git a/Chemistry/src/Jupyter/FermionHamiltonianMagic.cs b/Chemistry/src/Jupyter/FermionHamiltonianMagic.cs
index b61954ed4e0..07e3583bd37 100644
--- a/Chemistry/src/Jupyter/FermionHamiltonianMagic.cs
+++ b/Chemistry/src/Jupyter/FermionHamiltonianMagic.cs
@@ -26,7 +26,7 @@ public class FermionHamiltonianLoadMagic : MagicSymbol
         public FermionHamiltonianLoadMagic()
         {
             this.Name = $"%chemistry.fh.load";
-            this.Documentation = new Documentation() { Summary = "Loads the fermion Hamiltonian for an electronic structure problem. The problem is loaded from a file or passed as an argument." };
+            this.Documentation = new Microsoft.Jupyter.Core.Documentation() { Summary = "Loads the fermion Hamiltonian for an electronic structure problem. The problem is loaded from a file or passed as an argument." };
             this.Kind = SymbolKind.Magic;
             this.Execute = this.Run;
         }
@@ -113,7 +113,10 @@ public class FermionHamiltonianAddTermsMagic : MagicSymbol
         public FermionHamiltonianAddTermsMagic()
         {
             this.Name = $"%chemistry.fh.add_terms";
-            this.Documentation = new Documentation() { Summary = "Adds terms to a fermion Hamiltonian." };
+            this.Documentation = new Microsoft.Jupyter.Core.Documentation
+            {
+                Summary = "Adds terms to a fermion Hamiltonian."
+            };
             this.Kind = SymbolKind.Magic;
             this.Execute = this.Run;
         }
diff --git a/Chemistry/src/Jupyter/WavefunctionMagic.cs b/Chemistry/src/Jupyter/WavefunctionMagic.cs
index bed1d935b78..f32b2bf538e 100644
--- a/Chemistry/src/Jupyter/WavefunctionMagic.cs
+++ b/Chemistry/src/Jupyter/WavefunctionMagic.cs
@@ -20,7 +20,7 @@ public class WavefunctionMagic : MagicSymbol
         public WavefunctionMagic()
         {
             this.Name = $"%chemistry.inputstate.load";
-            this.Documentation = new Documentation() { Summary = "Loads Broombridge electronic structure problem and returns selected input state." };
+            this.Documentation = new Microsoft.Jupyter.Core.Documentation() { Summary = "Loads Broombridge electronic structure problem and returns selected input state." };
             this.Kind = SymbolKind.Magic;
             this.Execute = this.Run;
         }

From db0835b035da455218db8459b16ca1923e6dd8b0 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Tue, 6 Oct 2020 23:33:17 -0700
Subject: [PATCH 2/3] Add metadata for generating docs, document named items.

---
 Chemistry/src/Runtime/Runtime.csproj         |  5 ++++-
 MachineLearning/src/MachineLearning.csproj   |  1 +
 MachineLearning/src/Types.qs                 | 12 ++++++------
 Numerics/src/Numerics.csproj                 |  4 ++--
 Standard/src/AmplitudeAmplification/Types.qs | 11 ++++++++---
 Standard/src/Math/Complex.qs                 |  6 +++---
 Standard/src/Math/Types.qs                   | 12 ++++++++++++
 Standard/src/Optimization/Univariate.qs      |  2 +-
 8 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj
index 902c0c66483..cf29d4dedff 100644
--- a/Chemistry/src/Runtime/Runtime.csproj
+++ b/Chemistry/src/Runtime/Runtime.csproj
@@ -6,6 +6,10 @@
     <QsharpDocsGeneration>true</QsharpDocsGeneration>
     <IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
     <RunQDocGen>True</RunQDocGen>
+    <!-- List the name of the metapackage that users can
+         use to take a dependency on these Q# APIs, rather
+         than the subpackage directly. -->
+    <QsharpDocsPackageId>Microsoft.Quantum.Chemistry</QsharpDocsPackageId>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -44,4 +48,3 @@
   </ItemGroup>
 
 </Project>
-
diff --git a/MachineLearning/src/MachineLearning.csproj b/MachineLearning/src/MachineLearning.csproj
index 73b86c36b20..e26329dac2b 100644
--- a/MachineLearning/src/MachineLearning.csproj
+++ b/MachineLearning/src/MachineLearning.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Microsoft.Quantum.MachineLearning</AssemblyName>
     <QsharpDocsGeneration>true</QsharpDocsGeneration>
+    <QsharpDocsPackageId>Microsoft.Quantum.MachineLearning</QsharpDocsPackageId>
     <!--
       Include core packages using project references instead, since they get
       built at the same time as this project.
diff --git a/MachineLearning/src/Types.qs b/MachineLearning/src/Types.qs
index a495d4687ab..2eee9a9f653 100644
--- a/MachineLearning/src/Types.qs
+++ b/MachineLearning/src/Types.qs
@@ -10,7 +10,7 @@ namespace Microsoft.Quantum.MachineLearning {
     /// Describes a controlled rotation in terms of its target and control
     /// indices, rotation axis, and index into a model parameter vector.
     ///
-    /// # Input
+    /// # Named Items
     /// ## TargetIndex
     /// Index of the target qubit for this controlled rotation.
     /// ## ControlIndices
@@ -50,7 +50,7 @@ namespace Microsoft.Quantum.MachineLearning {
     /// parameterized and controlled rotations, an assignment of rotation
     /// angles, and a bias between the two classes recognized by the model.
     ///
-    /// # Input
+    /// # Named Items
     /// ## Structure
     /// The sequence of controlled rotations used to classify inputs.
     /// ## Parameters
@@ -70,7 +70,7 @@ namespace Microsoft.Quantum.MachineLearning {
     /// Describes an operation that prepares a given input to a sequential
     /// classifier.
     ///
-    /// # Input
+    /// # Named Items
     /// ## NQubits
     /// The number of qubits on which the encoded input is defined.
     /// ## Prepare
@@ -84,7 +84,7 @@ namespace Microsoft.Quantum.MachineLearning {
     /// # Summary
     /// A sample, labeled with a class to which that sample belongs.
     ///
-    /// # Input
+    /// # Named Items
     /// ## Features
     /// A vector of features for the given sample.
     /// ## Label
@@ -152,7 +152,7 @@ namespace Microsoft.Quantum.MachineLearning {
     /// The results from having validated a classifier against a set of
     /// samples.
     ///
-    /// # Input
+    /// # Named Items
     /// ## NMisclassifications
     /// The number of misclassifications observed during validation.
     newtype ValidationResults = (
@@ -163,7 +163,7 @@ namespace Microsoft.Quantum.MachineLearning {
     /// # Summary
     /// A collection of options to be used in training quantum classifiers.
     ///
-    /// # Input
+    /// # Named Items
     /// ## LearningRate
     /// The learning rate by which gradients should be rescaled when updating
     /// model parameters during training steps.
diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj
index 9b9abfd7039..4cb92bd453b 100644
--- a/Numerics/src/Numerics.csproj
+++ b/Numerics/src/Numerics.csproj
@@ -4,12 +4,13 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Microsoft.Quantum.Numerics</AssemblyName>
     <QsharpDocsGeneration>true</QsharpDocsGeneration>
+    <QsharpDocsPackageId>Microsoft.Quantum.Numerics</QsharpDocsPackageId>
     <IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
   </PropertyGroup>
 
   <PropertyGroup>
     <NoWarn>0162</NoWarn>
-    <RunQDocGen>True</RunQDocGen>
+    <RunQDocGen>True</RunQDocGen>https://github.com/microsoft/qsharp-runtime/pull/390
     <Authors>Microsoft</Authors>
     <Description>Microsoft's Quantum numerics libraries.</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
@@ -45,4 +46,3 @@
   </ItemGroup>
 
 </Project>
-
diff --git a/Standard/src/AmplitudeAmplification/Types.qs b/Standard/src/AmplitudeAmplification/Types.qs
index 5addb42ddfa..69a90ce2006 100644
--- a/Standard/src/AmplitudeAmplification/Types.qs
+++ b/Standard/src/AmplitudeAmplification/Types.qs
@@ -6,10 +6,15 @@ namespace Microsoft.Quantum.AmplitudeAmplification {
     /// # Summary
     /// Phases for a sequence of partial reflections in amplitude amplification.
     ///
-    /// # Remarks
-    /// The first parameter is an array of phases for reflection about the
-    /// start state. The second parameter is an array of phases for reflection
+    /// # Named Items
+    /// ## AboutStart
+    /// An array of phases for reflection about the
+    /// start state.
+    /// ## AboutTarget
+    /// An array of phases for reflection
     /// about the target state.
+    ///
+    /// # Remarks
     /// Both arrays must be of equal length. Note that in many cases, the first phase about the start state and last phase about the target state introduces a global phase shift and may be set to $0$.
     newtype ReflectionPhases = (
         AboutStart: Double[],
diff --git a/Standard/src/Math/Complex.qs b/Standard/src/Math/Complex.qs
index 043d360f199..3240352032e 100644
--- a/Standard/src/Math/Complex.qs
+++ b/Standard/src/Math/Complex.qs
@@ -8,10 +8,10 @@ namespace Microsoft.Quantum.Math {
     ///
     /// The polar representation of a complex number is $c=r e^{i t}$.
     ///
-    /// # Input
-    /// ## First Parameter
+    /// # Named Items
+    /// ## Magnitude
     /// `Double` is absolute value $r \ge 0$.
-    /// ## Second Parameter
+    /// ## Argument
     /// `Double` is the phase $t \in \mathbb R$.
     newtype ComplexPolar = (Magnitude: Double, Argument: Double);
 
diff --git a/Standard/src/Math/Types.qs b/Standard/src/Math/Types.qs
index 6e0d05d364a..8bad0920fcf 100644
--- a/Standard/src/Math/Types.qs
+++ b/Standard/src/Math/Types.qs
@@ -4,6 +4,12 @@ namespace Microsoft.Quantum.Math {
     /// Represents a rational number of the form `p/q`. Integer `p` is
     /// the first element of the tuple and `q` is the second element
     /// of the tuple.
+    ///
+    /// # Named Items
+    /// ## Numerator
+    /// Numerator of the fraction.
+    /// ## Denominator
+    /// Denominator of the fraction/
     newtype Fraction = (
         Numerator: Int,
         Denominator: Int
@@ -13,6 +19,12 @@ namespace Microsoft.Quantum.Math {
     /// Represents a rational number of the form `p/q`. Integer `p` is
     /// the first element of the tuple and `q` is the second element
     /// of the tuple.
+    ///
+    /// # Named Items
+    /// ## Numerator
+    /// Numerator of the fraction.
+    /// ## Denominator
+    /// Denominator of the fraction/
     newtype BigFraction = (
         Numerator: BigInt,
         Denominator: BigInt
diff --git a/Standard/src/Optimization/Univariate.qs b/Standard/src/Optimization/Univariate.qs
index fef2d09a672..4b6f6d03aa4 100644
--- a/Standard/src/Optimization/Univariate.qs
+++ b/Standard/src/Optimization/Univariate.qs
@@ -9,7 +9,7 @@ namespace Microsoft.Quantum.Optimization {
     /// # Summary
     /// Represents the result of optimizing a univariate function.
     ///
-    /// # Input
+    /// # Named Items
     /// ## Coordinate
     /// Input at which an optimum was found.
     /// ## Value

From 39377d95419238145ad3fe4fde67a384ee2b5aff Mon Sep 17 00:00:00 2001
From: Chris Granade <chgranad@microsoft.com>
Date: Wed, 7 Oct 2020 08:03:04 -0700
Subject: [PATCH 3/3] Update Numerics/src/Numerics.csproj

---
 Numerics/src/Numerics.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj
index 4cb92bd453b..be966a5489b 100644
--- a/Numerics/src/Numerics.csproj
+++ b/Numerics/src/Numerics.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <NoWarn>0162</NoWarn>
-    <RunQDocGen>True</RunQDocGen>https://github.com/microsoft/qsharp-runtime/pull/390
+    <RunQDocGen>True</RunQDocGen>
     <Authors>Microsoft</Authors>
     <Description>Microsoft's Quantum numerics libraries.</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>