From 41b3bca5e69b7fd31b306917544f3add78d6109d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Oct 2026 06:05:10 +0000
Subject: [PATCH 1/2] chore(docs): apply copier updates

---
 .copier-answers.yml   | 2 +-
 docs/conf.py          | 8 ++++++++
 docs/requirements.txt | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index 976d5608..928af625 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 5875bae
+_commit: d2d1381
 _src_path: gh:canonical/platform-engineering-documentation-files.git
 author: Canonical Ltd.
 discourse: https://discourse.charmhub.io
diff --git a/docs/conf.py b/docs/conf.py
index b9445b1a..b75c8057 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -167,6 +167,11 @@
     """
 )
 
+# sphinx-markdown-builder (run by sphinx_llm.txt) has no visitor for these nodes.
+# "meta" may be removable once liran-funaro/sphinx-markdown-builder#70 / NVIDIA/sphinx-llm#172 land;
+# "mermaid" is unaddressed upstream and will still need suppressing.
+llms_txt_suppress_unknown_node_warnings = ["meta", "mermaid"]
+
 # The base URL for references built by sphinx-markdown-builder.
 if os.environ.get("READTHEDOCS"):
     markdown_http_base = html_baseurl
@@ -280,8 +285,11 @@
 # Intersphinx mappings for cross-referencing external documentation.
 intersphinx_mapping = {
     "juju": ("https://canonical.com/juju/docs/juju-cli/3.6/", None),
+<<<<<<< before updating
     "sphinxcontrib-mermaid": (
         "https://sphinxcontrib-mermaid-demo.readthedocs.io/en/latest",
         None,
     ),
+=======
+>>>>>>> after updating
 }
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 165fc664..75f8861e 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -27,11 +27,15 @@ packaging==26.3
 sphinxcontrib-svg2pdfconverter[CairoSVG]==2.1.0
 sphinx-last-updated-by-git==0.3.8
 sphinx-sitemap==2.9.0
-sphinx-llm==1.0.0
+sphinx-llm==1.1.0
 
 # Mermaid diagrams
 sphinxcontrib-mermaid==2.1.1
 
 # Vale dependencies
 rst2html==2020.7.4
+<<<<<<< before updating
 vale==3.21.0.0
+=======
+vale==3.22.0.0
+>>>>>>> after updating

From 967f6c4e9d79a99c420359fc9853aba7a0605690 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 23 Oct 2026 04:59:35 +0000
Subject: [PATCH 2/2] chore(docs): resolve template update conflicts

Co-authored-by: m2-farzan <26688819+m2-farzan@users.noreply.github.com>
---
 docs/conf.py          | 3 ---
 docs/requirements.txt | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index b75c8057..10d35f2a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -285,11 +285,8 @@
 # Intersphinx mappings for cross-referencing external documentation.
 intersphinx_mapping = {
     "juju": ("https://canonical.com/juju/docs/juju-cli/3.6/", None),
-<<<<<<< before updating
     "sphinxcontrib-mermaid": (
         "https://sphinxcontrib-mermaid-demo.readthedocs.io/en/latest",
         None,
     ),
-=======
->>>>>>> after updating
 }
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 75f8861e..448fbbe8 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -34,8 +34,4 @@ sphinxcontrib-mermaid==2.1.1
 
 # Vale dependencies
 rst2html==2020.7.4
-<<<<<<< before updating
-vale==3.21.0.0
-=======
 vale==3.22.0.0
->>>>>>> after updating