diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 18adfe0fe..5eb9a66ba 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -7,6 +7,11 @@ Changes in nbconvert
 6.0.2
 -----
 
+A patch for a few minor issues raised out of the 6.0 release.
+
+Comprehensive notes
+~~~~~~~~~~~~~~~~~~~
+
 Fixing Problems
 +++++++++++++++
 - Added windows work-around fix in CLI for async applications :ghpull:`1383`:
@@ -23,8 +28,8 @@ Testing, Docs, and Builds
 
 A quick patch to fix an issue with get_exporter :ghpull:`1367`:
 
-6.0.0
------
+6.0
+---
 
 The following authors and reviewers contributed the changes for this release -- Thanks you all!
 
@@ -69,9 +74,8 @@ The following authors and reviewers contributed the changes for this release --
 * Tyler Makaro
 * Yu-Cheng (Henry) Huang
 
-
-Significant changes
-~~~~~~~~~~~~~~~~~~~~
+Significant Changes
+~~~~~~~~~~~~~~~~~~~
 
 Nbconvert 6.0 is a major release of nbconvert which includes many significant changes.
 
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
index 54b8921ab..301f8fbee 100644
--- a/docs/source/usage.rst
+++ b/docs/source/usage.rst
@@ -44,15 +44,18 @@ HTML
 ~~~~
 * ``--to html``
 
-  - ``--template full`` (default)
+  HTML Export.  Note on backward compatibility:  Be aware that if you were using custom copies of the old 5.x
+  template files (i.e. ``--template``), you will now need to use ``--template-file path/to/old/file.tpl``
+  in order to use that file in compatibility mode as opposed to other options.
+
+  - ``--template lab`` (default)
 
     A full static HTML render of the notebook.
-    This looks very similar to the interactive view.
+    This looks very similar to the jupyter lab interactive view.
 
-  - ``--template basic``
+  - ``--template classic``
 
-    Simplified HTML, useful for embedding in webpages, blogs, etc.
-    This excludes HTML headers.
+    Simplified HTML, using the classic jupyter look and feel.
 
 .. _convert_latex: