Move all Flux docs under /flux

New location for /docs/contributing is /contributing Fixes: #1107 Signed-off-by: Daniel Holbach <daniel@weave.works>

Author: Daniel Holbach

.gitignore

@@ -14,7 +14,7 @@ themes/hugo-shortcode-gallery-*
 hugo/
 
 # Imported Flux CLI assets
-content/en/docs/cmd/flux*
+content/en/flux/cmd/flux*
 static/install.sh
 
 # Adopters logos

.stignore

@@ -12,8 +12,8 @@ _tmp
 public/
 # Output of "make theme"
 themes/
-!content/en/docs/components/*/_index.md
-content/en/docs/components/*/*.md
+!content/en/flux/components/*/_index.md
+content/en/flux/components/*/*.md
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

README.md

@@ -8,7 +8,7 @@ This repo houses the assets used to build the Flux project's landing page at <ht
 >
 > Project | Docs Site | Github Source
 > ---------------- | ------------------------------------------| -------------
-> Flux | <https://fluxcd.io/docs> | <https://github.com/fluxcd/website>
+> Flux | <https://fluxcd.io/flux> | <https://github.com/fluxcd/website>
 > Flagger | <https://fluxcd.io/flagger> | <https://github.com/fluxcd/website>
 > Flux (legacy) | <https://fluxcd.io/legacy/flux> | <https://github.com/fluxcd/website>
 > Helm Operator | <https://fluxcd.io/legacy/helm-operator/> | <https://github.com/fluxcd/website>
@@ -17,11 +17,11 @@ This repo houses the assets used to build the Flux project's landing page at <ht
 
 The main landing page of this website can be modified in `config.toml`.
 
-Almost all of the content lives in the `content/en/docs` directory. Here are some special cases.
+Almost all of the content lives in the `content/en/<project>` directories. Here are some special cases.
 
 - `./content/en/blog` contains all blog posts - make sure you update the front-matter for posts to show up correctly.
 - `./external-sources/` defines how files from other repositories are pulled in. We currently do this for Markdown files from the `/fluxcd/community` and `/fluxcd/.github` repositories. (`make gen-content` pulls these in.)
-- Flux CLI docs (`cmd`) and `components` docs: under `./content/en/docs` but pulled in through in `make gen-content` as well.
+- Flux CLI docs (`cmd`) and `components` docs: under `./content/en/flux` but pulled in through in `make gen-content` as well.
 - `/static/_redirects` defines redirects on <https://fluxcd.io>. Check out <https://docs.netlify.com/routing/redirects/> for the syntax definition and how to test if things work.
 
 ## Running the site locally

adopters/1-flux-v2.yaml

@@ -1,7 +1,7 @@
 adopters:
  project: Flux
  description: >
- Check out everything about Flux on our [website](https://fluxcd.io/docs/).
+ Check out everything about Flux on our [website](https://fluxcd.io/flux/).
  companies:
  - name: Weaveworks
  url: https://weave.works

config.toml

@@ -185,7 +185,7 @@ weight = 20
 [[menus.main]]
 name = "Contributing"
 parent = "Project"
-url = "/docs/contributing"
+url = "/contributing"
 weight = 30
 
 [[menus.main]]

content/en/_index.html

@@ -13,7 +13,7 @@
 
 <div class="hero-gitops">
  {{% blocks/hero title="Flux - the GitOps family of projects" color="primary"
- height="full" link_title="Get started" link_url="/docs/get-started/" %}}
+ height="full" link_title="Get started" link_url="/flux/get-started/" %}}
  Flux is a set of continuous and progressive delivery solutions for Kubernetes that are open and extensible.
 
  The latest version of Flux brings many new features, making it more flexible and versatile.
@@ -30,7 +30,7 @@ <h2 id="flux-facts">Flux in short</h2>
  </div>
 </div>
 
-<!-- used in ./content/en/docs/_index.md as well -->
+<!-- used in ./content/en/flux/_index.md as well -->
 
 <div id="feature-list">
 {{% blocks/section color="white" %}}
@@ -49,7 +49,7 @@ <h2 id="flux-facts">Flux in short</h2>
  {{< /blocks/featureitem >}}
 
  {{< blocks/featureitem emoji="🔒" caption="Flux is designed with security in mind" >}}
- Pull vs. Push, least amount of privileges, adherence to Kubernetes security policies and tight integration with security tools and best-practices. Read more about <a href="/docs/security">our security considerations</a>.
+ Pull vs. Push, least amount of privileges, adherence to Kubernetes security policies and tight integration with security tools and best-practices. Read more about <a href="/flux/security">our security considerations</a>.
  {{< /blocks/featureitem >}}
 
  {{< blocks/featureitem emoji="☸️" caption="Flux works with any Kubernetes and all common Kubernetes tooling" >}}
@@ -61,7 +61,7 @@ <h2 id="flux-facts">Flux in short</h2>
  {{< /blocks/featureitem >}}
 
  {{< blocks/featureitem emoji="📞" caption="Flux alerts and notifies" >}}
- Flux provides health assessments, alerting to external systems, and external events handling. Just “git push”, and get notified on Slack and <a href="/docs/components/notification/provider/">other chat systems</a>.
+ Flux provides health assessments, alerting to external systems, and external events handling. Just “git push”, and get notified on Slack and <a href="/flux/components/notification/provider/">other chat systems</a>.
  {{< /blocks/featureitem >}}
 
  {{< blocks/featureitem emoji="👍" caption="Users trust Flux" >}}
@@ -267,8 +267,8 @@ <h2 class="section-label">Other Flux projects</h2>
  <p id="gitops-toolkit"></p>
 {{% blocks/project title="GitOps Toolkit"
  image="/img/building-blocks.svg" image-align="left" bg-color="blue"
- button1-url="/docs/gitops-toolkit/source-watcher/"
- button2-url="/docs/components/" %}}
+ button1-url="/flux/gitops-toolkit/source-watcher/"
+ button2-url="/flux/components/" %}}
 The set of APIs and controllers that make up the runtime for Flux. You can use the GitOps Toolkit to extend Flux, and to build your own systems for continuous delivery.
 {{% /blocks/project %}}
 
@@ -278,7 +278,7 @@ <h2 class="section-label">Other Flux projects</h2>
  button2-url="/legacy/helm-operator/" button2-caption="Helm Operator Documentation" button2-color="blue" %}}
 We owe our success and good reputation as GitOps project to Flux and Helm Operator. They are the v1 iteration of our project and currently in [maintenance mode](https://github.com/fluxcd/flux/issues/3320).
 
-We **strongly advise** everyone to familiarise themselves with the latest version of Flux and [start the process of migrating](/docs/migration/).
+We **strongly advise** everyone to familiarise themselves with the latest version of Flux and [start the process of migrating](/flux/migration/).
 {{% /blocks/project %}}
 
 {{% /blocks/section %}}

content/en/blog/2020-12-01-december-update/index.md

@@ -27,7 +27,7 @@ To get you started with setting up Flux and managing multi-tenant environments,
 
 ## Guides for Helm users
 
-If you have been using the Helm Operator in the past, you should be able to easily upgrade to the Helm Controller (Flux v2). Check out [this guide](/docs/migration/helm-operator-migration/) and please give us feedback - we’d love to hear from you:
+If you have been using the Helm Operator in the past, you should be able to easily upgrade to the Helm Controller (Flux v2). Check out [this guide](/flux/migration/helm-operator-migration/) and please give us feedback - we’d love to hear from you:
 
 If you are interested in an example which describes how you can keep e.g. two clusters updated with minimal duplication, check out this repository - it uses Flux v2, Helm and Kustomize:
 

content/en/blog/2021-01-06-january-update.md

@@ -76,7 +76,7 @@ improvements, it comes with many new features. The highlights are:
 Automated Image Updates
 -----------------------
 
-[Automated Image Updates Guide](/docs/guides/image-update/) (alpha release)
+[Automated Image Updates Guide](/flux/guides/image-update/) (alpha release)
 
 Flux v2 now includes two controllers for automating image updates \--
 one of the controllers is for scanning container image repositories, and
@@ -112,7 +112,7 @@ Azure DevOps users will have to specify to use libgit2 in their
 GitRepository resources.
 
 Follow [the generic git server
-guide](/docs/installation/#generic-git-server)
+guide](/flux/installation/#generic-git-server)
 for further instructions in how to use Flux with Azure DevOps.
 
 Upcoming events
@@ -130,7 +130,7 @@ Upcoming events
 The Flux community is growing and we are in the middle of a quite a few
 big discussions:
 
-- We have [a new guide which explains core concepts](/docs/concepts/) in the Flux world - please give feedback - and thanks Somtochi!
+- We have [a new guide which explains core concepts](/flux/concepts/) in the Flux world - please give feedback - and thanks Somtochi!
 - Flux applies to upgrade to CNCF Incubation status: [https://github.com/cncf/toc/pull/567](https://github.com/cncf/toc/pull/567)
 
 If you like what you read and would like to get involved, here are a few
@@ -139,7 +139,7 @@ good ways to do that:
 - Join our [upcoming dev meeting](/community/#meetings) on Jan 14
 - Talk to us in the \#flux channel on [CNCF Slack](https://slack.cncf.io/)
 - Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
-- And if you are completely new to Flux v2, take a look at our [Get Started guide](/docs/get-started/) and give us feedback
+- And if you are completely new to Flux v2, take a look at our [Get Started guide](/flux/get-started/) and give us feedback
 - Social media: Follow [Flux on Twitter](https://twitter.com/fluxcd), join the discussion in the [Flux LinkedIn group](https://www.linkedin.com/groups/8985374/)
 
 We are looking forward to working with you.

content/en/blog/2021-02-01-february-update.md

@@ -210,7 +210,7 @@ good ways to do that:
 - Talk to us in the \#flux channel on [CNCF Slack](https://slack.cncf.io/)
 - Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
 - And if you are completely new to Flux v2, take a look at our [Get
- Started guide](/docs/get-started/) and give us feedback
+ Started guide](/flux/get-started/) and give us feedback
 - Social media: Follow [Flux on Twitter](https://twitter.com/fluxcd), join the
  discussion in the [Flux LinkedIn group](https://www.linkedin.com/groups/8985374/).
 

content/en/blog/2021-03-01-march-update/index.md

@@ -109,7 +109,7 @@ Capili](https://www.meetup.com/GitOps-Community/events/276539791/)
 > Flux v2.
 >
 > In this session, Leigh Capili, DX Engineer at Weaveworks, will demo
-> the [Flux guide on how to Migrate from Flux v1](/docs/migration/flux-v1-migration/),
+> the [Flux guide on how to Migrate from Flux v1](/flux/migration/flux-v1-migration/),
 > including bootstrapping a cluster with Flux 1 and how to move it over
 > to Flux v2.
 >
@@ -119,9 +119,9 @@ Capili](https://www.meetup.com/GitOps-Community/events/276539791/)
 >
 > Resources:
 >
-> 📍 [Flux v2 Documentation](/docs/)
+> 📍 [Flux v2 Documentation](/flux/)
 >
-> 📍 [Flux v2 Guide Migrate from Flux v1](/docs/migration/flux-v1-migration/)
+> 📍 [Flux v2 Guide Migrate from Flux v1](/flux/migration/flux-v1-migration/)
 >
 > 📍 [Flux v2 roadmap](/roadmap/).
 
@@ -169,7 +169,7 @@ good ways to do that:
 - Talk to us in the `#flux` channel on [CNCF Slack](https://slack.cncf.io/)
 - Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
 - And if you are completely new to Flux v2, take a look at our
- [Get Started guide](/docs/get-started/) and
+ [Get Started guide](/flux/get-started/) and
  give us feedback
 - Social media: Follow [Flux on Twitter](https://twitter.com/fluxcd),
  join the discussion in the [Flux LinkedIn