From 8c0f282ceb78157c33356822344ac00aa13d1d72 Mon Sep 17 00:00:00 2001 From: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com> Date: Tue, 14 May 2024 13:34:55 -0400 Subject: [PATCH 1/4] Add CNCF website guidelines (#1123) * Add copyrights Signed-off-by: Reshma Abdul Rahim * Add trademark Signed-off-by: Reshma Abdul Rahim * Add trademark Signed-off-by: Reshma Abdul Rahim --------- Signed-off-by: Reshma Abdul Rahim --- docs/config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/config.toml b/docs/config.toml index 336a5d2ed..dfe56e69a 100644 --- a/docs/config.toml +++ b/docs/config.toml @@ -66,8 +66,9 @@ tag = "tags" pre = "" [params] -copyright = "Radius" +copyright = "The Radius Authors. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see the https://linuxfoundation.org/trademark-usage/ page." version = "v0.34" +>>>>>>> 69d73a09 (Add CNCF website guidelines (#1123)) tag_version = "latest" chart_version = "0.34.0" From 3fdcdba86d65e6080c6bff9b5efd85bd7f8ec0a8 Mon Sep 17 00:00:00 2001 From: Will <28876888+willtsai@users.noreply.github.com> Date: Fri, 10 May 2024 14:34:50 -0700 Subject: [PATCH 2/4] add new logo types (#1122) Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> --- .../Logos/SVG/radius-icon-black.svg | 16 ++++++ ...ius-Logomark.svg => radius-icon-color.svg} | 0 ...mark-Reverse.svg => radius-icon-white.svg} | 0 .../Logos/SVG/radius-logo-black.svg | 27 ++++++++++ ...{Radius-Logo.svg => radius-logo-color.svg} | 0 ...Logo-Reverse.svg => radius-logo-white.svg} | 0 .../Logos/SVG/radius-logostacked-black.svg | 52 +++++++++++++++++++ .../Logos/SVG/radius-logostacked-color.svg | 52 +++++++++++++++++++ .../Logos/SVG/radius-logostacked-white.svg | 52 +++++++++++++++++++ .../Logos/SVG/radius-logotype-black.svg | 24 +++++++++ ...Logotype.svg => radius-logotype-color.svg} | 0 ...-Reverse.svg => radius-logotype-white.svg} | 0 12 files changed, 223 insertions(+) create mode 100644 presentation-pack/Logos/SVG/radius-icon-black.svg rename presentation-pack/Logos/SVG/{Radius-Logomark.svg => radius-icon-color.svg} (100%) rename presentation-pack/Logos/SVG/{Radius-Logomark-Reverse.svg => radius-icon-white.svg} (100%) create mode 100644 presentation-pack/Logos/SVG/radius-logo-black.svg rename presentation-pack/Logos/SVG/{Radius-Logo.svg => radius-logo-color.svg} (100%) rename presentation-pack/Logos/SVG/{Radius-Logo-Reverse.svg => radius-logo-white.svg} (100%) create mode 100644 presentation-pack/Logos/SVG/radius-logostacked-black.svg create mode 100644 presentation-pack/Logos/SVG/radius-logostacked-color.svg create mode 100644 presentation-pack/Logos/SVG/radius-logostacked-white.svg create mode 100644 presentation-pack/Logos/SVG/radius-logotype-black.svg rename presentation-pack/Logos/SVG/{Radius-Logotype.svg => radius-logotype-color.svg} (100%) rename presentation-pack/Logos/SVG/{Radius-Logotype-Reverse.svg => radius-logotype-white.svg} (100%) diff --git a/presentation-pack/Logos/SVG/radius-icon-black.svg b/presentation-pack/Logos/SVG/radius-icon-black.svg new file mode 100644 index 000000000..1dd93b8a4 --- /dev/null +++ b/presentation-pack/Logos/SVG/radius-icon-black.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/presentation-pack/Logos/SVG/Radius-Logomark.svg b/presentation-pack/Logos/SVG/radius-icon-color.svg similarity index 100% rename from presentation-pack/Logos/SVG/Radius-Logomark.svg rename to presentation-pack/Logos/SVG/radius-icon-color.svg diff --git a/presentation-pack/Logos/SVG/Radius-Logomark-Reverse.svg b/presentation-pack/Logos/SVG/radius-icon-white.svg similarity index 100% rename from presentation-pack/Logos/SVG/Radius-Logomark-Reverse.svg rename to presentation-pack/Logos/SVG/radius-icon-white.svg diff --git a/presentation-pack/Logos/SVG/radius-logo-black.svg b/presentation-pack/Logos/SVG/radius-logo-black.svg new file mode 100644 index 000000000..62bfb4771 --- /dev/null +++ b/presentation-pack/Logos/SVG/radius-logo-black.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation-pack/Logos/SVG/Radius-Logo.svg b/presentation-pack/Logos/SVG/radius-logo-color.svg similarity index 100% rename from presentation-pack/Logos/SVG/Radius-Logo.svg rename to presentation-pack/Logos/SVG/radius-logo-color.svg diff --git a/presentation-pack/Logos/SVG/Radius-Logo-Reverse.svg b/presentation-pack/Logos/SVG/radius-logo-white.svg similarity index 100% rename from presentation-pack/Logos/SVG/Radius-Logo-Reverse.svg rename to presentation-pack/Logos/SVG/radius-logo-white.svg diff --git a/presentation-pack/Logos/SVG/radius-logostacked-black.svg b/presentation-pack/Logos/SVG/radius-logostacked-black.svg new file mode 100644 index 000000000..f405ca4c3 --- /dev/null +++ b/presentation-pack/Logos/SVG/radius-logostacked-black.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation-pack/Logos/SVG/radius-logostacked-color.svg b/presentation-pack/Logos/SVG/radius-logostacked-color.svg new file mode 100644 index 000000000..102754628 --- /dev/null +++ b/presentation-pack/Logos/SVG/radius-logostacked-color.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation-pack/Logos/SVG/radius-logostacked-white.svg b/presentation-pack/Logos/SVG/radius-logostacked-white.svg new file mode 100644 index 000000000..f49083211 --- /dev/null +++ b/presentation-pack/Logos/SVG/radius-logostacked-white.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation-pack/Logos/SVG/radius-logotype-black.svg b/presentation-pack/Logos/SVG/radius-logotype-black.svg new file mode 100644 index 000000000..6a9fd9b2d --- /dev/null +++ b/presentation-pack/Logos/SVG/radius-logotype-black.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation-pack/Logos/SVG/Radius-Logotype.svg b/presentation-pack/Logos/SVG/radius-logotype-color.svg similarity index 100% rename from presentation-pack/Logos/SVG/Radius-Logotype.svg rename to presentation-pack/Logos/SVG/radius-logotype-color.svg diff --git a/presentation-pack/Logos/SVG/Radius-Logotype-Reverse.svg b/presentation-pack/Logos/SVG/radius-logotype-white.svg similarity index 100% rename from presentation-pack/Logos/SVG/Radius-Logotype-Reverse.svg rename to presentation-pack/Logos/SVG/radius-logotype-white.svg From 02bbb16bf257622ccb76e487cb5457fd4916e82c Mon Sep 17 00:00:00 2001 From: Loek Duys Date: Mon, 29 Apr 2024 20:24:05 +0200 Subject: [PATCH 3/4] Update index.md (#1121) Fixed typo `-resource-group myResourceGroup` into `--resource-group myResourceGroup` (added missing `-`) Signed-off-by: Loek Duys --- docs/content/guides/operations/kubernetes/overview/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/guides/operations/kubernetes/overview/index.md b/docs/content/guides/operations/kubernetes/overview/index.md index 0fc231210..d5d67d35e 100644 --- a/docs/content/guides/operations/kubernetes/overview/index.md +++ b/docs/content/guides/operations/kubernetes/overview/index.md @@ -164,7 +164,7 @@ Visit the [Kubernetes docs](https://kubernetes.io/docs/tasks/configure-pod-conta Visit the [Azure docs](https://docs.microsoft.com/azure/aks/cluster-container-registry-integration?tabs=azure-cli)to learn how to configure access to an ACR registry. ```bash -az aks update --name myAKSCluster -resource-group myResourceGroup --subscription mySubscription --attach-acr +az aks update --name myAKSCluster --resource-group myResourceGroup --subscription mySubscription --attach-acr ``` {{% /codetab %}} From 5b35e526d796adfcc9fd348a1fa14dd4492b2aa1 Mon Sep 17 00:00:00 2001 From: Will <28876888+willtsai@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:53:29 -0700 Subject: [PATCH 4/4] Resolve conflicts Signed-off-by: Reshma Abdul Rahim --- .github/workflows/issues.yml | 2 +- docs/config.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 5ac4e9470..e4a5b680b 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -46,4 +46,4 @@ jobs: ado_new_state: 'New' ado_active_state: 'Active' ado_close_state: 'Closed' - ado_wit: 'GitHub Issue' \ No newline at end of file + ado_wit: 'GitHub Issue' diff --git a/docs/config.toml b/docs/config.toml index dfe56e69a..ee9ecb849 100644 --- a/docs/config.toml +++ b/docs/config.toml @@ -68,7 +68,6 @@ tag = "tags" [params] copyright = "The Radius Authors. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see the https://linuxfoundation.org/trademark-usage/ page." version = "v0.34" ->>>>>>> 69d73a09 (Add CNCF website guidelines (#1123)) tag_version = "latest" chart_version = "0.34.0"