From f1934816ea291fc7d439b102b8fd7b81fb63d5cb Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Tue, 26 Mar 2024 12:50:29 -0400
Subject: [PATCH] Update change log for 1.2.0

---
 CHANGELOG.md                                  | 7 +++++++
 changelog.d/20240326_120624_jsick_DM_43485.md | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/20240326_120624_jsick_DM_43485.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bd28096..236ff2f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-1.2.0'></a>
+## 1.2.0 (2024-03-26)
+
+### New features
+
+- Rubin user guides (`documenteer.conf.guide`) and technotes (`documenteer.conf.technote`) now include [MyST-NB](https://myst-nb.readthedocs.io/en/latest/) to support Jupyter Notebooks in Sphinx documentation. The MyST-NB extension also supersedes MyST-Parser for Markdown syntax support. For guides, Jupyter Notebook files can be intermixed with Markdown (`.md`) and reStructuredText (`.rst`) files. An `ipynb` file is considered as a page in the documentation. For technotes, the Jupyter Notebook must be named `index.ipynb`. By default, these configurations use MyST-NB's "auto" mode for notebook execution: only if a notebook is missing outputs will it be executed.
+
 <a id='changelog-1.1.1'></a>
 ## 1.1.1 (2024-02-21)
 
diff --git a/changelog.d/20240326_120624_jsick_DM_43485.md b/changelog.d/20240326_120624_jsick_DM_43485.md
deleted file mode 100644
index fd614d2d..00000000
--- a/changelog.d/20240326_120624_jsick_DM_43485.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### New features
-
-- Rubin user guides (`documenteer.conf.guide`) and technotes (`documenteer.conf.technote`) now include [MyST-NB](https://myst-nb.readthedocs.io/en/latest/) to support Jupyter Notebooks in Sphinx documentation. The MyST-NB extension also supersedes MyST-Parser for Markdown syntax support. For guides, Jupyter Notebook files can be intermixed with Markdown (`.md`) and reStructuredText (`.rst`) files. An `ipynb` file is considered as a page in the documentation. For technotes, the Jupyter Notebook must be named `index.ipynb`. By default, these configurations use MyST-NB's "auto" mode for notebook execution: only if a notebook is missing outputs will it be executed.