fixed merge conflicts

rapidsai · Oct 16, 2024 · 81c0310 · 81c0310
2 parents e78dfa9 + b1f42dd
commit 81c0310
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/conda/environments/deployment_docs.yml b/conda/environments/deployment_docs.yml
@@ -10,10 +10,9 @@ dependencies:
   - pydata-sphinx-theme>=0.15.4
   - python=3.12
   - pre-commit>=3.8.0
-  # Upper bound pin on sphinx can be removed once https://github.com/mgaitan/sphinxcontrib-mermaid/issues/160 is resolved
-  - sphinx>=8.0.2,<8.1
+  - sphinx>=8.0.2
   - sphinx-autobuild>=2024.9.19
   - sphinx-copybutton>=0.5.2
   - sphinx-design>=0.6.1
-  - sphinxcontrib-mermaid>=0.9.2
+  - sphinxcontrib-mermaid>=1.0.0
   - python-frontmatter>=1.1.0
diff --git a/source/cloud/azure/aks.md b/source/cloud/azure/aks.md
@@ -22,8 +22,8 @@ $ az login
 
 Now we can launch a GPU enabled AKS cluster. First launch an AKS cluster.
 
-```bash
-az aks create -g <resource group> -n rapids \
+```console
+    az aks create -g <resource group> -n rapids \
         --enable-managed-identity \
         --node-count 1 \
         --enable-addons monitoring \
@@ -91,8 +91,8 @@ $ az extension add --name aks-preview
 
 `````
 
-```bash
-az aks nodepool add \
+```console
+$ az aks nodepool add \
     --resource-group <resource group> \
     --cluster-name rapids \
     --name gpunp \