Merge branch 'main' into DOCSS-1633-incorrect-example

Author: rosieyohannan

.circleci/config.yml

@@ -3,12 +3,12 @@ version: 2.1
 orbs:
   aws-cli: circleci/[email protected]
   vale: circleci/[email protected]
-  go: circleci/[email protected].2
+  go: circleci/[email protected].3
 
 executors:
   node_executor:
     docker:
-      - image: cimg/node:22.18.0
+      - image: cimg/node:22.19.0
     working_directory: ~/project
 
   go_executor:
@@ -45,18 +45,6 @@ jobs:
     executor: node_executor
     steps:
       - checkout
-      - run:
-          name: Fetch branches matching server-4*
-          command: |
-            for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-4' | sed 's|refs/heads/||'); do
-              echo "[INFO] Fetching branch: $branch"
-              git checkout "$branch"
-              git pull origin "$branch"
-            done
-            git checkout "${CIRCLE_BRANCH}"
-      - add_ssh_keys:
-          fingerprints:
-            - "SHA256:Plac654CPBty6yA26H7QMKCqM0yD1XWds7UwNqOYzJU"
       - run:
           name: Install Node Dependencies
           command: npm ci

.htmltest.yml

@@ -6,10 +6,8 @@ BaseURL: https://circleci.com/docs
 IgnoreAltEmpty: true
 IgnoreInternalEmptyHash: true
 IgnoreURLs:
-  - "[url]"
-  - "[path]"
-  - "/docs/"
-  - "/docs/_/img/x-icon.svg"
+  - "\\[url\\]"                          # Escaped literal [url] placeholder in search templates
+  - "^/docs/"                            # All absolute paths from 404 page (navigation + assets)
 IgnoreDirs:
   - "api"
 OutputDir: ".htmltest"

.nvmrc

@@ -1 +1 @@
-v22.18.0
+22.19.0

CONTENT_AUTHORING.md

@@ -21,8 +21,8 @@ The CircleCI documentation is organized into logical components, each focusing o
 | `root` | Home and landing pages | `docs/root/` |
 | `guides` | How-to guides and tutorials | `docs/guides/` |
 | `reference` | API and configuration references | `docs/reference/` |
-| `orbs` | CircleCI Orbs documentation | `docs/orbs/` |
-| `server-admin` | Server administration guides | `docs/server-admin/` |
+| `orbs` | CircleCI orbs documentation | `docs/orbs/` |
+| `server-admin` | Server administration guides | `docs/server-admin-4.*/` |
 | `contributors` | Contributor guidelines | `docs/contributors/` |
 
 ### File Organization
@@ -244,7 +244,7 @@ xref:page-name.adoc#section-id[Link Text]
 Link to external resources:
 
 ```asciidoc
-https://circleci.com[CircleCI Website]
+link:https://circleci.com[CircleCI Website]
 ```
 
 ### Navigation Files

DEVELOPMENT.md

@@ -84,23 +84,11 @@ The site will be available at `http://localhost:3000` by default.
   npm run build:docs
   ```
 
-- **Fetch server branches** (for server admin docs). You will need to have local copies of all server-4* branches to be able to build the full docs site locally:
-  ```bash
-  npm run fetch-server-branches
-  ```
-
-- **Force fetch server branches** if you want to force all your server-4* branches to the state of the upstream "current" versions, use the --force flag. This is recommended if you have no local changes on any server-4* branch:
-
-  ```bash
-  npm run fetch-server-branches --force
-  ```
-
 
 ### Branch Strategy
 
 - `main` - Production-ready code
 - Feature branches - Named according to the feature being developed
-- Version branches - For version-specific documentation (e.g., `server-4.1`)
 
 ## Content Authoring
 
@@ -248,17 +236,6 @@ The UI uses Tailwind CSS for styling:
 
 ## Advanced Development Tasks
 
-## Updating server version branches
-
-When changes are made to the main branch to the build processes, the UI, or all components OTHER than server-administration, all server branches should be rebased once the changes are merged. The process for this is as follows:
-
-1. Update local main branch
-2. Checkout a server branch
-3. Run `git rebase main`
-4. Push those changes with `git push --force-with-lease origin server-4.1` - remember to use the correct server branch number.
-
-This should be done for every server-4* branch.
-
 ### Creating a New Component
 
 1. **Create component directory**:

antora-playbook.yml

@@ -15,8 +15,19 @@ content:
   - url: .
     start_path: docs/orbs
   - url: .
-    start_path: docs/server-admin
-    branches: [server-4*]
+    start_path: docs/server-admin-4.8
+  - url: .
+    start_path: docs/server-admin-4.7
+  - url: .
+    start_path: docs/server-admin-4.6
+  - url: .
+    start_path: docs/server-admin-4.5
+  - url: .
+    start_path: docs/server-admin-4.4
+  - url: .
+    start_path: docs/server-admin-4.3
+  - url: .
+    start_path: docs/server-admin-4.2
   - url: .
     start_path: docs/contributors
 ui: