From 5104f79ec4ec610233dba4a924aad46fd6a7cef7 Mon Sep 17 00:00:00 2001 From: Ben Williams Date: Mon, 21 Jan 2019 12:52:11 +0000 Subject: [PATCH] updates for sponsor page and replacing use of roadmap with 'futures' in multiple places --- config.toml | 8 +++++++- content/about/_index.md | 2 +- content/about/decisions.md | 2 +- content/about/features.md | 4 ++-- content/contribute/_index.md | 2 +- content/contribute/roadmap.md | 2 +- content/contribute/roadmap.zh.md | 2 +- content/news/changes-11-april-2018.md | 2 +- content/news/changes-27-april-2018.md | 2 +- content/sponsors.md | 23 +++++++++++++++++++++++ static/images/sponsors/cb.svg | 11 +++++++++++ 11 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 content/sponsors.md create mode 100644 static/images/sponsors/cb.svg diff --git a/config.toml b/config.toml index fdea195d39a..4b81edac0ed 100644 --- a/config.toml +++ b/config.toml @@ -345,8 +345,14 @@ anchor = "smart" url = "https://jenkins.io" [[menu.global]] - name = "Security" + name = "Sponsors" weight = 250 + identifier = "sponsors" + url = "/sponsors/" + + [[menu.global]] + name = "Security" + weight = 300 identifier = "security" url = "/security/" diff --git a/content/about/_index.md b/content/about/_index.md index 9e7d5e9fd3d..f2ba861348e 100644 --- a/content/about/_index.md +++ b/content/about/_index.md @@ -1,7 +1,7 @@ --- title: About Jenkins X linktitle: Overview -description: Jenkins X's features, roadmap, license, and motivation. +description: Jenkins X's features, license, and motivation. date: 2018-02-01 publishdate: 2018-02-01 lastmod: 2018-02-01 diff --git a/content/about/decisions.md b/content/about/decisions.md index 7fe0b433d3e..ed143894dfc 100644 --- a/content/about/decisions.md +++ b/content/about/decisions.md @@ -70,7 +70,7 @@ Taking this approach also means we will be able to support other pipeline engine [Prow](https://github.com/kubernetes/test-infra/tree/master/prow) handles Git events and can trigger workflows in Kubernetes. -Prow can run in a highly available mode where multiple pods for a webhook ingress URL. In contrast with Jenkins if you perform an upgrade then Jenkins has some downtime where webhook events can be missed. This is on our roadmap and we hope to be available soon. +Prow can run in a highly available mode where multiple pods for a webhook ingress URL. In contrast with Jenkins if you perform an upgrade then Jenkins has some downtime where webhook events can be missed. This is in our future plans and we hope to be available soon. ## Nexus diff --git a/content/about/features.md b/content/about/features.md index 732aef11acc..55d031c4d73 100644 --- a/content/about/features.md +++ b/content/about/features.md @@ -104,6 +104,6 @@ To install an addon then use the [jx create addon](/commands/jx_create_addon/) c jx create addon grafana ``` -## Roadmap +## Futures - For a look at what features are coming soon please check out the [Jenkins X Roadmap](/contribute/roadmap/) + For a look at what features are coming soon please check out the [Jenkins X Futures](/contribute/roadmap/) diff --git a/content/contribute/_index.md b/content/contribute/_index.md index 0e2dd2d6b1a..a9367be2172 100644 --- a/content/contribute/_index.md +++ b/content/contribute/_index.md @@ -28,5 +28,5 @@ Jenkins X relies heavily on the enthusiasm and participation of the open-source * If you'd like to [contribute to the code](https://jenkins-x.io/contribute/development/) then try browse the [current issues](https://github.com/jenkins-x/jx/issues). * we have marked issues [help wanted](https://github.com/jenkins-x/jx/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) or [good first issue](https://github.com/jenkins-x/jx/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) to save you hunting around too much * in particular we would love help on getting Jenkins X [working well on windows](https://github.com/jenkins-x/jx/issues?q=is%3Aopen+is%3Aissue+label%3Awindows) or the [integrations with cloud services, git providers and issues trackers](https://github.com/jenkins-x/jx/issues?q=is%3Aissue+is%3Aopen+label%3Aintegrations) - * for more long term goals we've the [long term roadmap](https://jenkins-x.io/contribute/roadmap) + * for more long term goals see the [Jenkins X Futures](https://jenkins-x.io/contribute/roadmap) page * we could always use more test cases and to improve test coverage! diff --git a/content/contribute/roadmap.md b/content/contribute/roadmap.md index 82718d52be3..1a4c33254b0 100644 --- a/content/contribute/roadmap.md +++ b/content/contribute/roadmap.md @@ -14,7 +14,7 @@ menu: weight: 20 sections_weight: 20 draft: false -aliases: [/contribute/roadmap/] +aliases: [/contribute/roadmap/,/contribute/futures/] categories: [fundamentals] toc: true --- diff --git a/content/contribute/roadmap.zh.md b/content/contribute/roadmap.zh.md index 2570c10dbb2..5533dbc3206 100644 --- a/content/contribute/roadmap.zh.md +++ b/content/contribute/roadmap.zh.md @@ -14,7 +14,7 @@ menu: weight: 20 sections_weight: 20 draft: false -aliases: [/contribute/roadmap/] +aliases: [/contribute/roadmap/,/contribute/futures/] categories: [fundamentals, 基础] toc: true --- diff --git a/content/news/changes-11-april-2018.md b/content/news/changes-11-april-2018.md index e23b9fb399c..e166563035b 100755 --- a/content/news/changes-11-april-2018.md +++ b/content/news/changes-11-april-2018.md @@ -15,7 +15,7 @@ We announced [Jenkins X](https://jenkins.io/blog/2018/03/19/introducing-jenkins- We've made a lot of progress and improvements! The rest of the blog goes into more detail. - But first I'd like to call out a few specific details from the [Roadmap](/contribute/roadmap/): + But first I'd like to call out a few specific details from the [Jenkins X Futures](/contribute/roadmap/): * we now fully support GitHub and GitHub enterprise. BitBucket cloud and gitea is almost there too. Hopefully BitBucketServer and Gitlab are not too far away either. For more detail see [supporting different git servers](/developing/git/) * For issue tracking we support GitHub, GitHub Enterprise and JIRA. For more detail see [supporting issue trackers](/developing/issues/) diff --git a/content/news/changes-27-april-2018.md b/content/news/changes-27-april-2018.md index 3b42135845e..8106cad5f91 100755 --- a/content/news/changes-27-april-2018.md +++ b/content/news/changes-27-april-2018.md @@ -23,7 +23,7 @@ Here's some of the main highlights: * we now have a much more flexible mechanism of handling Secrets/Credentials so dealing with [other git providers is now much simpler](/contribute/roadmap/) * we finally got lots more [architecture documentation](/architecture/) on how Jenkins X fits together. -The [roadmap has been updated](/contribute/roadmap/) to give a better feel for where we are. +The [Jenkins X Futures page has been updated](/contribute/roadmap/) to give a better feel for where we are. Also if you are going to be at [KubeCon](https://kccnceu18.sched.com/) then please come to the session by [James Strachan on Jenkins X](https://kccnceu18.sched.com/event/Dquk?iframe=no) or pop by the CloudBees both and say hi! diff --git a/content/sponsors.md b/content/sponsors.md new file mode 100644 index 00000000000..9fd25b71704 --- /dev/null +++ b/content/sponsors.md @@ -0,0 +1,23 @@ +--- +title: Jenkins X Sponsors +linktitle: Sponsors +description: +date: 2019-01-21 +publishdate: 2019-01-21 +menu: + main: + weight: 01 +weight: 01 +sections_weight: 5 +draft: false +slug: +toc: true +--- + +We thank the following organizations for their major commitments to support the Jenkins X project + +## CloudBees + + + +* [CloudBees Jenkins X Support](https://www.cloudbees.com/products/jenkins-x-support) \ No newline at end of file diff --git a/static/images/sponsors/cb.svg b/static/images/sponsors/cb.svg new file mode 100644 index 00000000000..2c0a14ff1be --- /dev/null +++ b/static/images/sponsors/cb.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +