Merge branch 'v1.16' into upmerge_12-18

.github/workflows/website-v1-15.yml → .github/workflows/website-v1-16.yml

@@ -1,14 +1,14 @@
-name: Azure Static Web App v1.15
+name: Azure Static Web App v1.16
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - v1.15
+      - v1.16
   pull_request:
     types: [opened, synchronize, reopened, closed]
     branches:
-      - v1.15
+      - v1.16
 
 jobs:
   build_and_deploy_job:
@@ -29,7 +29,7 @@ jobs:
           HUGO_ENV: production
           HUGO_VERSION: "0.100.2"
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }}
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           skip_deploy_on_missing_secrets: true
           action: "upload"
@@ -50,6 +50,6 @@ jobs:
         id: closepullrequest
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }}
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }}
           skip_deploy_on_missing_secrets: true
           action: "close"

daprdocs/config.toml

@@ -1,5 +1,5 @@
 # Site Configuration
-baseURL = "https://v1-15.docs.dapr.io"
+baseURL = "https://v1-16.docs.dapr.io"
 title = "Dapr Docs"
 theme = "docsy"
 disableFastRender = true
@@ -196,20 +196,23 @@ offlineSearch = false
 github_repo = "https://github.com/dapr/docs"
 github_project_repo = "https://github.com/dapr/dapr"
 github_subdir = "daprdocs"
-github_branch = "v1.15"
+github_branch = "v1.16"
 
 # Versioning
-version_menu = "v1.15 (preview)"
-version = "v1.15"
+version_menu = "v1.16 (preview)"
+version = "v1.16"
 archived_version = false
 url_latest_version = "https://docs.dapr.io"
 
 [[params.versions]]
-  version = "v1.15 (preview)"
+  version = "v1.16 (preview)"
   url = "#"
 [[params.versions]]
-  version = "v1.14 (latest)"
+  version = "v1.15 (latest)"
   url = "https://docs.dapr.io"
+  [[params.versions]]
+  version = "v1.14"
+  url = "https://v1-14.docs.dapr.io"
 [[params.versions]]
   version = "v1.13"
   url = "https://v1-13.docs.dapr.io"