diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go
index 56f6287850602a83fa53b719979895114977e198..7ccd49079056d40878b79644c208880fe5295b75 100644
--- a/cmd/flux/bootstrap_github.go
+++ b/cmd/flux/bootstrap_github.go
@@ -47,27 +47,26 @@ the bootstrap command will perform an upgrade if needed.`,
 	Example: `  # Create a GitHub personal access token and export it as an env var
   export GITHUB_TOKEN=<my-token>
 
-  # Run bootstrap for a private repo owned by a GitHub organization
-  flux bootstrap github --owner=<organization> --repository=<repo name>
+  # Run bootstrap for a private repository owned by a GitHub organization
+  flux bootstrap github --owner=<organization> --repository=<repository name>
 
-  # Run bootstrap for a private repo and assign organization teams to it
-  flux bootstrap github --owner=<organization> --repository=<repo name> --team=<team1 slug> --team=<team2 slug>
+  # Run bootstrap for a private repository and assign organization teams to it
+  flux bootstrap github --owner=<organization> --repository=<repository name> --team=<team1 slug> --team=<team2 slug>
 
   # Run bootstrap for a repository path
-  flux bootstrap github --owner=<organization> --repository=<repo name> --path=dev-cluster
+  flux bootstrap github --owner=<organization> --repository=<repository name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  flux bootstrap github --owner=<user> --repository=<repo name> --private=false --personal=true
+  flux bootstrap github --owner=<user> --repository=<repository name> --private=false --personal=true
 
-  # Run bootstrap for a private repo hosted on GitHub Enterprise using SSH auth
-  flux bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain> --ssh-hostname=<domain>
+  # Run bootstrap for a private repository hosted on GitHub Enterprise using SSH auth
+  flux bootstrap github --owner=<organization> --repository=<repository name> --hostname=<domain> --ssh-hostname=<domain>
 
-  # Run bootstrap for a private repo hosted on GitHub Enterprise using HTTPS auth
-  flux bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain> --token-auth
+  # Run bootstrap for a private repository hosted on GitHub Enterprise using HTTPS auth
+  flux bootstrap github --owner=<organization> --repository=<repository name> --hostname=<domain> --token-auth
 
-  # Run bootstrap for a an existing repository with a branch named main
-  flux bootstrap github --owner=<organization> --repository=<repo name> --branch=main
-`,
+  # Run bootstrap for an existing repository with a branch named main
+  flux bootstrap github --owner=<organization> --repository=<repository name> --branch=main`,
 	RunE: bootstrapGitHubCmdRun,
 }
 
@@ -220,7 +219,7 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		logger.Successf("components are up to date")
 	}
 
-	// determine if repo synchronization is working
+	// determine if repository synchronization is working
 	isInstall := shouldInstallManifests(ctx, kubeClient, rootArgs.namespace)
 
 	if isInstall {
@@ -281,7 +280,7 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	// configure repo synchronization
+	// configure repository synchronization
 	logger.Actionf("generating sync manifests")
 	syncManifests, err := generateSyncManifests(
 		repoURL,
diff --git a/cmd/flux/bootstrap_gitlab.go b/cmd/flux/bootstrap_gitlab.go
index 8acf93aa5d1cf2e159e988932d759a5c2e8a3289..f1f3655430a846b424a1bd878d62ea703d4e0cfb 100644
--- a/cmd/flux/bootstrap_gitlab.go
+++ b/cmd/flux/bootstrap_gitlab.go
@@ -49,24 +49,23 @@ the bootstrap command will perform an upgrade if needed.`,
 	Example: `  # Create a GitLab API token and export it as an env var
   export GITLAB_TOKEN=<my-token>
 
-  # Run bootstrap for a private repo using HTTPS token authentication
-  flux bootstrap gitlab --owner=<group> --repository=<repo name> --token-auth
+  # Run bootstrap for a private repository using HTTPS token authentication
+  flux bootstrap gitlab --owner=<group> --repository=<repository name> --token-auth
 
-  # Run bootstrap for a private repo using SSH authentication
-  flux bootstrap gitlab --owner=<group> --repository=<repo name>
+  # Run bootstrap for a private repository using SSH authentication
+  flux bootstrap gitlab --owner=<group> --repository=<repository name>
 
   # Run bootstrap for a repository path
-  flux bootstrap gitlab --owner=<group> --repository=<repo name> --path=dev-cluster
+  flux bootstrap gitlab --owner=<group> --repository=<repository name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  flux bootstrap gitlab --owner=<user> --repository=<repo name> --private=false --personal --token-auth
+  flux bootstrap gitlab --owner=<user> --repository=<repository name> --private=false --personal --token-auth
 
-  # Run bootstrap for a private repo hosted on a GitLab server
-  flux bootstrap gitlab --owner=<group> --repository=<repo name> --hostname=<domain> --token-auth
+  # Run bootstrap for a private repository hosted on a GitLab server
+  flux bootstrap gitlab --owner=<group> --repository=<repository name> --hostname=<domain> --token-auth
 
   # Run bootstrap for a an existing repository with a branch named main
-  flux bootstrap gitlab --owner=<organization> --repository=<repo name> --branch=main --token-auth
-`,
+  flux bootstrap gitlab --owner=<organization> --repository=<repository name> --branch=main --token-auth`,
 	RunE: bootstrapGitLabCmdRun,
 }
 
@@ -207,7 +206,7 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 		logger.Successf("components are up to date")
 	}
 
-	// determine if repo synchronization is working
+	// determine if repository synchronization is working
 	isInstall := shouldInstallManifests(ctx, kubeClient, rootArgs.namespace)
 
 	if isInstall {
@@ -268,7 +267,7 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	// configure repo synchronization
+	// configure repository synchronization
 	logger.Actionf("generating sync manifests")
 	syncManifests, err := generateSyncManifests(
 		repoURL,
diff --git a/cmd/flux/check.go b/cmd/flux/check.go
index da4fca964935bcc8c781cae7075f04f3e616d06f..82af8b885d01289a867b8458ab0f9462acdd7c8a 100644
--- a/cmd/flux/check.go
+++ b/cmd/flux/check.go
@@ -46,8 +46,7 @@ the local environment is configured correctly and if the installed components ar
   flux check --pre
 
   # Run installation checks
-  flux check
-`,
+  flux check`,
 	RunE: runCheckCmd,
 }
 
diff --git a/cmd/flux/completion_bash.go b/cmd/flux/completion_bash.go
index 4bc2a98d52475f40b9693eb5253a53721af5fd5b..42ce075c813a37e4ff55b1e1a0d6f3a16a4b2fd2 100644
--- a/cmd/flux/completion_bash.go
+++ b/cmd/flux/completion_bash.go
@@ -32,8 +32,7 @@ var completionBashCmd = &cobra.Command{
 To configure your bash shell to load completions for each session add to your bashrc
 
 # ~/.bashrc or ~/.profile
-command -v flux >/dev/null && . <(flux completion bash)
-`,
+command -v flux >/dev/null && . <(flux completion bash)`,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenBashCompletion(os.Stdout)
 	},
diff --git a/cmd/flux/completion_fish.go b/cmd/flux/completion_fish.go
index a9d1df7014aa7f8da3652397ad47b1a1c28064ab..b8cb8cf87107e69e71812bfafeaa0035cec34c55 100644
--- a/cmd/flux/completion_fish.go
+++ b/cmd/flux/completion_fish.go
@@ -29,8 +29,7 @@ var completionFishCmd = &cobra.Command{
 
 flux completion fish > ~/.config/fish/completions/flux.fish
 
-See http://fishshell.com/docs/current/index.html#completion-own for more details
-`,
+See http://fishshell.com/docs/current/index.html#completion-own for more details`,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenFishCompletion(os.Stdout, true)
 	},
diff --git a/cmd/flux/completion_powershell.go b/cmd/flux/completion_powershell.go
index e23485d52957f5cb22625d104f6e9daca552ec21..77efd87a99b228ff50861242f9b2931b4765fcf6 100644
--- a/cmd/flux/completion_powershell.go
+++ b/cmd/flux/completion_powershell.go
@@ -39,8 +39,7 @@ flux completion >> flux-completion.ps1
 Linux:
 
 cd "${XDG_CONFIG_HOME:-"$HOME/.config/"}/powershell/modules"
-flux completion >> flux-completions.ps1
-`,
+flux completion >> flux-completions.ps1`,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenPowerShellCompletion(os.Stdout)
 	},
diff --git a/cmd/flux/completion_zsh.go b/cmd/flux/completion_zsh.go
index e2d26ba49d151d99d0b289671a0c19547710ea23..7803af410444c1ec5d12a2b899c3cdccdd698b38 100644
--- a/cmd/flux/completion_zsh.go
+++ b/cmd/flux/completion_zsh.go
@@ -40,8 +40,7 @@ echo "${fpath// /\n}" | grep -i completion
 flux completion zsh > _flux
 
 mv _flux ~/.oh-my-zsh/completions  # oh-my-zsh
-mv _flux ~/.zprezto/modules/completion/external/src/  # zprezto
-`,
+mv _flux ~/.zprezto/modules/completion/external/src/  # zprezto`,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenZshCompletion(os.Stdout)
 	},
diff --git a/cmd/flux/create_alert.go b/cmd/flux/create_alert.go
index 0718d03ab2a2941115fa1e6d35cb8cd8884d9134..3988915e640528198d0e0ffec9fb71500ad48ed3 100644
--- a/cmd/flux/create_alert.go
+++ b/cmd/flux/create_alert.go
@@ -43,8 +43,7 @@ var createAlertCmd = &cobra.Command{
   --event-severity info \
   --event-source Kustomization/flux-system \
   --provider-ref slack \
-  flux-system
-`,
+  flux-system`,
 	RunE: createAlertCmdRun,
 }
 
diff --git a/cmd/flux/create_alertprovider.go b/cmd/flux/create_alertprovider.go
index e9099ed956c7bc9652d50ee228dc20d2a0405ac9..93ac7e898885ea2b2b59ade40ef3fc84ce71ba2a 100644
--- a/cmd/flux/create_alertprovider.go
+++ b/cmd/flux/create_alertprovider.go
@@ -49,8 +49,7 @@ var createAlertProviderCmd = &cobra.Command{
   flux create alert-provider github-podinfo \
   --type github \
   --address https://github.com/stefanprodan/podinfo \
-  --secret-ref github-token
-`,
+  --secret-ref github-token`,
 	RunE: createAlertProviderCmdRun,
 }
 
diff --git a/cmd/flux/create_helmrelease.go b/cmd/flux/create_helmrelease.go
index 11886b7136872713a833ca17cae35d7db04ef743..4db39e4f937a30c88693dfd23186c697f837bf6f 100644
--- a/cmd/flux/create_helmrelease.go
+++ b/cmd/flux/create_helmrelease.go
@@ -96,8 +96,7 @@ var createHelmReleaseCmd = &cobra.Command{
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --values=./values.yaml \
-    --export > podinfo-release.yaml
-`,
+    --export > podinfo-release.yaml`,
 	RunE: createHelmReleaseCmdRun,
 }
 
diff --git a/cmd/flux/create_image.go b/cmd/flux/create_image.go
index 5d98b7c08f5f1e18f84e029d8e3c2d508f85bac4..b64029061e137ffbef3c13d5e14d1a51eecacf91 100644
--- a/cmd/flux/create_image.go
+++ b/cmd/flux/create_image.go
@@ -17,20 +17,17 @@ limitations under the License.
 package main
 
 import (
-	"strings"
-
 	"github.com/spf13/cobra"
 )
 
-const createImageLong = `
-The create image sub-commands work with image automation objects; that is,
+const createImageLong = `The create image sub-commands work with image automation objects; that is,
 object controlling updates to git based on e.g., new container images
 being available.`
 
 var createImageCmd = &cobra.Command{
 	Use:   "image",
 	Short: "Create or update resources dealing with image automation",
-	Long:  strings.TrimSpace(createImageLong),
+	Long:  createImageLong,
 }
 
 func init() {
diff --git a/cmd/flux/create_image_policy.go b/cmd/flux/create_image_policy.go
index 5899b1e361b5db8ffeb02fce352ccf6df68de888..5f8c8ab1c7f2cdf6674338849dbf028b18ee3e27 100644
--- a/cmd/flux/create_image_policy.go
+++ b/cmd/flux/create_image_policy.go
@@ -50,8 +50,7 @@ the status of the object.`,
     --image-ref=podinfo \
     --select-numeric=asc \
 	--filter-regex='^main-[a-f0-9]+-(?P<ts>[0-9]+)' \
-	--filter-extract='$ts'
-`,
+	--filter-extract='$ts'`,
 	RunE: createImagePolicyRun}
 
 type imagePolicyFlags struct {
diff --git a/cmd/flux/create_image_repository.go b/cmd/flux/create_image_repository.go
index 2ef652fc5ff4a049315a0581d193bc4877d47bd5..d8c3b1de355f148c87e71f7bc2deac00482e01df 100644
--- a/cmd/flux/create_image_repository.go
+++ b/cmd/flux/create_image_repository.go
@@ -57,8 +57,7 @@ An ImageRepository object specifies an image repository to scan.`,
     --cert-file client.crt --key-file client.key
   flux create image repository app-repo \
     --cert-secret-ref client-cert \
-    --image registry.example.com/private/app --interval 5m
-`,
+    --image registry.example.com/private/app --interval 5m`,
 	RunE: createImageRepositoryRun,
 }
 
diff --git a/cmd/flux/create_image_update.go b/cmd/flux/create_image_update.go
index e9f637df3652a0fdce017a5db0a6ef6c57e83b7f..59da4e535a40c8c36bd5a41930b7bf2b3582c2c4 100644
--- a/cmd/flux/create_image_update.go
+++ b/cmd/flux/create_image_update.go
@@ -50,8 +50,7 @@ mentioned in YAMLs in a git repository.`,
     --push-branch=image-updates \
     --author-name=flux \
     --author-email=flux@example.com \
-    --commit-template="{{range .Updated.Images}}{{println .}}{{end}}"
-`,
+    --commit-template="{{range .Updated.Images}}{{println .}}{{end}}"`,
 	RunE: createImageUpdateRun,
 }
 
diff --git a/cmd/flux/create_kustomization.go b/cmd/flux/create_kustomization.go
index 650c2854148883e9cfbc87279d9f3428d1730e2a..1ddcfc11bb0fa9768b1f1dafa244b78d31fcd3dd 100644
--- a/cmd/flux/create_kustomization.go
+++ b/cmd/flux/create_kustomization.go
@@ -68,8 +68,7 @@ var createKsCmd = &cobra.Command{
   flux create kustomization secrets \
     --source=Bucket/secrets \
     --prune=true \
-    --interval=5m
-`,
+    --interval=5m`,
 	RunE: createKsCmdRun,
 }
 
diff --git a/cmd/flux/create_receiver.go b/cmd/flux/create_receiver.go
index 9568fd6c5c6ab25b8bdee6c59be2c8ae4d985fe7..6b1f13f6576b4c8f704eb3c50cb1921089319258 100644
--- a/cmd/flux/create_receiver.go
+++ b/cmd/flux/create_receiver.go
@@ -45,8 +45,7 @@ var createReceiverCmd = &cobra.Command{
 	--event push \
 	--secret-ref webhook-token \
 	--resource GitRepository/webapp \
-	--resource HelmRepository/webapp
-`,
+	--resource HelmRepository/webapp`,
 	RunE: createReceiverCmdRun,
 }
 
diff --git a/cmd/flux/create_secret_helm.go b/cmd/flux/create_secret_helm.go
index a7c148031a04cdcf9c929f933fdcb083a07ffeca..77da7a13510ada8e5ed9130e18dffa6b184d3525 100644
--- a/cmd/flux/create_secret_helm.go
+++ b/cmd/flux/create_secret_helm.go
@@ -31,10 +31,8 @@ import (
 var createSecretHelmCmd = &cobra.Command{
 	Use:   "helm [name]",
 	Short: "Create or update a Kubernetes secret for Helm repository authentication",
-	Long: `
-The create secret helm command generates a Kubernetes secret with basic authentication credentials.`,
-	Example: `
-  # Create a Helm authentication secret on disk and encrypt it with Mozilla SOPS
+	Long:  `The create secret helm command generates a Kubernetes secret with basic authentication credentials.`,
+	Example: ` # Create a Helm authentication secret on disk and encrypt it with Mozilla SOPS
   flux create secret helm repo-auth \
     --namespace=my-namespace \
     --username=my-username \
@@ -44,14 +42,13 @@ The create secret helm command generates a Kubernetes secret with basic authenti
   sops --encrypt --encrypted-regex '^(data|stringData)$' \
     --in-place repo-auth.yaml
 
-  # Create an authentication secret using a custom TLS cert
+  # Create a Helm authentication secret using a custom TLS cert
   flux create secret helm repo-auth \
     --username=username \
     --password=password \
     --cert-file=./cert.crt \
     --key-file=./key.crt \
-    --ca-file=./ca.crt
-`,
+    --ca-file=./ca.crt`,
 	RunE: createSecretHelmCmdRun,
 }
 
diff --git a/cmd/flux/create_secret_tls.go b/cmd/flux/create_secret_tls.go
index 69882fa21cba80c215070c3d30a2452fc1b3c6a4..59334af67e19001a7fb950819e4e19315e0271b6 100644
--- a/cmd/flux/create_secret_tls.go
+++ b/cmd/flux/create_secret_tls.go
@@ -32,10 +32,8 @@ import (
 var createSecretTLSCmd = &cobra.Command{
 	Use:   "tls [name]",
 	Short: "Create or update a Kubernetes secret with TLS certificates",
-	Long: `
-The create secret tls command generates a Kubernetes secret with certificates for use with TLS.`,
-	Example: `
-  # Create a TLS secret on disk and encrypt it with Mozilla SOPS.
+	Long:  `The create secret tls command generates a Kubernetes secret with certificates for use with TLS.`,
+	Example: ` # Create a TLS secret on disk and encrypt it with Mozilla SOPS.
   # Files are expected to be PEM-encoded.
   flux create secret tls certs \
     --namespace=my-namespace \
@@ -44,8 +42,7 @@ The create secret tls command generates a Kubernetes secret with certificates fo
     --export > certs.yaml
 
   sops --encrypt --encrypted-regex '^(data|stringData)$' \
-    --in-place certs.yaml
-`,
+    --in-place certs.yaml`,
 	RunE: createSecretTLSCmdRun,
 }
 
diff --git a/cmd/flux/create_source_bucket.go b/cmd/flux/create_source_bucket.go
index 20063017bb7bd7cd72ac5d8faad36707c6990862..d0b67d431c3d3bb1c66f12fa0f112bfc88d9fb55 100644
--- a/cmd/flux/create_source_bucket.go
+++ b/cmd/flux/create_source_bucket.go
@@ -40,10 +40,9 @@ import (
 var createSourceBucketCmd = &cobra.Command{
 	Use:   "bucket [name]",
 	Short: "Create or update a Bucket source",
-	Long: `
-The create source bucket command generates a Bucket resource and waits for it to be downloaded.
+	Long: `The create source bucket command generates a Bucket resource and waits for it to be downloaded.
 For Buckets with static authentication, the credentials are stored in a Kubernetes secret.`,
-	Example: `  # Create a source from a Buckets using static authentication
+	Example: `  # Create a source for a Bucket using static authentication
   flux create source bucket podinfo \
 	--bucket-name=podinfo \
     --endpoint=minio.minio.svc.cluster.local:9000 \
@@ -52,14 +51,13 @@ For Buckets with static authentication, the credentials are stored in a Kubernet
 	--secret-key=mysecretkey \
     --interval=10m
 
-  # Create a source from an Amazon S3 Bucket using IAM authentication
+  # Create a source for an Amazon S3 Bucket using IAM authentication
   flux create source bucket podinfo \
 	--bucket-name=podinfo \
 	--provider=aws \
     --endpoint=s3.amazonaws.com \
 	--region=us-east-1 \
-    --interval=10m
-`,
+    --interval=10m`,
 	RunE: createSourceBucketCmdRun,
 }
 
diff --git a/cmd/flux/create_source_helm.go b/cmd/flux/create_source_helm.go
index 174e7ed996b8654e6d7dc30bbb63d3446a73cfc1..d9cbfdc4b6791ad39495a2bbcfd1a43d13fa23cf 100644
--- a/cmd/flux/create_source_helm.go
+++ b/cmd/flux/create_source_helm.go
@@ -43,27 +43,25 @@ import (
 var createSourceHelmCmd = &cobra.Command{
 	Use:   "helm [name]",
 	Short: "Create or update a HelmRepository source",
-	Long: `
-The create source helm command generates a HelmRepository resource and waits for it to fetch the index.
+	Long: `The create source helm command generates a HelmRepository resource and waits for it to fetch the index.
 For private Helm repositories, the basic authentication credentials are stored in a Kubernetes secret.`,
-	Example: `  # Create a source from a public Helm repository
+	Example: `  # Create a source for a public Helm repository
   flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --interval=10m
 
-  # Create a source from a Helm repository using basic authentication
+  # Create a source for a Helm repository using basic authentication
   flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --username=username \
     --password=password
 
-  # Create a source from a Helm repository using TLS authentication
+  # Create a source for a Helm repository using TLS authentication
   flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --cert-file=./cert.crt \
     --key-file=./key.crt \
-    --ca-file=./ca.crt
-`,
+    --ca-file=./ca.crt`,
 	RunE: createSourceHelmCmdRun,
 }
 
diff --git a/cmd/flux/create_tenant.go b/cmd/flux/create_tenant.go
index 3af59ca03095157564c2bb799e78475dd7d0a98f..7c600329cafa83e3bbfcebce9f43bf558fcdcfeb 100644
--- a/cmd/flux/create_tenant.go
+++ b/cmd/flux/create_tenant.go
@@ -37,8 +37,7 @@ import (
 var createTenantCmd = &cobra.Command{
 	Use:   "tenant",
 	Short: "Create or update a tenant",
-	Long: `
-The create tenant command generates namespaces, service accounts and role bindings to limit the
+	Long: `The create tenant command generates namespaces, service accounts and role bindings to limit the
 reconcilers scope to the tenant namespaces.`,
 	Example: `  # Create a tenant with access to a namespace 
   flux create tenant dev-team \
@@ -49,8 +48,7 @@ reconcilers scope to the tenant namespaces.`,
   flux create tenant dev-team \
     --with-namespace=frontend \
     --with-namespace=backend \
-	--export > dev-team.yaml
-`,
+	--export > dev-team.yaml`,
 	RunE: createTenantCmdRun,
 }
 
diff --git a/cmd/flux/delete_alert.go b/cmd/flux/delete_alert.go
index 6788c28b8f8820237373dc8ff1d05b6428953efe..bbce1356ab680d0ae7c40db438c1020f8f93c410 100644
--- a/cmd/flux/delete_alert.go
+++ b/cmd/flux/delete_alert.go
@@ -26,8 +26,7 @@ var deleteAlertCmd = &cobra.Command{
 	Short: "Delete a Alert resource",
 	Long:  "The delete alert command removes the given Alert from the cluster.",
 	Example: `  # Delete an Alert and the Kubernetes resources created by it
-  flux delete alert main
-`,
+  flux delete alert main`,
 	RunE: deleteCommand{
 		apiType: alertType,
 		object:  universalAdapter{&notificationv1.Alert{}},
diff --git a/cmd/flux/delete_alertprovider.go b/cmd/flux/delete_alertprovider.go
index 8a2e03771e58080ef757f119158ae727e607a9e0..bd24b7b6ef798515f9503df23bcd16205549d88a 100644
--- a/cmd/flux/delete_alertprovider.go
+++ b/cmd/flux/delete_alertprovider.go
@@ -26,8 +26,7 @@ var deleteAlertProviderCmd = &cobra.Command{
 	Short: "Delete a Provider resource",
 	Long:  "The delete alert-provider command removes the given Provider from the cluster.",
 	Example: `  # Delete a Provider and the Kubernetes resources created by it
-  flux delete alert-provider slack
-`,
+  flux delete alert-provider slack`,
 	RunE: deleteCommand{
 		apiType: alertProviderType,
 		object:  universalAdapter{&notificationv1.Provider{}},
diff --git a/cmd/flux/delete_helmrelease.go b/cmd/flux/delete_helmrelease.go
index ee37b5eee71dfb7b21874fb91f7e85a29575ddb5..6d91861ad72cfaf71864f646236481fc57a792b8 100644
--- a/cmd/flux/delete_helmrelease.go
+++ b/cmd/flux/delete_helmrelease.go
@@ -27,8 +27,7 @@ var deleteHelmReleaseCmd = &cobra.Command{
 	Short:   "Delete a HelmRelease resource",
 	Long:    "The delete helmrelease command removes the given HelmRelease from the cluster.",
 	Example: `  # Delete a Helm release and the Kubernetes resources created by it
-  flux delete hr podinfo
-`,
+  flux delete hr podinfo`,
 	RunE: deleteCommand{
 		apiType: helmReleaseType,
 		object:  universalAdapter{&helmv2.HelmRelease{}},
diff --git a/cmd/flux/delete_image_policy.go b/cmd/flux/delete_image_policy.go
index e586c67d018945e29ac85574521338912e6d3a91..bf4f5ad5305e400eed953a34f4eae83fe4eda555 100644
--- a/cmd/flux/delete_image_policy.go
+++ b/cmd/flux/delete_image_policy.go
@@ -27,8 +27,7 @@ var deleteImagePolicyCmd = &cobra.Command{
 	Short: "Delete an ImagePolicy object",
 	Long:  "The delete image policy command deletes the given ImagePolicy from the cluster.",
 	Example: `  # Delete an image policy
-  flux delete image policy alpine3.x
-`,
+  flux delete image policy alpine3.x`,
 	RunE: deleteCommand{
 		apiType: imagePolicyType,
 		object:  universalAdapter{&imagev1.ImagePolicy{}},
diff --git a/cmd/flux/delete_image_repository.go b/cmd/flux/delete_image_repository.go
index 0038fb96e5e31f48de07fa99f18d48044d87f452..6b1d50beb1272681ecf6d8144f5a209c0a6b14a9 100644
--- a/cmd/flux/delete_image_repository.go
+++ b/cmd/flux/delete_image_repository.go
@@ -27,8 +27,7 @@ var deleteImageRepositoryCmd = &cobra.Command{
 	Short: "Delete an ImageRepository object",
 	Long:  "The delete image repository command deletes the given ImageRepository from the cluster.",
 	Example: `  # Delete an image repository
-  flux delete image repository alpine
-`,
+  flux delete image repository alpine`,
 	RunE: deleteCommand{
 		apiType: imageRepositoryType,
 		object:  universalAdapter{&imagev1.ImageRepository{}},
diff --git a/cmd/flux/delete_image_update.go b/cmd/flux/delete_image_update.go
index a5281152cd1d5663a29b63fd2858cebd9ff97dcc..f419aa2c1ba396312552387e2986bd3eea676485 100644
--- a/cmd/flux/delete_image_update.go
+++ b/cmd/flux/delete_image_update.go
@@ -27,8 +27,7 @@ var deleteImageUpdateCmd = &cobra.Command{
 	Short: "Delete an ImageUpdateAutomation object",
 	Long:  "The delete image update command deletes the given ImageUpdateAutomation from the cluster.",
 	Example: `  # Delete an image update automation
-  flux delete image update latest-images
-`,
+  flux delete image update latest-images`,
 	RunE: deleteCommand{
 		apiType: imageUpdateAutomationType,
 		object:  universalAdapter{&autov1.ImageUpdateAutomation{}},
diff --git a/cmd/flux/delete_kustomization.go b/cmd/flux/delete_kustomization.go
index 7e1ee3a56fdd3b3cecf6d5f8894a5d0e51c82e0e..8be71f41915794694e2be8af913d483fe96addcc 100644
--- a/cmd/flux/delete_kustomization.go
+++ b/cmd/flux/delete_kustomization.go
@@ -27,8 +27,7 @@ var deleteKsCmd = &cobra.Command{
 	Short:   "Delete a Kustomization resource",
 	Long:    "The delete kustomization command deletes the given Kustomization from the cluster.",
 	Example: `  # Delete a kustomization and the Kubernetes resources created by it
-  flux delete kustomization podinfo
-`,
+  flux delete kustomization podinfo`,
 	RunE: deleteCommand{
 		apiType: kustomizationType,
 		object:  universalAdapter{&kustomizev1.Kustomization{}},
diff --git a/cmd/flux/delete_receiver.go b/cmd/flux/delete_receiver.go
index 489640ba6aa5a7a9c7d545d7b963b205dabab497..11f45192ad4b4c52086c8ef0a1e20e21a3240c7d 100644
--- a/cmd/flux/delete_receiver.go
+++ b/cmd/flux/delete_receiver.go
@@ -26,8 +26,7 @@ var deleteReceiverCmd = &cobra.Command{
 	Short: "Delete a Receiver resource",
 	Long:  "The delete receiver command removes the given Receiver from the cluster.",
 	Example: `  # Delete an Receiver and the Kubernetes resources created by it
-  flux delete receiver main
-`,
+  flux delete receiver main`,
 	RunE: deleteCommand{
 		apiType: receiverType,
 		object:  universalAdapter{&notificationv1.Receiver{}},
diff --git a/cmd/flux/delete_source_bucket.go b/cmd/flux/delete_source_bucket.go
index ee1bdd2402a137bb154d81f3811f761c3c97fd14..2c19e729cdf0047680460d565d7700205321c105 100644
--- a/cmd/flux/delete_source_bucket.go
+++ b/cmd/flux/delete_source_bucket.go
@@ -26,8 +26,7 @@ var deleteSourceBucketCmd = &cobra.Command{
 	Short: "Delete a Bucket source",
 	Long:  "The delete source bucket command deletes the given Bucket from the cluster.",
 	Example: `  # Delete a Bucket source
-  flux delete source bucket podinfo
-`,
+  flux delete source bucket podinfo`,
 	RunE: deleteCommand{
 		apiType: bucketType,
 		object:  universalAdapter{&sourcev1.Bucket{}},
diff --git a/cmd/flux/delete_source_git.go b/cmd/flux/delete_source_git.go
index b7cbb7b876b5aaed73b0a32c26d81d1ac2449ebf..c512367280ef172d4408a896439f5690a7689f60 100644
--- a/cmd/flux/delete_source_git.go
+++ b/cmd/flux/delete_source_git.go
@@ -26,8 +26,7 @@ var deleteSourceGitCmd = &cobra.Command{
 	Short: "Delete a GitRepository source",
 	Long:  "The delete source git command deletes the given GitRepository from the cluster.",
 	Example: `  # Delete a Git repository
-  flux delete source git podinfo
-`,
+  flux delete source git podinfo`,
 	RunE: deleteCommand{
 		apiType: gitRepositoryType,
 		object:  universalAdapter{&sourcev1.GitRepository{}},
diff --git a/cmd/flux/delete_source_helm.go b/cmd/flux/delete_source_helm.go
index a744eaae7e7592619644e1dd6904b686501ccdb5..b6e9eff3cec11a6845b1eab1e35a902261759ce4 100644
--- a/cmd/flux/delete_source_helm.go
+++ b/cmd/flux/delete_source_helm.go
@@ -26,8 +26,7 @@ var deleteSourceHelmCmd = &cobra.Command{
 	Short: "Delete a HelmRepository source",
 	Long:  "The delete source helm command deletes the given HelmRepository from the cluster.",
 	Example: `  # Delete a Helm repository
-  flux delete source helm podinfo
-`,
+  flux delete source helm podinfo`,
 	RunE: deleteCommand{
 		apiType: helmRepositoryType,
 		object:  universalAdapter{&sourcev1.HelmRepository{}},
diff --git a/cmd/flux/export_alert.go b/cmd/flux/export_alert.go
index cbb45fa7edaedd1aaec6fb0da7469e289da702cb..074a43e17a0f27b971267276c3f8f55967ef7b3c 100644
--- a/cmd/flux/export_alert.go
+++ b/cmd/flux/export_alert.go
@@ -30,8 +30,7 @@ var exportAlertCmd = &cobra.Command{
   flux export alert --all > alerts.yaml
 
   # Export a Alert
-  flux export alert main > main.yaml
-`,
+  flux export alert main > main.yaml`,
 	RunE: exportCommand{
 		object: alertAdapter{&notificationv1.Alert{}},
 		list:   alertListAdapter{&notificationv1.AlertList{}},
diff --git a/cmd/flux/export_alertprovider.go b/cmd/flux/export_alertprovider.go
index f144dd93afa7c0445c1a6bfd3548fa272fbd3cc5..4288107e66499f072fc8c9e65211cd2ebb1358cd 100644
--- a/cmd/flux/export_alertprovider.go
+++ b/cmd/flux/export_alertprovider.go
@@ -30,8 +30,7 @@ var exportAlertProviderCmd = &cobra.Command{
   flux export alert-provider --all > alert-providers.yaml
 
   # Export a Provider
-  flux export alert-provider slack > slack.yaml
-`,
+  flux export alert-provider slack > slack.yaml`,
 	RunE: exportCommand{
 		object: alertProviderAdapter{&notificationv1.Provider{}},
 		list:   alertProviderListAdapter{&notificationv1.ProviderList{}},
diff --git a/cmd/flux/export_helmrelease.go b/cmd/flux/export_helmrelease.go
index fb19b6594cc616acef20dfb2a2674d680d2f5676..2a5d90bb997fab5a2b38c2518158061be116a7ff 100644
--- a/cmd/flux/export_helmrelease.go
+++ b/cmd/flux/export_helmrelease.go
@@ -31,8 +31,7 @@ var exportHelmReleaseCmd = &cobra.Command{
   flux export helmrelease --all > kustomizations.yaml
 
   # Export a HelmRelease
-  flux export hr my-app > app-release.yaml
-`,
+  flux export hr my-app > app-release.yaml`,
 	RunE: exportCommand{
 		object: helmReleaseAdapter{&helmv2.HelmRelease{}},
 		list:   helmReleaseListAdapter{&helmv2.HelmReleaseList{}},
diff --git a/cmd/flux/export_image_policy.go b/cmd/flux/export_image_policy.go
index 3ee55f2e2726537365ac8b15bd8b94460bd6a961..6eb546bb0794bb50b6b56ad535f5dc90b3dc1dc0 100644
--- a/cmd/flux/export_image_policy.go
+++ b/cmd/flux/export_image_policy.go
@@ -31,8 +31,7 @@ var exportImagePolicyCmd = &cobra.Command{
   flux export image policy --all > image-policies.yaml
 
   # Export a specific policy
-  flux export image policy alpine1x > alpine1x.yaml
-`,
+  flux export image policy alpine1x > alpine1x.yaml`,
 	RunE: exportCommand{
 		object: imagePolicyAdapter{&imagev1.ImagePolicy{}},
 		list:   imagePolicyListAdapter{&imagev1.ImagePolicyList{}},
diff --git a/cmd/flux/export_image_repository.go b/cmd/flux/export_image_repository.go
index 25c6e96c15b85be43a044fabb071a2727c8f944d..6f9484f8d199a3a984a4ec7a3151bbdc709d6229 100644
--- a/cmd/flux/export_image_repository.go
+++ b/cmd/flux/export_image_repository.go
@@ -31,8 +31,7 @@ var exportImageRepositoryCmd = &cobra.Command{
   flux export image repository --all > image-repositories.yaml
 
   # Export a specific ImageRepository resource
-  flux export image repository alpine > alpine.yaml
-`,
+  flux export image repository alpine > alpine.yaml`,
 	RunE: exportCommand{
 		object: imageRepositoryAdapter{&imagev1.ImageRepository{}},
 		list:   imageRepositoryListAdapter{&imagev1.ImageRepositoryList{}},
diff --git a/cmd/flux/export_image_update.go b/cmd/flux/export_image_update.go
index 21f89d360ffcc1c8250d90126d8cd75621cef7ba..761ad2f1a0831503960aada0f3938df437878db5 100644
--- a/cmd/flux/export_image_update.go
+++ b/cmd/flux/export_image_update.go
@@ -31,8 +31,7 @@ var exportImageUpdateCmd = &cobra.Command{
   flux export image update --all > updates.yaml
 
   # Export a specific automation
-  flux export image update latest-images > latest.yaml
-`,
+  flux export image update latest-images > latest.yaml`,
 	RunE: exportCommand{
 		object: imageUpdateAutomationAdapter{&autov1.ImageUpdateAutomation{}},
 		list:   imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{}},
diff --git a/cmd/flux/export_kustomization.go b/cmd/flux/export_kustomization.go
index 393244431057c04223dded93ff1ff3977b0bb366..7ff3fa825f7e7fb29fded9adabd7a859ae49ba9c 100644
--- a/cmd/flux/export_kustomization.go
+++ b/cmd/flux/export_kustomization.go
@@ -31,8 +31,7 @@ var exportKsCmd = &cobra.Command{
   flux export kustomization --all > kustomizations.yaml
 
   # Export a Kustomization
-  flux export kustomization my-app > kustomization.yaml
-`,
+  flux export kustomization my-app > kustomization.yaml`,
 	RunE: exportCommand{
 		object: kustomizationAdapter{&kustomizev1.Kustomization{}},
 		list:   kustomizationListAdapter{&kustomizev1.KustomizationList{}},
diff --git a/cmd/flux/export_receiver.go b/cmd/flux/export_receiver.go
index 771ceb587a43085a16b9e114c6d4e35499c53d89..4a798ebf686e68e82ff672f971a96c6ea12620d9 100644
--- a/cmd/flux/export_receiver.go
+++ b/cmd/flux/export_receiver.go
@@ -30,8 +30,7 @@ var exportReceiverCmd = &cobra.Command{
   flux export receiver --all > receivers.yaml
 
   # Export a Receiver
-  flux export receiver main > main.yaml
-`,
+  flux export receiver main > main.yaml`,
 	RunE: exportCommand{
 		list:   receiverListAdapter{&notificationv1.ReceiverList{}},
 		object: receiverAdapter{&notificationv1.Receiver{}},
diff --git a/cmd/flux/export_source_bucket.go b/cmd/flux/export_source_bucket.go
index 8e8c245bf490cc86210d69f8c373fcdc222e44fe..6d9652df167fa9c8252d40bced760a97ad234273 100644
--- a/cmd/flux/export_source_bucket.go
+++ b/cmd/flux/export_source_bucket.go
@@ -31,8 +31,7 @@ var exportSourceBucketCmd = &cobra.Command{
   flux export source bucket --all > sources.yaml
 
   # Export a Bucket source including the static credentials
-  flux export source bucket my-bucket --with-credentials > source.yaml
-`,
+  flux export source bucket my-bucket --with-credentials > source.yaml`,
 	RunE: exportWithSecretCommand{
 		list:   bucketListAdapter{&sourcev1.BucketList{}},
 		object: bucketAdapter{&sourcev1.Bucket{}},
diff --git a/cmd/flux/export_source_git.go b/cmd/flux/export_source_git.go
index ebe2352d82d69a33e497b10d3c552cbb942afbd3..aeda9cd8fbb3c658681aa6136794e01c6093c6c1 100644
--- a/cmd/flux/export_source_git.go
+++ b/cmd/flux/export_source_git.go
@@ -31,8 +31,7 @@ var exportSourceGitCmd = &cobra.Command{
   flux export source git --all > sources.yaml
 
   # Export a GitRepository source including the SSH key pair or basic auth credentials
-  flux export source git my-private-repo --with-credentials > source.yaml
-`,
+  flux export source git my-private-repo --with-credentials > source.yaml`,
 	RunE: exportWithSecretCommand{
 		object: gitRepositoryAdapter{&sourcev1.GitRepository{}},
 		list:   gitRepositoryListAdapter{&sourcev1.GitRepositoryList{}},
diff --git a/cmd/flux/export_source_helm.go b/cmd/flux/export_source_helm.go
index 53f79ae77181465fdfc5daf588de3039f729817c..e12d1f8072116d7319f0dd4e02690a1a23ab7aa2 100644
--- a/cmd/flux/export_source_helm.go
+++ b/cmd/flux/export_source_helm.go
@@ -31,8 +31,7 @@ var exportSourceHelmCmd = &cobra.Command{
   flux export source helm --all > sources.yaml
 
   # Export a HelmRepository source including the basic auth credentials
-  flux export source helm my-private-repo --with-credentials > source.yaml
-`,
+  flux export source helm my-private-repo --with-credentials > source.yaml`,
 	RunE: exportWithSecretCommand{
 		list:   helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{}},
 		object: helmRepositoryAdapter{&sourcev1.HelmRepository{}},
diff --git a/cmd/flux/get_alert.go b/cmd/flux/get_alert.go
index e6c4a615ae15af27e6330b35ef4779898c16f848..279dd60245bd7f69610ac953659891ee729d05bd 100644
--- a/cmd/flux/get_alert.go
+++ b/cmd/flux/get_alert.go
@@ -30,8 +30,7 @@ var getAlertCmd = &cobra.Command{
 	Short:   "Get Alert statuses",
 	Long:    "The get alert command prints the statuses of the resources.",
 	Example: `  # List all Alerts and their status
-  flux get alerts
-`,
+  flux get alerts`,
 	RunE: getCommand{
 		apiType: alertType,
 		list:    &alertListAdapter{&notificationv1.AlertList{}},
diff --git a/cmd/flux/get_alertprovider.go b/cmd/flux/get_alertprovider.go
index f0c5b8fed8f2c00efddaf187c2c3d10838ef8d1a..6a7756d0b8927568464ccd17cfd1c0f1709e7400 100644
--- a/cmd/flux/get_alertprovider.go
+++ b/cmd/flux/get_alertprovider.go
@@ -27,8 +27,7 @@ var getAlertProviderCmd = &cobra.Command{
 	Short:   "Get Provider statuses",
 	Long:    "The get alert-provider command prints the statuses of the resources.",
 	Example: `  # List all Providers and their status
-  flux get alert-providers
-`,
+  flux get alert-providers`,
 	RunE: getCommand{
 		apiType: alertProviderType,
 		list:    alertProviderListAdapter{&notificationv1.ProviderList{}},
diff --git a/cmd/flux/get_helmrelease.go b/cmd/flux/get_helmrelease.go
index b88c1cab9250b7d3fbaa3b3b2177e990f312a348..8737b93fa51fccbb76a676eee99718ef7771ade3 100644
--- a/cmd/flux/get_helmrelease.go
+++ b/cmd/flux/get_helmrelease.go
@@ -30,8 +30,7 @@ var getHelmReleaseCmd = &cobra.Command{
 	Short:   "Get HelmRelease statuses",
 	Long:    "The get helmreleases command prints the statuses of the resources.",
 	Example: `  # List all Helm releases and their status
-  flux get helmreleases
-`,
+  flux get helmreleases`,
 	RunE: getCommand{
 		apiType: helmReleaseType,
 		list:    &helmReleaseListAdapter{&helmv2.HelmReleaseList{}},
diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go
index d934f186a1aa7c61324ea69d1a62b3a9c453b137..79162beb0a37e73811c4dcebbc6baffa13d4150d 100644
--- a/cmd/flux/get_image_all.go
+++ b/cmd/flux/get_image_all.go
@@ -30,8 +30,7 @@ var getImageAllCmd = &cobra.Command{
   flux get images all --namespace=flux-system
 
   # List all image objects in all namespaces
-  flux get images all --all-namespaces
-`,
+  flux get images all --all-namespaces`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		c := getCommand{
 			apiType: imageRepositoryType,
diff --git a/cmd/flux/get_image_policy.go b/cmd/flux/get_image_policy.go
index a999b74e344575541f54aee3c547fdfc9c574dd4..0d010528f8041ebefc2cb2f4b43ba5ae6ff0c6c5 100644
--- a/cmd/flux/get_image_policy.go
+++ b/cmd/flux/get_image_policy.go
@@ -30,8 +30,7 @@ var getImagePolicyCmd = &cobra.Command{
   flux get image policy
 
  # List image policies from all namespaces
-  flux get image policy --all-namespaces
-`,
+  flux get image policy --all-namespaces`,
 	RunE: getCommand{
 		apiType: imagePolicyType,
 		list:    &imagePolicyListAdapter{&imagev1.ImagePolicyList{}},
diff --git a/cmd/flux/get_image_repository.go b/cmd/flux/get_image_repository.go
index 1e643153322ad57b40fbd5c9dcdf65de4ce9bec6..707d01a2c12ce469a91d48a61e8ce1c69c551ed6 100644
--- a/cmd/flux/get_image_repository.go
+++ b/cmd/flux/get_image_repository.go
@@ -34,8 +34,7 @@ var getImageRepositoryCmd = &cobra.Command{
   flux get image repository
 
  # List image repositories from all namespaces
-  flux get image repository --all-namespaces
-`,
+  flux get image repository --all-namespaces`,
 	RunE: getCommand{
 		apiType: imageRepositoryType,
 		list:    imageRepositoryListAdapter{&imagev1.ImageRepositoryList{}},
diff --git a/cmd/flux/get_image_update.go b/cmd/flux/get_image_update.go
index fc96e4f2a3868ac909698256dc56250bf91626d9..a2aae04a0c99f094cde192717a6d9fd0393acd50 100644
--- a/cmd/flux/get_image_update.go
+++ b/cmd/flux/get_image_update.go
@@ -34,8 +34,7 @@ var getImageUpdateCmd = &cobra.Command{
   flux get image update
 
  # List image update automations from all namespaces
-  flux get image update --all-namespaces
-`,
+  flux get image update --all-namespaces`,
 	RunE: getCommand{
 		apiType: imageUpdateAutomationType,
 		list:    &imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{}},
diff --git a/cmd/flux/get_kustomization.go b/cmd/flux/get_kustomization.go
index c5b9e4f4e25e9062035bc8ff6ea90e1926f9c021..570b428e30d5b825a5363e525d37d11ba177ecd8 100644
--- a/cmd/flux/get_kustomization.go
+++ b/cmd/flux/get_kustomization.go
@@ -30,8 +30,7 @@ var getKsCmd = &cobra.Command{
 	Short:   "Get Kustomization statuses",
 	Long:    "The get kustomizations command prints the statuses of the resources.",
 	Example: `  # List all kustomizations and their status
-  flux get kustomizations
-`,
+  flux get kustomizations`,
 	RunE: getCommand{
 		apiType: kustomizationType,
 		list:    &kustomizationListAdapter{&kustomizev1.KustomizationList{}},
diff --git a/cmd/flux/get_receiver.go b/cmd/flux/get_receiver.go
index d58ced0cc47415f345a363a6c68b6a4e2362dde6..7009458f13e98859f91fad79be6a538c303b4c5b 100644
--- a/cmd/flux/get_receiver.go
+++ b/cmd/flux/get_receiver.go
@@ -30,8 +30,7 @@ var getReceiverCmd = &cobra.Command{
 	Short:   "Get Receiver statuses",
 	Long:    "The get receiver command prints the statuses of the resources.",
 	Example: `  # List all Receiver and their status
-  flux get receivers
-`,
+  flux get receivers`,
 	RunE: getCommand{
 		apiType: receiverType,
 		list:    receiverListAdapter{&notificationv1.ReceiverList{}},
diff --git a/cmd/flux/get_source_all.go b/cmd/flux/get_source_all.go
index 26fa22618df9348ab0ab3f2a2c9b042f5802e9d0..8a64725ead17936d75a37a5160f4479efab69e20 100644
--- a/cmd/flux/get_source_all.go
+++ b/cmd/flux/get_source_all.go
@@ -29,8 +29,7 @@ var getSourceAllCmd = &cobra.Command{
   flux get sources all --namespace=flux-system
 
   # List all sources in all namespaces
-  flux get sources all --all-namespaces
-`,
+  flux get sources all --all-namespaces`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		c := getCommand{
 			apiType: bucketType,
diff --git a/cmd/flux/get_source_bucket.go b/cmd/flux/get_source_bucket.go
index f141a3db161529416ca392bfcd9fa72816173706..f487d2d3e291c2eac8f5e6145be41424b0d188fc 100644
--- a/cmd/flux/get_source_bucket.go
+++ b/cmd/flux/get_source_bucket.go
@@ -32,8 +32,7 @@ var getSourceBucketCmd = &cobra.Command{
   flux get sources bucket
 
  # List buckets from all namespaces
-  flux get sources helm --all-namespaces
-`,
+  flux get sources helm --all-namespaces`,
 	RunE: getCommand{
 		apiType: bucketType,
 		list:    &bucketListAdapter{&sourcev1.BucketList{}},
diff --git a/cmd/flux/get_source_chart.go b/cmd/flux/get_source_chart.go
index c2763d03faf9e7b1810c57041898a90b507ef5a5..4e06acbcd1bfc9f8e4a20b4f36383f9f174065be 100644
--- a/cmd/flux/get_source_chart.go
+++ b/cmd/flux/get_source_chart.go
@@ -32,8 +32,7 @@ var getSourceHelmChartCmd = &cobra.Command{
   flux get sources chart
 
  # List Helm charts from all namespaces
-  flux get sources chart --all-namespaces
-`,
+  flux get sources chart --all-namespaces`,
 	RunE: getCommand{
 		apiType: helmChartType,
 		list:    &helmChartListAdapter{&sourcev1.HelmChartList{}},
diff --git a/cmd/flux/get_source_git.go b/cmd/flux/get_source_git.go
index c81162fb17386824ff66ed8b4ef40b16718a6f0b..f75982d05b86350ab241b355970c880d4fda32a0 100644
--- a/cmd/flux/get_source_git.go
+++ b/cmd/flux/get_source_git.go
@@ -32,8 +32,7 @@ var getSourceGitCmd = &cobra.Command{
   flux get sources git
 
  # List Git repositories from all namespaces
-  flux get sources git --all-namespaces
-`,
+  flux get sources git --all-namespaces`,
 	RunE: getCommand{
 		apiType: gitRepositoryType,
 		list:    &gitRepositoryListAdapter{&sourcev1.GitRepositoryList{}},
diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go
index 5da8aa5687f5d3839ea70d4b8efefb69414bc562..63f22d8351116c0f375a4a02eeb9bd1c98b96b17 100644
--- a/cmd/flux/get_source_helm.go
+++ b/cmd/flux/get_source_helm.go
@@ -32,8 +32,7 @@ var getSourceHelmCmd = &cobra.Command{
   flux get sources helm
 
  # List Helm repositories from all namespaces
-  flux get sources helm --all-namespaces
-`,
+  flux get sources helm --all-namespaces`,
 	RunE: getCommand{
 		apiType: helmRepositoryType,
 		list:    &helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{}},
diff --git a/cmd/flux/install.go b/cmd/flux/install.go
index fbbc586b7078c84c0aa192cf11df7f14fde97e2d..75715fa6c4fb13d89c12b6c0ffbb3dc1742d01cc 100644
--- a/cmd/flux/install.go
+++ b/cmd/flux/install.go
@@ -51,8 +51,7 @@ If a previous version is installed, then an in-place upgrade will be performed.`
   flux install --dry-run --verbose
 
   # Write install manifests to file
-  flux install --export > flux-system.yaml
-`,
+  flux install --export > flux-system.yaml`,
 	RunE: installCmdRun,
 }
 
diff --git a/cmd/flux/main.go b/cmd/flux/main.go
index c86a94d4101e56d1760947ef7764fd63f79b2e3d..9295e83ea3ea7eb6daf56a62d46e666a44c10497 100644
--- a/cmd/flux/main.go
+++ b/cmd/flux/main.go
@@ -36,14 +36,15 @@ var rootCmd = &cobra.Command{
 	SilenceUsage:  true,
 	SilenceErrors: true,
 	Short:         "Command line utility for assembling Kubernetes CD pipelines",
-	Long:          `Command line utility for assembling Kubernetes CD pipelines the GitOps way.`,
+	Long: `
+Command line utility for assembling Kubernetes CD pipelines the GitOps way.`,
 	Example: `  # Check prerequisites
   flux check --pre
 
   # Install the latest version of Flux
   flux install --version=master
 
-  # Create a source from a public Git repository
+  # Create a source for a public Git repository
   flux create source git webapp-latest \
     --url=https://github.com/stefanprodan/podinfo \
     --branch=master \
@@ -88,8 +89,7 @@ var rootCmd = &cobra.Command{
   flux delete source git webapp-latest
 
   # Uninstall Flux and delete CRDs
-  flux uninstall
-`,
+  flux uninstall`,
 }
 
 var logger = stderrLogger{stderr: os.Stderr}
diff --git a/cmd/flux/reconcile_alert.go b/cmd/flux/reconcile_alert.go
index d210685a74a12f04edb22b6b629d6b731cd39bdc..e5930bb6a8969b03ffa51e703395b2f42d33d353 100644
--- a/cmd/flux/reconcile_alert.go
+++ b/cmd/flux/reconcile_alert.go
@@ -36,8 +36,7 @@ var reconcileAlertCmd = &cobra.Command{
 	Short: "Reconcile an Alert",
 	Long:  `The reconcile alert command triggers a reconciliation of an Alert resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing alert
-  flux reconcile alert main
-`,
+  flux reconcile alert main`,
 	RunE: reconcileAlertCmdRun,
 }
 
diff --git a/cmd/flux/reconcile_alertprovider.go b/cmd/flux/reconcile_alertprovider.go
index 70644db412bd41982d6216f8e63e02ac041de52c..14d6f3793142ad5c32556c8f9d39ad33fdb486f5 100644
--- a/cmd/flux/reconcile_alertprovider.go
+++ b/cmd/flux/reconcile_alertprovider.go
@@ -36,8 +36,7 @@ var reconcileAlertProviderCmd = &cobra.Command{
 	Short: "Reconcile a Provider",
 	Long:  `The reconcile alert-provider command triggers a reconciliation of a Provider resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing provider
-  flux reconcile alert-provider slack
-`,
+  flux reconcile alert-provider slack`,
 	RunE: reconcileAlertProviderCmdRun,
 }
 
diff --git a/cmd/flux/reconcile_helmrelease.go b/cmd/flux/reconcile_helmrelease.go
index 5d9195827e78503d284685897c310de46d0cefc5..9cc73d029ef38e0d8e909c7046c209e783fa1239 100644
--- a/cmd/flux/reconcile_helmrelease.go
+++ b/cmd/flux/reconcile_helmrelease.go
@@ -46,8 +46,7 @@ The reconcile kustomization command triggers a reconciliation of a HelmRelease r
   flux reconcile hr podinfo
 
   # Trigger a reconciliation of the HelmRelease's source and apply changes
-  flux reconcile hr podinfo --with-source
-`,
+  flux reconcile hr podinfo --with-source`,
 	RunE: reconcileHrCmdRun,
 }
 
diff --git a/cmd/flux/reconcile_image_repository.go b/cmd/flux/reconcile_image_repository.go
index e7a2d888808bd931235395969a31de213b29f5a3..0c4ceacaf927b5a5fea33d118592d8c7d90d4962 100644
--- a/cmd/flux/reconcile_image_repository.go
+++ b/cmd/flux/reconcile_image_repository.go
@@ -29,8 +29,7 @@ var reconcileImageRepositoryCmd = &cobra.Command{
 	Short: "Reconcile an ImageRepository",
 	Long:  `The reconcile image repository command triggers a reconciliation of an ImageRepository resource and waits for it to finish.`,
 	Example: `  # Trigger an scan for an existing image repository
-  flux reconcile image repository alpine
-`,
+  flux reconcile image repository alpine`,
 	RunE: reconcileCommand{
 		apiType: imageRepositoryType,
 		object:  imageRepositoryAdapter{&imagev1.ImageRepository{}},
diff --git a/cmd/flux/reconcile_image_updateauto.go b/cmd/flux/reconcile_image_updateauto.go
index 9aed9ebec7f0e29cb8c5a8d88f7b2b0433231b06..a7620312a1c7f795b49f8057cfe2e8b6dcd983ea 100644
--- a/cmd/flux/reconcile_image_updateauto.go
+++ b/cmd/flux/reconcile_image_updateauto.go
@@ -31,8 +31,7 @@ var reconcileImageUpdateCmd = &cobra.Command{
 	Short: "Reconcile an ImageUpdateAutomation",
 	Long:  `The reconcile image update command triggers a reconciliation of an ImageUpdateAutomation resource and waits for it to finish.`,
 	Example: `  # Trigger an automation run for an existing image update automation
-  flux reconcile image update latest-images
-`,
+  flux reconcile image update latest-images`,
 	RunE: reconcileCommand{
 		apiType: imageUpdateAutomationType,
 		object:  imageUpdateAutomationAdapter{&autov1.ImageUpdateAutomation{}},
diff --git a/cmd/flux/reconcile_kustomization.go b/cmd/flux/reconcile_kustomization.go
index 1b0aaaa08863c7620dcb040ae09803cb48fe5413..d40c23115d90fba6ed662dd7610c3aca400cbb81 100644
--- a/cmd/flux/reconcile_kustomization.go
+++ b/cmd/flux/reconcile_kustomization.go
@@ -45,8 +45,7 @@ The reconcile kustomization command triggers a reconciliation of a Kustomization
   flux reconcile kustomization podinfo
 
   # Trigger a sync of the Kustomization's source and apply changes
-  flux reconcile kustomization podinfo --with-source
-`,
+  flux reconcile kustomization podinfo --with-source`,
 	RunE: reconcileKsCmdRun,
 }
 
diff --git a/cmd/flux/reconcile_receiver.go b/cmd/flux/reconcile_receiver.go
index 25cdeb99cff48cc1804c5559ea9d40de4f9ed88f..39e45ed5364ae3126388804768bf1ac75e8508b5 100644
--- a/cmd/flux/reconcile_receiver.go
+++ b/cmd/flux/reconcile_receiver.go
@@ -36,8 +36,7 @@ var reconcileReceiverCmd = &cobra.Command{
 	Short: "Reconcile a Receiver",
 	Long:  `The reconcile receiver command triggers a reconciliation of a Receiver resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing receiver
-  flux reconcile receiver main
-`,
+  flux reconcile receiver main`,
 	RunE: reconcileReceiverCmdRun,
 }
 
diff --git a/cmd/flux/reconcile_source_bucket.go b/cmd/flux/reconcile_source_bucket.go
index 143718f2d6b71943f9b7674569a8bd8933b51852..3955747cb84cef5f0650236f3f38762f7e75bbc9 100644
--- a/cmd/flux/reconcile_source_bucket.go
+++ b/cmd/flux/reconcile_source_bucket.go
@@ -35,8 +35,7 @@ var reconcileSourceBucketCmd = &cobra.Command{
 	Short: "Reconcile a Bucket source",
 	Long:  `The reconcile source command triggers a reconciliation of a Bucket resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing source
-  flux reconcile source bucket podinfo
-`,
+  flux reconcile source bucket podinfo`,
 	RunE: reconcileCommand{
 		apiType: bucketType,
 		object:  bucketAdapter{&sourcev1.Bucket{}},
diff --git a/cmd/flux/reconcile_source_git.go b/cmd/flux/reconcile_source_git.go
index c737e67b836e0683c1adb78af5af4d330e9b4ed2..98eb67de1794074b4e384a83d2df2320bdce531e 100644
--- a/cmd/flux/reconcile_source_git.go
+++ b/cmd/flux/reconcile_source_git.go
@@ -27,8 +27,7 @@ var reconcileSourceGitCmd = &cobra.Command{
 	Short: "Reconcile a GitRepository source",
 	Long:  `The reconcile source command triggers a reconciliation of a GitRepository resource and waits for it to finish.`,
 	Example: `  # Trigger a git pull for an existing source
-  flux reconcile source git podinfo
-`,
+  flux reconcile source git podinfo`,
 	RunE: reconcileCommand{
 		apiType: gitRepositoryType,
 		object:  gitRepositoryAdapter{&sourcev1.GitRepository{}},
diff --git a/cmd/flux/reconcile_source_helm.go b/cmd/flux/reconcile_source_helm.go
index e72d711fcf6a25e4abfcc0cb36a532968e3764e0..34455cef925da6db6056bfd216eeb47fe5ecefa9 100644
--- a/cmd/flux/reconcile_source_helm.go
+++ b/cmd/flux/reconcile_source_helm.go
@@ -27,8 +27,7 @@ var reconcileSourceHelmCmd = &cobra.Command{
 	Short: "Reconcile a HelmRepository source",
 	Long:  `The reconcile source command triggers a reconciliation of a HelmRepository resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing source
-  flux reconcile source helm podinfo
-`,
+  flux reconcile source helm podinfo`,
 	RunE: reconcileCommand{
 		apiType: helmRepositoryType,
 		object:  helmRepositoryAdapter{&sourcev1.HelmRepository{}},
diff --git a/cmd/flux/resume_alert.go b/cmd/flux/resume_alert.go
index 329c32ddd3dbd3d3e674a24adbb77a310491f4d9..7a7ef3256421450b4bd8c40dc66841c79949c448 100644
--- a/cmd/flux/resume_alert.go
+++ b/cmd/flux/resume_alert.go
@@ -39,8 +39,7 @@ var resumeAlertCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended Alert resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Alert
-  flux resume alert main
-`,
+  flux resume alert main`,
 	RunE: resumeAlertCmdRun,
 }
 
diff --git a/cmd/flux/resume_helmrelease.go b/cmd/flux/resume_helmrelease.go
index b9ede2c9846b8afc4fff76f2701742524db5d1fd..9cb51b05460aca7d6f5ddb5bcb9a9bd5f19accef 100644
--- a/cmd/flux/resume_helmrelease.go
+++ b/cmd/flux/resume_helmrelease.go
@@ -29,8 +29,7 @@ var resumeHrCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended HelmRelease resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Helm release
-  flux resume hr podinfo
-`,
+  flux resume hr podinfo`,
 	RunE: resumeCommand{
 		apiType: helmReleaseType,
 		object:  helmReleaseAdapter{&helmv2.HelmRelease{}},
diff --git a/cmd/flux/resume_image_repository.go b/cmd/flux/resume_image_repository.go
index 662d2aec99731786d3d1d229702c296dcf3d40b5..f1567817a7b8c7df582a8f65b780d4ee9218f44c 100644
--- a/cmd/flux/resume_image_repository.go
+++ b/cmd/flux/resume_image_repository.go
@@ -27,8 +27,7 @@ var resumeImageRepositoryCmd = &cobra.Command{
 	Short: "Resume a suspended ImageRepository",
 	Long:  `The resume command marks a previously suspended ImageRepository resource for reconciliation and waits for it to finish.`,
 	Example: `  # Resume reconciliation for an existing ImageRepository
-  flux resume image repository alpine
-`,
+  flux resume image repository alpine`,
 	RunE: resumeCommand{
 		apiType: imageRepositoryType,
 		object:  imageRepositoryAdapter{&imagev1.ImageRepository{}},
diff --git a/cmd/flux/resume_image_updateauto.go b/cmd/flux/resume_image_updateauto.go
index adc92121a0d25a8a1b10b50fc78a578052961815..6e7152c0d1a021a78a697cb644b5a4e53b6d8e1c 100644
--- a/cmd/flux/resume_image_updateauto.go
+++ b/cmd/flux/resume_image_updateauto.go
@@ -27,8 +27,7 @@ var resumeImageUpdateCmd = &cobra.Command{
 	Short: "Resume a suspended ImageUpdateAutomation",
 	Long:  `The resume command marks a previously suspended ImageUpdateAutomation resource for reconciliation and waits for it to finish.`,
 	Example: `  # Resume reconciliation for an existing ImageUpdateAutomation
-  flux resume image update latest-images
-`,
+  flux resume image update latest-images`,
 	RunE: resumeCommand{
 		apiType: imageUpdateAutomationType,
 		object:  imageUpdateAutomationAdapter{&autov1.ImageUpdateAutomation{}},
diff --git a/cmd/flux/resume_kustomization.go b/cmd/flux/resume_kustomization.go
index d7d0d35adb53e6e80cc3bd252fbc2122e01acd78..d3edc964360dc57140aeccc7f81dc9042256940a 100644
--- a/cmd/flux/resume_kustomization.go
+++ b/cmd/flux/resume_kustomization.go
@@ -30,8 +30,7 @@ var resumeKsCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended Kustomization resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Kustomization
-  flux resume ks podinfo
-`,
+  flux resume ks podinfo`,
 	RunE: resumeCommand{
 		apiType: kustomizationType,
 		object:  kustomizationAdapter{&kustomizev1.Kustomization{}},
diff --git a/cmd/flux/resume_receiver.go b/cmd/flux/resume_receiver.go
index 8302edf6f294445c2b4d270b675c68dfdd2547cc..cab98b4a9284beb9dedf73dae7602adc8726d426 100644
--- a/cmd/flux/resume_receiver.go
+++ b/cmd/flux/resume_receiver.go
@@ -39,8 +39,7 @@ var resumeReceiverCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended Receiver resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Receiver
-  flux resume receiver main
-`,
+  flux resume receiver main`,
 	RunE: resumeReceiverCmdRun,
 }
 
diff --git a/cmd/flux/resume_source_bucket.go b/cmd/flux/resume_source_bucket.go
index 2b094986b023f8c38216fb01258537a564ba2976..a73b7a904968bfba4e2afa8029bfa6c00115b37c 100644
--- a/cmd/flux/resume_source_bucket.go
+++ b/cmd/flux/resume_source_bucket.go
@@ -26,8 +26,7 @@ var resumeSourceBucketCmd = &cobra.Command{
 	Short: "Resume a suspended Bucket",
 	Long:  `The resume command marks a previously suspended Bucket resource for reconciliation and waits for it to finish.`,
 	Example: `  # Resume reconciliation for an existing Bucket
-  flux resume source bucket podinfo
-`,
+  flux resume source bucket podinfo`,
 	RunE: resumeCommand{
 		apiType: bucketType,
 		object:  &bucketAdapter{&sourcev1.Bucket{}},
diff --git a/cmd/flux/resume_source_chart.go b/cmd/flux/resume_source_chart.go
index 8f58fd6e92bd87de861dfdddb580533f38d3a3d9..c4d47f386d4267bf6b73091d169312dc5fcb2dd8 100644
--- a/cmd/flux/resume_source_chart.go
+++ b/cmd/flux/resume_source_chart.go
@@ -28,8 +28,7 @@ var resumeSourceHelmChartCmd = &cobra.Command{
 	Short: "Resume a suspended HelmChart",
 	Long:  `The resume command marks a previously suspended HelmChart resource for reconciliation and waits for it to finish.`,
 	Example: `  # Resume reconciliation for an existing HelmChart
-  flux resume source chart podinfo
-`,
+  flux resume source chart podinfo`,
 	RunE: resumeCommand{
 		apiType: helmChartType,
 		object:  &helmChartAdapter{&sourcev1.HelmChart{}},
diff --git a/cmd/flux/resume_source_git.go b/cmd/flux/resume_source_git.go
index 44ccd58f8db2cbe8f584061045c73e1b11753f1c..38033695012dd0bb3662c563edc989b785b23736 100644
--- a/cmd/flux/resume_source_git.go
+++ b/cmd/flux/resume_source_git.go
@@ -26,8 +26,7 @@ var resumeSourceGitCmd = &cobra.Command{
 	Short: "Resume a suspended GitRepository",
 	Long:  `The resume command marks a previously suspended GitRepository resource for reconciliation and waits for it to finish.`,
 	Example: `  # Resume reconciliation for an existing GitRepository
-  flux resume source git podinfo
-`,
+  flux resume source git podinfo`,
 	RunE: resumeCommand{
 		apiType: gitRepositoryType,
 		object:  gitRepositoryAdapter{&sourcev1.GitRepository{}},
diff --git a/cmd/flux/resume_source_helm.go b/cmd/flux/resume_source_helm.go
index f266c7f1fbf98fba43f9704b3f1f829ee67d39e5..1dc10df4a8da7607249d23486e2ca8295a7fd037 100644
--- a/cmd/flux/resume_source_helm.go
+++ b/cmd/flux/resume_source_helm.go
@@ -26,8 +26,7 @@ var resumeSourceHelmCmd = &cobra.Command{
 	Short: "Resume a suspended HelmRepository",
 	Long:  `The resume command marks a previously suspended HelmRepository resource for reconciliation and waits for it to finish.`,
 	Example: `  # Resume reconciliation for an existing HelmRepository
-  flux resume source helm bitnami
-`,
+  flux resume source helm bitnami`,
 	RunE: resumeCommand{
 		apiType: helmRepositoryType,
 		object:  helmRepositoryAdapter{&sourcev1.HelmRepository{}},
diff --git a/cmd/flux/suspend_alert.go b/cmd/flux/suspend_alert.go
index 3c21565876a92e81fe44aade4c07bb7c45eb1a9d..1997a64521c807fad516d3fd10760d73140abc91 100644
--- a/cmd/flux/suspend_alert.go
+++ b/cmd/flux/suspend_alert.go
@@ -32,8 +32,7 @@ var suspendAlertCmd = &cobra.Command{
 	Short: "Suspend reconciliation of Alert",
 	Long:  "The suspend command disables the reconciliation of a Alert resource.",
 	Example: `  # Suspend reconciliation for an existing Alert
-  flux suspend alert main
-`,
+  flux suspend alert main`,
 	RunE: suspendAlertCmdRun,
 }
 
diff --git a/cmd/flux/suspend_helmrelease.go b/cmd/flux/suspend_helmrelease.go
index fd76f5d416d594ef9e0eaeab8e2faad20c695af7..3a558c023843b708eaf68788628c6e909f7cd9a3 100644
--- a/cmd/flux/suspend_helmrelease.go
+++ b/cmd/flux/suspend_helmrelease.go
@@ -27,8 +27,7 @@ var suspendHrCmd = &cobra.Command{
 	Short:   "Suspend reconciliation of HelmRelease",
 	Long:    "The suspend command disables the reconciliation of a HelmRelease resource.",
 	Example: `  # Suspend reconciliation for an existing Helm release
-  flux suspend hr podinfo
-`,
+  flux suspend hr podinfo`,
 	RunE: suspendCommand{
 		apiType: helmReleaseType,
 		object:  &helmReleaseAdapter{&helmv2.HelmRelease{}},
diff --git a/cmd/flux/suspend_image_repository.go b/cmd/flux/suspend_image_repository.go
index 77540a252dfc988c5a6109b84bcce4f8048ade3d..c0315f72cca24c5c9fe5ba5ee735dbfbc13973f0 100644
--- a/cmd/flux/suspend_image_repository.go
+++ b/cmd/flux/suspend_image_repository.go
@@ -27,8 +27,7 @@ var suspendImageRepositoryCmd = &cobra.Command{
 	Short: "Suspend reconciliation of an ImageRepository",
 	Long:  "The suspend image repository command disables the reconciliation of a ImageRepository resource.",
 	Example: `  # Suspend reconciliation for an existing ImageRepository
-  flux suspend image repository alpine
-`,
+  flux suspend image repository alpine`,
 	RunE: suspendCommand{
 		apiType: imageRepositoryType,
 		object:  imageRepositoryAdapter{&imagev1.ImageRepository{}},
diff --git a/cmd/flux/suspend_image_updateauto.go b/cmd/flux/suspend_image_updateauto.go
index 8cb747af7d3cc49b0b83b86efc124349677a047e..fae2b475c024237705289e7990879c6c8d2a1e12 100644
--- a/cmd/flux/suspend_image_updateauto.go
+++ b/cmd/flux/suspend_image_updateauto.go
@@ -27,8 +27,7 @@ var suspendImageUpdateCmd = &cobra.Command{
 	Short: "Suspend reconciliation of an ImageUpdateAutomation",
 	Long:  "The suspend image update command disables the reconciliation of a ImageUpdateAutomation resource.",
 	Example: `  # Suspend reconciliation for an existing ImageUpdateAutomation
-  flux suspend image update latest-images
-`,
+  flux suspend image update latest-images`,
 	RunE: suspendCommand{
 		apiType: imageUpdateAutomationType,
 		object:  imageUpdateAutomationAdapter{&autov1.ImageUpdateAutomation{}},
diff --git a/cmd/flux/suspend_kustomization.go b/cmd/flux/suspend_kustomization.go
index ecb336c4277e624e585bb43df0bb6c34caee6f3f..07bc9cd40f4238afb66f4eea2e7aa284f44d6b90 100644
--- a/cmd/flux/suspend_kustomization.go
+++ b/cmd/flux/suspend_kustomization.go
@@ -27,8 +27,7 @@ var suspendKsCmd = &cobra.Command{
 	Short:   "Suspend reconciliation of Kustomization",
 	Long:    "The suspend command disables the reconciliation of a Kustomization resource.",
 	Example: `  # Suspend reconciliation for an existing Kustomization
-  flux suspend ks podinfo
-`,
+  flux suspend ks podinfo`,
 	RunE: suspendCommand{
 		apiType: kustomizationType,
 		object:  kustomizationAdapter{&kustomizev1.Kustomization{}},
diff --git a/cmd/flux/suspend_receiver.go b/cmd/flux/suspend_receiver.go
index 1558b97d07b6a8415eeb12c3f1be818bcb69fb84..472290d3b6063672e2644dd59dadbbf654046c19 100644
--- a/cmd/flux/suspend_receiver.go
+++ b/cmd/flux/suspend_receiver.go
@@ -32,8 +32,7 @@ var suspendReceiverCmd = &cobra.Command{
 	Short: "Suspend reconciliation of Receiver",
 	Long:  "The suspend command disables the reconciliation of a Receiver resource.",
 	Example: `  # Suspend reconciliation for an existing Receiver
-  flux suspend receiver main
-`,
+  flux suspend receiver main`,
 	RunE: suspendReceiverCmdRun,
 }
 
diff --git a/cmd/flux/suspend_source_bucket.go b/cmd/flux/suspend_source_bucket.go
index 3b44c8ad1150d0ca5d54de1b2437b22c0e7ea208..e75e3901a204b975e70420083cf97d9feffe43a1 100644
--- a/cmd/flux/suspend_source_bucket.go
+++ b/cmd/flux/suspend_source_bucket.go
@@ -26,8 +26,7 @@ var suspendSourceBucketCmd = &cobra.Command{
 	Short: "Suspend reconciliation of a Bucket",
 	Long:  "The suspend command disables the reconciliation of a Bucket resource.",
 	Example: `  # Suspend reconciliation for an existing Bucket
-  flux suspend source bucket podinfo
-`,
+  flux suspend source bucket podinfo`,
 	RunE: suspendCommand{
 		apiType: bucketType,
 		object:  bucketAdapter{&sourcev1.Bucket{}},
diff --git a/cmd/flux/suspend_source_chart.go b/cmd/flux/suspend_source_chart.go
index 45715ebfb2520bdce8016ccf9b5c4d835625e9bb..72152bfde6cc3128e512d4e5222679db5949856a 100644
--- a/cmd/flux/suspend_source_chart.go
+++ b/cmd/flux/suspend_source_chart.go
@@ -27,8 +27,7 @@ var suspendSourceHelmChartCmd = &cobra.Command{
 	Short: "Suspend reconciliation of a HelmChart",
 	Long:  "The suspend command disables the reconciliation of a HelmChart resource.",
 	Example: `  # Suspend reconciliation for an existing HelmChart
-  flux suspend source chart podinfo
-`,
+  flux suspend source chart podinfo`,
 	RunE: suspendCommand{
 		apiType: helmChartType,
 		object:  helmChartAdapter{&sourcev1.HelmChart{}},
diff --git a/cmd/flux/suspend_source_git.go b/cmd/flux/suspend_source_git.go
index 810ff1bf0ecb5690b020bfc3808a26e6a3060894..df122911a2d63ba93daa30ebefe482856b8ab659 100644
--- a/cmd/flux/suspend_source_git.go
+++ b/cmd/flux/suspend_source_git.go
@@ -27,8 +27,7 @@ var suspendSourceGitCmd = &cobra.Command{
 	Short: "Suspend reconciliation of a GitRepository",
 	Long:  "The suspend command disables the reconciliation of a GitRepository resource.",
 	Example: `  # Suspend reconciliation for an existing GitRepository
-  flux suspend source git podinfo
-`,
+  flux suspend source git podinfo`,
 	RunE: suspendCommand{
 		apiType: gitRepositoryType,
 		object:  gitRepositoryAdapter{&sourcev1.GitRepository{}},
diff --git a/cmd/flux/suspend_source_helm.go b/cmd/flux/suspend_source_helm.go
index c2a672f9f81d74c60d23cbaf190619ad8903dfed..1b6e291e34520748e35fe151ba38190f05c0c9f8 100644
--- a/cmd/flux/suspend_source_helm.go
+++ b/cmd/flux/suspend_source_helm.go
@@ -27,8 +27,7 @@ var suspendSourceHelmCmd = &cobra.Command{
 	Short: "Suspend reconciliation of a HelmRepository",
 	Long:  "The suspend command disables the reconciliation of a HelmRepository resource.",
 	Example: `  # Suspend reconciliation for an existing HelmRepository
-  flux suspend source helm bitnami
-`,
+  flux suspend source helm bitnami`,
 	RunE: suspendCommand{
 		apiType: helmRepositoryType,
 		object:  helmRepositoryAdapter{&sourcev1.HelmRepository{}},
diff --git a/cmd/flux/uninstall.go b/cmd/flux/uninstall.go
index f6826b269a4fc41b9c7dea8a6726415a46fc4a30..2f559e699b017b1a9aa63dcd175719b097e45863 100644
--- a/cmd/flux/uninstall.go
+++ b/cmd/flux/uninstall.go
@@ -44,8 +44,7 @@ var uninstallCmd = &cobra.Command{
   flux uninstall --namespace=flux-system
 
   # Uninstall Flux but keep the namespace
-  flux uninstall --namespace=infra --keep-namespace=true
-`,
+  flux uninstall --namespace=infra --keep-namespace=true`,
 	RunE: uninstallCmdRun,
 }
 
diff --git a/docs/cmd/flux.md b/docs/cmd/flux.md
index 7892411b8d0533b4c75a0290d1dba3f608cf9cd5..08a667e63d07b5317c94adcb6f1c59fa8185ef35 100644
--- a/docs/cmd/flux.md
+++ b/docs/cmd/flux.md
@@ -7,6 +7,7 @@ Command line utility for assembling Kubernetes CD pipelines
 
 ### Synopsis
 
+
 Command line utility for assembling Kubernetes CD pipelines the GitOps way.
 
 ### Examples
@@ -18,7 +19,7 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.
   # Install the latest version of Flux
   flux install --version=master
 
-  # Create a source from a public Git repository
+  # Create a source for a public Git repository
   flux create source git webapp-latest \
     --url=https://github.com/stefanprodan/podinfo \
     --branch=master \
@@ -64,7 +65,6 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.
 
   # Uninstall Flux and delete CRDs
   flux uninstall
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_bootstrap_github.md b/docs/cmd/flux_bootstrap_github.md
index 71d1a6777916525f7896c148f4cfc3191237cd2c..54e06c91b669d45ac2c3163aefce20c76e61113a 100644
--- a/docs/cmd/flux_bootstrap_github.md
+++ b/docs/cmd/flux_bootstrap_github.md
@@ -23,27 +23,26 @@ flux bootstrap github [flags]
   # Create a GitHub personal access token and export it as an env var
   export GITHUB_TOKEN=<my-token>
 
-  # Run bootstrap for a private repo owned by a GitHub organization
-  flux bootstrap github --owner=<organization> --repository=<repo name>
+  # Run bootstrap for a private repository owned by a GitHub organization
+  flux bootstrap github --owner=<organization> --repository=<repository name>
 
-  # Run bootstrap for a private repo and assign organization teams to it
-  flux bootstrap github --owner=<organization> --repository=<repo name> --team=<team1 slug> --team=<team2 slug>
+  # Run bootstrap for a private repository and assign organization teams to it
+  flux bootstrap github --owner=<organization> --repository=<repository name> --team=<team1 slug> --team=<team2 slug>
 
   # Run bootstrap for a repository path
-  flux bootstrap github --owner=<organization> --repository=<repo name> --path=dev-cluster
+  flux bootstrap github --owner=<organization> --repository=<repository name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  flux bootstrap github --owner=<user> --repository=<repo name> --private=false --personal=true
+  flux bootstrap github --owner=<user> --repository=<repository name> --private=false --personal=true
 
-  # Run bootstrap for a private repo hosted on GitHub Enterprise using SSH auth
-  flux bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain> --ssh-hostname=<domain>
+  # Run bootstrap for a private repository hosted on GitHub Enterprise using SSH auth
+  flux bootstrap github --owner=<organization> --repository=<repository name> --hostname=<domain> --ssh-hostname=<domain>
 
-  # Run bootstrap for a private repo hosted on GitHub Enterprise using HTTPS auth
-  flux bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain> --token-auth
-
-  # Run bootstrap for a an existing repository with a branch named main
-  flux bootstrap github --owner=<organization> --repository=<repo name> --branch=main
+  # Run bootstrap for a private repository hosted on GitHub Enterprise using HTTPS auth
+  flux bootstrap github --owner=<organization> --repository=<repository name> --hostname=<domain> --token-auth
 
+  # Run bootstrap for an existing repository with a branch named main
+  flux bootstrap github --owner=<organization> --repository=<repository name> --branch=main
 ```
 
 ### Options
diff --git a/docs/cmd/flux_bootstrap_gitlab.md b/docs/cmd/flux_bootstrap_gitlab.md
index dbd4221672b63fedcbab3f2c5d6789c6856b7c08..ab8cf31afb417e4a2c7a8d4ca4f2ecaa720b7b41 100644
--- a/docs/cmd/flux_bootstrap_gitlab.md
+++ b/docs/cmd/flux_bootstrap_gitlab.md
@@ -23,24 +23,23 @@ flux bootstrap gitlab [flags]
   # Create a GitLab API token and export it as an env var
   export GITLAB_TOKEN=<my-token>
 
-  # Run bootstrap for a private repo using HTTPS token authentication
-  flux bootstrap gitlab --owner=<group> --repository=<repo name> --token-auth
+  # Run bootstrap for a private repository using HTTPS token authentication
+  flux bootstrap gitlab --owner=<group> --repository=<repository name> --token-auth
 
-  # Run bootstrap for a private repo using SSH authentication
-  flux bootstrap gitlab --owner=<group> --repository=<repo name>
+  # Run bootstrap for a private repository using SSH authentication
+  flux bootstrap gitlab --owner=<group> --repository=<repository name>
 
   # Run bootstrap for a repository path
-  flux bootstrap gitlab --owner=<group> --repository=<repo name> --path=dev-cluster
+  flux bootstrap gitlab --owner=<group> --repository=<repository name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  flux bootstrap gitlab --owner=<user> --repository=<repo name> --private=false --personal --token-auth
+  flux bootstrap gitlab --owner=<user> --repository=<repository name> --private=false --personal --token-auth
 
-  # Run bootstrap for a private repo hosted on a GitLab server
-  flux bootstrap gitlab --owner=<group> --repository=<repo name> --hostname=<domain> --token-auth
+  # Run bootstrap for a private repository hosted on a GitLab server
+  flux bootstrap gitlab --owner=<group> --repository=<repository name> --hostname=<domain> --token-auth
 
   # Run bootstrap for a an existing repository with a branch named main
-  flux bootstrap gitlab --owner=<organization> --repository=<repo name> --branch=main --token-auth
-
+  flux bootstrap gitlab --owner=<organization> --repository=<repository name> --branch=main --token-auth
 ```
 
 ### Options
diff --git a/docs/cmd/flux_check.md b/docs/cmd/flux_check.md
index 5671ab8fce00a5eb48a3c26c2f8ab16711a8081a..1f6fb116867ce14823ed6c5d72ad42a011db61d7 100644
--- a/docs/cmd/flux_check.md
+++ b/docs/cmd/flux_check.md
@@ -22,7 +22,6 @@ flux check [flags]
 
   # Run installation checks
   flux check
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_completion_bash.md b/docs/cmd/flux_completion_bash.md
index f9260a4bd4fc22b49264e328328df12a2b5fc316..df85717316c6f5dcf7152ece69cf1f79b9762b49 100644
--- a/docs/cmd/flux_completion_bash.md
+++ b/docs/cmd/flux_completion_bash.md
@@ -20,7 +20,6 @@ To configure your bash shell to load completions for each session add to your ba
 
 # ~/.bashrc or ~/.profile
 command -v flux >/dev/null && . <(flux completion bash)
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_completion_fish.md b/docs/cmd/flux_completion_fish.md
index 97529b41aba84f41f4b102e285fa920e3a9a7654..c16f3b240d9712827ee0a7ba1c780f27cbab1842 100644
--- a/docs/cmd/flux_completion_fish.md
+++ b/docs/cmd/flux_completion_fish.md
@@ -17,7 +17,6 @@ To configure your fish shell to load completions for each session write this scr
 flux completion fish > ~/.config/fish/completions/flux.fish
 
 See http://fishshell.com/docs/current/index.html#completion-own for more details
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_completion_powershell.md b/docs/cmd/flux_completion_powershell.md
index 1dece66c7eb6c96cbaebdb6c1355a0e1c04b7328..a2adb3a43a08f0de8ffc9ff834260ca183fe6bbd 100644
--- a/docs/cmd/flux_completion_powershell.md
+++ b/docs/cmd/flux_completion_powershell.md
@@ -27,7 +27,6 @@ Linux:
 
 cd "${XDG_CONFIG_HOME:-"$HOME/.config/"}/powershell/modules"
 flux completion >> flux-completions.ps1
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_completion_zsh.md b/docs/cmd/flux_completion_zsh.md
index d684c104644a52373cd2240ea46cc7c02dda6e70..6a8b7ae8da071bcc212223f9ac2ce234c3d68f27 100644
--- a/docs/cmd/flux_completion_zsh.md
+++ b/docs/cmd/flux_completion_zsh.md
@@ -28,7 +28,6 @@ flux completion zsh > _flux
 
 mv _flux ~/.oh-my-zsh/completions  # oh-my-zsh
 mv _flux ~/.zprezto/modules/completion/external/src/  # zprezto
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_alert-provider.md b/docs/cmd/flux_create_alert-provider.md
index 870e2a31309f1a3ef33a292b7926c1035970c3dc..0d9079cfce3f6664dee810fe33dbc6e6a8cbe1fb 100644
--- a/docs/cmd/flux_create_alert-provider.md
+++ b/docs/cmd/flux_create_alert-provider.md
@@ -28,7 +28,6 @@ flux create alert-provider [name] [flags]
   --type github \
   --address https://github.com/stefanprodan/podinfo \
   --secret-ref github-token
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_alert.md b/docs/cmd/flux_create_alert.md
index 5412c76fa0bb21b5a0bd15ffebde4cc7141ab41b..dc761fa028fa0d623b2f960b1a8538a61cbe1899 100644
--- a/docs/cmd/flux_create_alert.md
+++ b/docs/cmd/flux_create_alert.md
@@ -22,7 +22,6 @@ flux create alert [name] [flags]
   --event-source Kustomization/flux-system \
   --provider-ref slack \
   flux-system
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_helmrelease.md b/docs/cmd/flux_create_helmrelease.md
index 9f8cb1c18ed18f7122fac1c95800cc032d1f42c8..d7e3f35cd3a45ad8e30e420eb9a2114e840b86dd 100644
--- a/docs/cmd/flux_create_helmrelease.md
+++ b/docs/cmd/flux_create_helmrelease.md
@@ -68,7 +68,6 @@ flux create helmrelease [name] [flags]
     --chart=podinfo \
     --values=./values.yaml \
     --export > podinfo-release.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_image_policy.md b/docs/cmd/flux_create_image_policy.md
index 88773ced0775a58ac53d3dc429d1923b9d0efacf..17432418cd44c5e74d8d09e3eaa8b0647c3dc1b1 100644
--- a/docs/cmd/flux_create_image_policy.md
+++ b/docs/cmd/flux_create_image_policy.md
@@ -32,7 +32,6 @@ flux create image policy [name] [flags]
     --select-numeric=asc \
 	--filter-regex='^main-[a-f0-9]+-(?P<ts>[0-9]+)' \
 	--filter-extract='$ts'
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_image_repository.md b/docs/cmd/flux_create_image_repository.md
index f0e1d937b67c1de72dab3b2a82dd76c405f27c7d..4204bca1e6df22bf311e36fc77c763f99b108df6 100644
--- a/docs/cmd/flux_create_image_repository.md
+++ b/docs/cmd/flux_create_image_repository.md
@@ -41,7 +41,6 @@ flux create image repository [name] [flags]
   flux create image repository app-repo \
     --cert-secret-ref client-cert \
     --image registry.example.com/private/app --interval 5m
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_image_update.md b/docs/cmd/flux_create_image_update.md
index 3bc5f87e8c950c4e3e66080e6497aa9dd9457d0e..b3d0ebfa788d8c3fcb4a6d7c311fe247b4d4b14d 100644
--- a/docs/cmd/flux_create_image_update.md
+++ b/docs/cmd/flux_create_image_update.md
@@ -36,7 +36,6 @@ flux create image update [name] [flags]
     --author-name=flux \
     --author-email=flux@example.com \
     --commit-template="{{range .Updated.Images}}{{println .}}{{end}}"
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_kustomization.md b/docs/cmd/flux_create_kustomization.md
index 250be41a4219ea9aa364b2c9d106fc3f3bf413cb..b6e29e778fef80819a6ee6848e89928f535e7404 100644
--- a/docs/cmd/flux_create_kustomization.md
+++ b/docs/cmd/flux_create_kustomization.md
@@ -41,7 +41,6 @@ flux create kustomization [name] [flags]
     --source=Bucket/secrets \
     --prune=true \
     --interval=5m
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_receiver.md b/docs/cmd/flux_create_receiver.md
index 32e21190849a6271466b0046625ddb080790318e..7470677355432dea60e323d9cd924b5b918c8ce9 100644
--- a/docs/cmd/flux_create_receiver.md
+++ b/docs/cmd/flux_create_receiver.md
@@ -24,7 +24,6 @@ flux create receiver [name] [flags]
 	--secret-ref webhook-token \
 	--resource GitRepository/webapp \
 	--resource HelmRepository/webapp
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_secret_helm.md b/docs/cmd/flux_create_secret_helm.md
index eeec50a0cbfd0219fd4fc55038c5da27b641ff62..66c317eb30bd67d9276f05d724a2d13d12cd620d 100644
--- a/docs/cmd/flux_create_secret_helm.md
+++ b/docs/cmd/flux_create_secret_helm.md
@@ -7,7 +7,6 @@ Create or update a Kubernetes secret for Helm repository authentication
 
 ### Synopsis
 
-
 The create secret helm command generates a Kubernetes secret with basic authentication credentials.
 
 ```
@@ -17,8 +16,7 @@ flux create secret helm [name] [flags]
 ### Examples
 
 ```
-
-  # Create a Helm authentication secret on disk and encrypt it with Mozilla SOPS
+ # Create a Helm authentication secret on disk and encrypt it with Mozilla SOPS
   flux create secret helm repo-auth \
     --namespace=my-namespace \
     --username=my-username \
@@ -28,14 +26,13 @@ flux create secret helm [name] [flags]
   sops --encrypt --encrypted-regex '^(data|stringData)$' \
     --in-place repo-auth.yaml
 
-  # Create an authentication secret using a custom TLS cert
+  # Create a Helm authentication secret using a custom TLS cert
   flux create secret helm repo-auth \
     --username=username \
     --password=password \
     --cert-file=./cert.crt \
     --key-file=./key.crt \
     --ca-file=./ca.crt
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_secret_tls.md b/docs/cmd/flux_create_secret_tls.md
index d9bc5a8f24a0a8ea1f5c46fadf6779d4cec94b70..48f7e1030e95c818eaa6cfcd9104b08589d77220 100644
--- a/docs/cmd/flux_create_secret_tls.md
+++ b/docs/cmd/flux_create_secret_tls.md
@@ -7,7 +7,6 @@ Create or update a Kubernetes secret with TLS certificates
 
 ### Synopsis
 
-
 The create secret tls command generates a Kubernetes secret with certificates for use with TLS.
 
 ```
@@ -17,8 +16,7 @@ flux create secret tls [name] [flags]
 ### Examples
 
 ```
-
-  # Create a TLS secret on disk and encrypt it with Mozilla SOPS.
+ # Create a TLS secret on disk and encrypt it with Mozilla SOPS.
   # Files are expected to be PEM-encoded.
   flux create secret tls certs \
     --namespace=my-namespace \
@@ -28,7 +26,6 @@ flux create secret tls [name] [flags]
 
   sops --encrypt --encrypted-regex '^(data|stringData)$' \
     --in-place certs.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_source_bucket.md b/docs/cmd/flux_create_source_bucket.md
index 73f66059dc5ed2bbcb9d315df9c1009464e8b8d1..81c63954b2886653f2cbc98cd12c08d9f4807e80 100644
--- a/docs/cmd/flux_create_source_bucket.md
+++ b/docs/cmd/flux_create_source_bucket.md
@@ -7,7 +7,6 @@ Create or update a Bucket source
 
 ### Synopsis
 
-
 The create source bucket command generates a Bucket resource and waits for it to be downloaded.
 For Buckets with static authentication, the credentials are stored in a Kubernetes secret.
 
@@ -18,7 +17,7 @@ flux create source bucket [name] [flags]
 ### Examples
 
 ```
-  # Create a source from a Buckets using static authentication
+  # Create a source for a Bucket using static authentication
   flux create source bucket podinfo \
 	--bucket-name=podinfo \
     --endpoint=minio.minio.svc.cluster.local:9000 \
@@ -27,14 +26,13 @@ flux create source bucket [name] [flags]
 	--secret-key=mysecretkey \
     --interval=10m
 
-  # Create a source from an Amazon S3 Bucket using IAM authentication
+  # Create a source for an Amazon S3 Bucket using IAM authentication
   flux create source bucket podinfo \
 	--bucket-name=podinfo \
 	--provider=aws \
     --endpoint=s3.amazonaws.com \
 	--region=us-east-1 \
     --interval=10m
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_source_helm.md b/docs/cmd/flux_create_source_helm.md
index 5936d20e8b0ba460b9797c6fd9de70d8bdb915d3..72381c29d54a78d05083d4699201894051ff7ae1 100644
--- a/docs/cmd/flux_create_source_helm.md
+++ b/docs/cmd/flux_create_source_helm.md
@@ -7,7 +7,6 @@ Create or update a HelmRepository source
 
 ### Synopsis
 
-
 The create source helm command generates a HelmRepository resource and waits for it to fetch the index.
 For private Helm repositories, the basic authentication credentials are stored in a Kubernetes secret.
 
@@ -18,24 +17,23 @@ flux create source helm [name] [flags]
 ### Examples
 
 ```
-  # Create a source from a public Helm repository
+  # Create a source for a public Helm repository
   flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --interval=10m
 
-  # Create a source from a Helm repository using basic authentication
+  # Create a source for a Helm repository using basic authentication
   flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --username=username \
     --password=password
 
-  # Create a source from a Helm repository using TLS authentication
+  # Create a source for a Helm repository using TLS authentication
   flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --cert-file=./cert.crt \
     --key-file=./key.crt \
     --ca-file=./ca.crt
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_create_tenant.md b/docs/cmd/flux_create_tenant.md
index 22360c6e7d0813b2ca00470655d41d9a815f095b..9f3f2d6439b618bea432bcddf1cc405e672dbed7 100644
--- a/docs/cmd/flux_create_tenant.md
+++ b/docs/cmd/flux_create_tenant.md
@@ -7,7 +7,6 @@ Create or update a tenant
 
 ### Synopsis
 
-
 The create tenant command generates namespaces, service accounts and role bindings to limit the
 reconcilers scope to the tenant namespaces.
 
@@ -28,7 +27,6 @@ flux create tenant [flags]
     --with-namespace=frontend \
     --with-namespace=backend \
 	--export > dev-team.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_alert-provider.md b/docs/cmd/flux_delete_alert-provider.md
index a4c9a6bac117cc2b172e6492fc76524378ea7f0a..8bedc8c7e988aa92f4acb3f47db3b24db91a8230 100644
--- a/docs/cmd/flux_delete_alert-provider.md
+++ b/docs/cmd/flux_delete_alert-provider.md
@@ -18,7 +18,6 @@ flux delete alert-provider [name] [flags]
 ```
   # Delete a Provider and the Kubernetes resources created by it
   flux delete alert-provider slack
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_alert.md b/docs/cmd/flux_delete_alert.md
index 8051b8000e696eeb1e9ab066fc77e086e6f5be79..b75ce7fe125311af65541e6d63ccb5a637f7dae1 100644
--- a/docs/cmd/flux_delete_alert.md
+++ b/docs/cmd/flux_delete_alert.md
@@ -18,7 +18,6 @@ flux delete alert [name] [flags]
 ```
   # Delete an Alert and the Kubernetes resources created by it
   flux delete alert main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_helmrelease.md b/docs/cmd/flux_delete_helmrelease.md
index c7015b3747d7570b3781c90b9e2391dc06b380b0..06830658e985bc420bf7d9b1ca096ddf6ca73881 100644
--- a/docs/cmd/flux_delete_helmrelease.md
+++ b/docs/cmd/flux_delete_helmrelease.md
@@ -18,7 +18,6 @@ flux delete helmrelease [name] [flags]
 ```
   # Delete a Helm release and the Kubernetes resources created by it
   flux delete hr podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_image_policy.md b/docs/cmd/flux_delete_image_policy.md
index 402cba06d6452ce402bd9ffe207799a41998ae78..1e9d9fe1cbde548c011e81746c22dd59a120ec43 100644
--- a/docs/cmd/flux_delete_image_policy.md
+++ b/docs/cmd/flux_delete_image_policy.md
@@ -18,7 +18,6 @@ flux delete image policy [name] [flags]
 ```
   # Delete an image policy
   flux delete image policy alpine3.x
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_image_repository.md b/docs/cmd/flux_delete_image_repository.md
index f7a18f4628fceccf4f5d45a2a9eca565184fdbbf..ad7ea3a72a4223c491b5557ce04c4073b3539b93 100644
--- a/docs/cmd/flux_delete_image_repository.md
+++ b/docs/cmd/flux_delete_image_repository.md
@@ -18,7 +18,6 @@ flux delete image repository [name] [flags]
 ```
   # Delete an image repository
   flux delete image repository alpine
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_image_update.md b/docs/cmd/flux_delete_image_update.md
index 0e5a342706aa237a36fc39ce46412b16384bda32..4f1e637e179f8d3fedc0a9d31b393f20fb829193 100644
--- a/docs/cmd/flux_delete_image_update.md
+++ b/docs/cmd/flux_delete_image_update.md
@@ -18,7 +18,6 @@ flux delete image update [name] [flags]
 ```
   # Delete an image update automation
   flux delete image update latest-images
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_kustomization.md b/docs/cmd/flux_delete_kustomization.md
index 8b5e97058cc3e233f9261b73c80786be04077c4a..58397cc0ae4997563f27502d90a76abd919be4f3 100644
--- a/docs/cmd/flux_delete_kustomization.md
+++ b/docs/cmd/flux_delete_kustomization.md
@@ -18,7 +18,6 @@ flux delete kustomization [name] [flags]
 ```
   # Delete a kustomization and the Kubernetes resources created by it
   flux delete kustomization podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_receiver.md b/docs/cmd/flux_delete_receiver.md
index 63a516160371b70be6eafc133952ccdacfec8566..e70e7648b1c581e03a07c922e958266e941c8368 100644
--- a/docs/cmd/flux_delete_receiver.md
+++ b/docs/cmd/flux_delete_receiver.md
@@ -18,7 +18,6 @@ flux delete receiver [name] [flags]
 ```
   # Delete an Receiver and the Kubernetes resources created by it
   flux delete receiver main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_source_bucket.md b/docs/cmd/flux_delete_source_bucket.md
index a3133ad601a5918201677713eefa44b6843750a6..d639ad9b72b9318979d1a315779f6ae75b233ec7 100644
--- a/docs/cmd/flux_delete_source_bucket.md
+++ b/docs/cmd/flux_delete_source_bucket.md
@@ -18,7 +18,6 @@ flux delete source bucket [name] [flags]
 ```
   # Delete a Bucket source
   flux delete source bucket podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_source_git.md b/docs/cmd/flux_delete_source_git.md
index 4e2b4dfdde215c56505098fef843f1237e67e6a7..1909080df85f7dcc56627876fd3cbc95c6c75a2a 100644
--- a/docs/cmd/flux_delete_source_git.md
+++ b/docs/cmd/flux_delete_source_git.md
@@ -18,7 +18,6 @@ flux delete source git [name] [flags]
 ```
   # Delete a Git repository
   flux delete source git podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_delete_source_helm.md b/docs/cmd/flux_delete_source_helm.md
index 6b9d7397084ccb3e0ffb1d57625f0cd7879693ac..0fd412b3bad400be463e78311771b3a141ae2f12 100644
--- a/docs/cmd/flux_delete_source_helm.md
+++ b/docs/cmd/flux_delete_source_helm.md
@@ -18,7 +18,6 @@ flux delete source helm [name] [flags]
 ```
   # Delete a Helm repository
   flux delete source helm podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_alert-provider.md b/docs/cmd/flux_export_alert-provider.md
index b23dbc30f0918d92d2eb1a51643e45324f0cf47e..2eee9dad970c796f5df0c9f4a39cd427ede757be 100644
--- a/docs/cmd/flux_export_alert-provider.md
+++ b/docs/cmd/flux_export_alert-provider.md
@@ -21,7 +21,6 @@ flux export alert-provider [name] [flags]
 
   # Export a Provider
   flux export alert-provider slack > slack.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_alert.md b/docs/cmd/flux_export_alert.md
index 838d8c6c4608042a23cd186201e6312ddfddf7a6..e55bfe8bd531d8315879dc3d04711795663dd7ba 100644
--- a/docs/cmd/flux_export_alert.md
+++ b/docs/cmd/flux_export_alert.md
@@ -21,7 +21,6 @@ flux export alert [name] [flags]
 
   # Export a Alert
   flux export alert main > main.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_helmrelease.md b/docs/cmd/flux_export_helmrelease.md
index b711f704f9cbe2a6b96e105c52f132c584b9004d..c1b6a5ebafebc0a612e34d73b095ae6d03398fbf 100644
--- a/docs/cmd/flux_export_helmrelease.md
+++ b/docs/cmd/flux_export_helmrelease.md
@@ -21,7 +21,6 @@ flux export helmrelease [name] [flags]
 
   # Export a HelmRelease
   flux export hr my-app > app-release.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_image_policy.md b/docs/cmd/flux_export_image_policy.md
index 0e34d146f265731ba3e17e1557a46f735d4fd5cc..fc07672d4506670e6ed43c18d2f96631ae6f4af3 100644
--- a/docs/cmd/flux_export_image_policy.md
+++ b/docs/cmd/flux_export_image_policy.md
@@ -21,7 +21,6 @@ flux export image policy [name] [flags]
 
   # Export a specific policy
   flux export image policy alpine1x > alpine1x.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_image_repository.md b/docs/cmd/flux_export_image_repository.md
index 58fa3e60b22910be7e7c4d8bcaaa74100ac8855d..ab1522706c6389012fabdf362a752bafa909ebb9 100644
--- a/docs/cmd/flux_export_image_repository.md
+++ b/docs/cmd/flux_export_image_repository.md
@@ -21,7 +21,6 @@ flux export image repository [name] [flags]
 
   # Export a specific ImageRepository resource
   flux export image repository alpine > alpine.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_image_update.md b/docs/cmd/flux_export_image_update.md
index 5c6f7c7fd0cdac746f8f69172a674bbb71ce501e..4f2f8b9e9d33a0c76df358c3cb9c35b880a854c3 100644
--- a/docs/cmd/flux_export_image_update.md
+++ b/docs/cmd/flux_export_image_update.md
@@ -21,7 +21,6 @@ flux export image update [name] [flags]
 
   # Export a specific automation
   flux export image update latest-images > latest.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_kustomization.md b/docs/cmd/flux_export_kustomization.md
index a45cb9172ed032736c2d481f1f5e5e645fc14422..c2cd7ccde425003f4e90a9475c41c7518eee7742 100644
--- a/docs/cmd/flux_export_kustomization.md
+++ b/docs/cmd/flux_export_kustomization.md
@@ -21,7 +21,6 @@ flux export kustomization [name] [flags]
 
   # Export a Kustomization
   flux export kustomization my-app > kustomization.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_receiver.md b/docs/cmd/flux_export_receiver.md
index 425016c027772be1fab0cd8180d7993dfe2cbc7d..029f6ca4e734ff732ee90e725787ed452ffddbf4 100644
--- a/docs/cmd/flux_export_receiver.md
+++ b/docs/cmd/flux_export_receiver.md
@@ -21,7 +21,6 @@ flux export receiver [name] [flags]
 
   # Export a Receiver
   flux export receiver main > main.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_source_bucket.md b/docs/cmd/flux_export_source_bucket.md
index 8e55050e5e41e2cd39b5d2d22f1ba68b220aa906..747da10ed4fd34603007b77a17c74bb7e97720b8 100644
--- a/docs/cmd/flux_export_source_bucket.md
+++ b/docs/cmd/flux_export_source_bucket.md
@@ -21,7 +21,6 @@ flux export source bucket [name] [flags]
 
   # Export a Bucket source including the static credentials
   flux export source bucket my-bucket --with-credentials > source.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_source_git.md b/docs/cmd/flux_export_source_git.md
index 12e14fd4a511c15906e1bf99a85008298a14cb57..abd55828d7cb1341c1e028928e30a3ff0da13039 100644
--- a/docs/cmd/flux_export_source_git.md
+++ b/docs/cmd/flux_export_source_git.md
@@ -21,7 +21,6 @@ flux export source git [name] [flags]
 
   # Export a GitRepository source including the SSH key pair or basic auth credentials
   flux export source git my-private-repo --with-credentials > source.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_export_source_helm.md b/docs/cmd/flux_export_source_helm.md
index b0881c375b5689e72f04545cd771c77588104ff8..a9788982d123ee943093332ce4b4a7104ec0e662 100644
--- a/docs/cmd/flux_export_source_helm.md
+++ b/docs/cmd/flux_export_source_helm.md
@@ -21,7 +21,6 @@ flux export source helm [name] [flags]
 
   # Export a HelmRepository source including the basic auth credentials
   flux export source helm my-private-repo --with-credentials > source.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_alert-providers.md b/docs/cmd/flux_get_alert-providers.md
index b0915cb61df5c4c160ac6dcc1ee6b4da2fff66aa..941cc9b6511a4380c64ea7cb2753bca1142f00c3 100644
--- a/docs/cmd/flux_get_alert-providers.md
+++ b/docs/cmd/flux_get_alert-providers.md
@@ -18,7 +18,6 @@ flux get alert-providers [flags]
 ```
   # List all Providers and their status
   flux get alert-providers
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_alerts.md b/docs/cmd/flux_get_alerts.md
index 087adff64be462d10650f0457de0e405c32b6ba6..bf301b14016ce700d4a47af0f8134864a27beb0c 100644
--- a/docs/cmd/flux_get_alerts.md
+++ b/docs/cmd/flux_get_alerts.md
@@ -18,7 +18,6 @@ flux get alerts [flags]
 ```
   # List all Alerts and their status
   flux get alerts
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_helmreleases.md b/docs/cmd/flux_get_helmreleases.md
index 2182827aec9cd110ceb44f77a908e24b1f6735ba..7d36d804e38363b2ef1ec84421785b476059e848 100644
--- a/docs/cmd/flux_get_helmreleases.md
+++ b/docs/cmd/flux_get_helmreleases.md
@@ -18,7 +18,6 @@ flux get helmreleases [flags]
 ```
   # List all Helm releases and their status
   flux get helmreleases
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_images_all.md b/docs/cmd/flux_get_images_all.md
index c8671912ccb3ecf11630e3054b934074cc103e78..2434086908fdb8712ffdb184ab5f72057656487c 100644
--- a/docs/cmd/flux_get_images_all.md
+++ b/docs/cmd/flux_get_images_all.md
@@ -21,7 +21,6 @@ flux get images all [flags]
 
   # List all image objects in all namespaces
   flux get images all --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_images_policy.md b/docs/cmd/flux_get_images_policy.md
index e1447ccd2b9aadacf8499bde4d4698f7dcf10ef6..82be06aa2c40ec0b2077340334b49b5204354f77 100644
--- a/docs/cmd/flux_get_images_policy.md
+++ b/docs/cmd/flux_get_images_policy.md
@@ -21,7 +21,6 @@ flux get images policy [flags]
 
  # List image policies from all namespaces
   flux get image policy --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_images_repository.md b/docs/cmd/flux_get_images_repository.md
index 8a9077c5f600aebe030e5880558a50f00e74a22b..7eddda3a1fa03bc558ba1103b2d8274cb4432df6 100644
--- a/docs/cmd/flux_get_images_repository.md
+++ b/docs/cmd/flux_get_images_repository.md
@@ -21,7 +21,6 @@ flux get images repository [flags]
 
  # List image repositories from all namespaces
   flux get image repository --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_images_update.md b/docs/cmd/flux_get_images_update.md
index 339ba9bead8dde3a3e02b09caefd6c39304aeb46..ad669d11a80857429414d7fa2f49e9278b5b34d5 100644
--- a/docs/cmd/flux_get_images_update.md
+++ b/docs/cmd/flux_get_images_update.md
@@ -21,7 +21,6 @@ flux get images update [flags]
 
  # List image update automations from all namespaces
   flux get image update --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_kustomizations.md b/docs/cmd/flux_get_kustomizations.md
index d51c672e7860fbdc58ddad7e8d0b28583085b4f8..df12b895d0f2983abcbeb65639e13d295b47d08f 100644
--- a/docs/cmd/flux_get_kustomizations.md
+++ b/docs/cmd/flux_get_kustomizations.md
@@ -18,7 +18,6 @@ flux get kustomizations [flags]
 ```
   # List all kustomizations and their status
   flux get kustomizations
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_receivers.md b/docs/cmd/flux_get_receivers.md
index bae28f72d67957dc3ee09b0f35c0f9ee0526c0b3..06a26b7243e50a7cd8bc099917125446033c250f 100644
--- a/docs/cmd/flux_get_receivers.md
+++ b/docs/cmd/flux_get_receivers.md
@@ -18,7 +18,6 @@ flux get receivers [flags]
 ```
   # List all Receiver and their status
   flux get receivers
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_sources_all.md b/docs/cmd/flux_get_sources_all.md
index 702874b46fcfe148ba4674b4f671d67df8307d4d..aac42a52d4f3a7baea1825b23c41512b5ee7e8ed 100644
--- a/docs/cmd/flux_get_sources_all.md
+++ b/docs/cmd/flux_get_sources_all.md
@@ -21,7 +21,6 @@ flux get sources all [flags]
 
   # List all sources in all namespaces
   flux get sources all --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_sources_bucket.md b/docs/cmd/flux_get_sources_bucket.md
index af14e6e93aa33d84961b739cc5f4ebf84d060b6b..17df951cb9394e9e0d9921225c4d0d38c5d02a83 100644
--- a/docs/cmd/flux_get_sources_bucket.md
+++ b/docs/cmd/flux_get_sources_bucket.md
@@ -21,7 +21,6 @@ flux get sources bucket [flags]
 
  # List buckets from all namespaces
   flux get sources helm --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_sources_chart.md b/docs/cmd/flux_get_sources_chart.md
index a49a518dea8bc4fe83c5f6f7764b817c4aaa47a1..337a1cd6227a688e9e17b36be7f001e7ed2b1069 100644
--- a/docs/cmd/flux_get_sources_chart.md
+++ b/docs/cmd/flux_get_sources_chart.md
@@ -21,7 +21,6 @@ flux get sources chart [flags]
 
  # List Helm charts from all namespaces
   flux get sources chart --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_sources_git.md b/docs/cmd/flux_get_sources_git.md
index e899a45944fb423f2f31738ebad52f33c944fee7..dc5587b09205d03799cd040fca289e4243e7b7e1 100644
--- a/docs/cmd/flux_get_sources_git.md
+++ b/docs/cmd/flux_get_sources_git.md
@@ -21,7 +21,6 @@ flux get sources git [flags]
 
  # List Git repositories from all namespaces
   flux get sources git --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_get_sources_helm.md b/docs/cmd/flux_get_sources_helm.md
index 4980402ecf5c09d348f03f734b20c89f5ccf432e..4c06bd90ee42bab3d4ef6e3fc84f756f44205682 100644
--- a/docs/cmd/flux_get_sources_helm.md
+++ b/docs/cmd/flux_get_sources_helm.md
@@ -21,7 +21,6 @@ flux get sources helm [flags]
 
  # List Helm repositories from all namespaces
   flux get sources helm --all-namespaces
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_install.md b/docs/cmd/flux_install.md
index 069f76184f01b45328508f41e2fac14fb824c848..db27b0edf04009f6f5f78afe22f8dd520a07f3e1 100644
--- a/docs/cmd/flux_install.md
+++ b/docs/cmd/flux_install.md
@@ -31,7 +31,6 @@ flux install [flags]
 
   # Write install manifests to file
   flux install --export > flux-system.yaml
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_alert-provider.md b/docs/cmd/flux_reconcile_alert-provider.md
index 29b88ba4c43f55b6d4ce3bab4a73b403524720cd..9ee8a2e7364105bd0c9a48f808296b358af8a423 100644
--- a/docs/cmd/flux_reconcile_alert-provider.md
+++ b/docs/cmd/flux_reconcile_alert-provider.md
@@ -18,7 +18,6 @@ flux reconcile alert-provider [name] [flags]
 ```
   # Trigger a reconciliation for an existing provider
   flux reconcile alert-provider slack
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_alert.md b/docs/cmd/flux_reconcile_alert.md
index 3851d02bf33dd1d85a809c545e7a8b5fefeb726e..60da98514754004981c65517787bb5c42fbcd43f 100644
--- a/docs/cmd/flux_reconcile_alert.md
+++ b/docs/cmd/flux_reconcile_alert.md
@@ -18,7 +18,6 @@ flux reconcile alert [name] [flags]
 ```
   # Trigger a reconciliation for an existing alert
   flux reconcile alert main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_helmrelease.md b/docs/cmd/flux_reconcile_helmrelease.md
index 51450cc87e784f56ab4cf1cda238354b7235c364..57d09cdb16ab0a5cf05fced4ac2e46224f8b721c 100644
--- a/docs/cmd/flux_reconcile_helmrelease.md
+++ b/docs/cmd/flux_reconcile_helmrelease.md
@@ -22,7 +22,6 @@ flux reconcile helmrelease [name] [flags]
 
   # Trigger a reconciliation of the HelmRelease's source and apply changes
   flux reconcile hr podinfo --with-source
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_image_repository.md b/docs/cmd/flux_reconcile_image_repository.md
index d985aab50af06679fc0af5ad3e75df232894963a..a2ad7fe689b84b31da2888750d22386c9c53e93e 100644
--- a/docs/cmd/flux_reconcile_image_repository.md
+++ b/docs/cmd/flux_reconcile_image_repository.md
@@ -18,7 +18,6 @@ flux reconcile image repository [name] [flags]
 ```
   # Trigger an scan for an existing image repository
   flux reconcile image repository alpine
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_image_update.md b/docs/cmd/flux_reconcile_image_update.md
index 05afebc7224ce10dbd207444e7df75f34fc337cb..c06d87074e22668dcd6d09847c461b009853aa03 100644
--- a/docs/cmd/flux_reconcile_image_update.md
+++ b/docs/cmd/flux_reconcile_image_update.md
@@ -18,7 +18,6 @@ flux reconcile image update [name] [flags]
 ```
   # Trigger an automation run for an existing image update automation
   flux reconcile image update latest-images
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_kustomization.md b/docs/cmd/flux_reconcile_kustomization.md
index c743ee277363e824019d227994b66c1c44cb2ef7..ce0e287ffc3ef6d3a03be81369c921fb790e70c2 100644
--- a/docs/cmd/flux_reconcile_kustomization.md
+++ b/docs/cmd/flux_reconcile_kustomization.md
@@ -22,7 +22,6 @@ flux reconcile kustomization [name] [flags]
 
   # Trigger a sync of the Kustomization's source and apply changes
   flux reconcile kustomization podinfo --with-source
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_receiver.md b/docs/cmd/flux_reconcile_receiver.md
index 2bec3b85f4e19d4b6c51b17c47362043440fc19f..86e25893aa9509f53e4c28099ed4a00b159793a4 100644
--- a/docs/cmd/flux_reconcile_receiver.md
+++ b/docs/cmd/flux_reconcile_receiver.md
@@ -18,7 +18,6 @@ flux reconcile receiver [name] [flags]
 ```
   # Trigger a reconciliation for an existing receiver
   flux reconcile receiver main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_source_bucket.md b/docs/cmd/flux_reconcile_source_bucket.md
index 628ac796890a287710b60270803cf36d1f380f42..61cd00b01bdcbc800f50f777e2b6ebd4d8951adb 100644
--- a/docs/cmd/flux_reconcile_source_bucket.md
+++ b/docs/cmd/flux_reconcile_source_bucket.md
@@ -18,7 +18,6 @@ flux reconcile source bucket [name] [flags]
 ```
   # Trigger a reconciliation for an existing source
   flux reconcile source bucket podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_source_git.md b/docs/cmd/flux_reconcile_source_git.md
index f38227ad2c2996e306ab09092d03a2e4217c9f92..792387feac81d21ab311a7ef9a938161c06c8dbe 100644
--- a/docs/cmd/flux_reconcile_source_git.md
+++ b/docs/cmd/flux_reconcile_source_git.md
@@ -18,7 +18,6 @@ flux reconcile source git [name] [flags]
 ```
   # Trigger a git pull for an existing source
   flux reconcile source git podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_reconcile_source_helm.md b/docs/cmd/flux_reconcile_source_helm.md
index 53d0b8e177195b3751c439435aa294ff7b88f772..7090425365b3851383e65378aa7e73e0a7a8a911 100644
--- a/docs/cmd/flux_reconcile_source_helm.md
+++ b/docs/cmd/flux_reconcile_source_helm.md
@@ -18,7 +18,6 @@ flux reconcile source helm [name] [flags]
 ```
   # Trigger a reconciliation for an existing source
   flux reconcile source helm podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_alert.md b/docs/cmd/flux_resume_alert.md
index a43bc8261f18d01016a74fdac0a9d544d0e12fd5..b029e91266028268d277aa9079dc3e447b162b0a 100644
--- a/docs/cmd/flux_resume_alert.md
+++ b/docs/cmd/flux_resume_alert.md
@@ -19,7 +19,6 @@ flux resume alert [name] [flags]
 ```
   # Resume reconciliation for an existing Alert
   flux resume alert main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_helmrelease.md b/docs/cmd/flux_resume_helmrelease.md
index ed3b845a06b976d1e8b1f6e0ff20df2e0347d71c..3ee2675104638ae73e906e02b69ddd0cbb0ffc46 100644
--- a/docs/cmd/flux_resume_helmrelease.md
+++ b/docs/cmd/flux_resume_helmrelease.md
@@ -19,7 +19,6 @@ flux resume helmrelease [name] [flags]
 ```
   # Resume reconciliation for an existing Helm release
   flux resume hr podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_image_repository.md b/docs/cmd/flux_resume_image_repository.md
index d09c2e855b74dd5c80c4871f42ebb48ee8b9e70b..c9cb8125572b065f266b73e7268e837f301d2cde 100644
--- a/docs/cmd/flux_resume_image_repository.md
+++ b/docs/cmd/flux_resume_image_repository.md
@@ -18,7 +18,6 @@ flux resume image repository [name] [flags]
 ```
   # Resume reconciliation for an existing ImageRepository
   flux resume image repository alpine
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_image_update.md b/docs/cmd/flux_resume_image_update.md
index a60e4a68d61c17c9464b5037b0f30138b8f50e4a..7aefac6cdaee50dd5bfe9b4b0b9aafde896d86a0 100644
--- a/docs/cmd/flux_resume_image_update.md
+++ b/docs/cmd/flux_resume_image_update.md
@@ -18,7 +18,6 @@ flux resume image update [name] [flags]
 ```
   # Resume reconciliation for an existing ImageUpdateAutomation
   flux resume image update latest-images
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_kustomization.md b/docs/cmd/flux_resume_kustomization.md
index 6ef7302173cfadfd7dc83d52b1008d76368a5492..5bae0964e322328e9d897407e2e046d5b44b8fbb 100644
--- a/docs/cmd/flux_resume_kustomization.md
+++ b/docs/cmd/flux_resume_kustomization.md
@@ -19,7 +19,6 @@ flux resume kustomization [name] [flags]
 ```
   # Resume reconciliation for an existing Kustomization
   flux resume ks podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_receiver.md b/docs/cmd/flux_resume_receiver.md
index 1badbf479fa9b1bba6509d3724010418c3001050..30fa2451f629cf8a8cb912d46684dc5bc2a8c1e6 100644
--- a/docs/cmd/flux_resume_receiver.md
+++ b/docs/cmd/flux_resume_receiver.md
@@ -19,7 +19,6 @@ flux resume receiver [name] [flags]
 ```
   # Resume reconciliation for an existing Receiver
   flux resume receiver main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_source_bucket.md b/docs/cmd/flux_resume_source_bucket.md
index 9872a3663f2bae2d5f08a9e2c2a658ab67f03475..ea8a1dec966fd9fe82a33315ae1daec9a57fc6b2 100644
--- a/docs/cmd/flux_resume_source_bucket.md
+++ b/docs/cmd/flux_resume_source_bucket.md
@@ -18,7 +18,6 @@ flux resume source bucket [name] [flags]
 ```
   # Resume reconciliation for an existing Bucket
   flux resume source bucket podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_source_chart.md b/docs/cmd/flux_resume_source_chart.md
index 8be6667e9f4a93fb79adec14bdcf41d2df380d03..b23d030d57a0fb9a0e766d9a7afc2fb95d45f57f 100644
--- a/docs/cmd/flux_resume_source_chart.md
+++ b/docs/cmd/flux_resume_source_chart.md
@@ -18,7 +18,6 @@ flux resume source chart [name] [flags]
 ```
   # Resume reconciliation for an existing HelmChart
   flux resume source chart podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_source_git.md b/docs/cmd/flux_resume_source_git.md
index 11ecc892dba45ca19e20093929b295dbe5a63301..10f8dfc12f035eef8fd59c7964b0f89378f2c898 100644
--- a/docs/cmd/flux_resume_source_git.md
+++ b/docs/cmd/flux_resume_source_git.md
@@ -18,7 +18,6 @@ flux resume source git [name] [flags]
 ```
   # Resume reconciliation for an existing GitRepository
   flux resume source git podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_resume_source_helm.md b/docs/cmd/flux_resume_source_helm.md
index 5c171adee53e7fd28b15db3acc833857d9ec04ba..658fd0abbc3da614668abf60f054326cd47755a0 100644
--- a/docs/cmd/flux_resume_source_helm.md
+++ b/docs/cmd/flux_resume_source_helm.md
@@ -18,7 +18,6 @@ flux resume source helm [name] [flags]
 ```
   # Resume reconciliation for an existing HelmRepository
   flux resume source helm bitnami
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_alert.md b/docs/cmd/flux_suspend_alert.md
index e262c837dc235410f4b4365a42deccad3897f461..0bcc24dbbf92605ff8c15642c11516531af920f3 100644
--- a/docs/cmd/flux_suspend_alert.md
+++ b/docs/cmd/flux_suspend_alert.md
@@ -18,7 +18,6 @@ flux suspend alert [name] [flags]
 ```
   # Suspend reconciliation for an existing Alert
   flux suspend alert main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_helmrelease.md b/docs/cmd/flux_suspend_helmrelease.md
index 3b72d537c6b6dc99a083fb86f524349e9ff2daf5..926b0c492ba3d39258be8fadc8a86b1b1e79b5da 100644
--- a/docs/cmd/flux_suspend_helmrelease.md
+++ b/docs/cmd/flux_suspend_helmrelease.md
@@ -18,7 +18,6 @@ flux suspend helmrelease [name] [flags]
 ```
   # Suspend reconciliation for an existing Helm release
   flux suspend hr podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_image_repository.md b/docs/cmd/flux_suspend_image_repository.md
index 545f0decb9f3d0779fc51d45a754d7d34d357280..a695390a8a5655ae5f1fcb24a827e4921fe8a978 100644
--- a/docs/cmd/flux_suspend_image_repository.md
+++ b/docs/cmd/flux_suspend_image_repository.md
@@ -18,7 +18,6 @@ flux suspend image repository [name] [flags]
 ```
   # Suspend reconciliation for an existing ImageRepository
   flux suspend image repository alpine
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_image_update.md b/docs/cmd/flux_suspend_image_update.md
index 16e23ac2d96d8de490fbee13acba2b453f144ced..6775b3a4b247ef7cfd5fab4c1c81ee10cd54a4ad 100644
--- a/docs/cmd/flux_suspend_image_update.md
+++ b/docs/cmd/flux_suspend_image_update.md
@@ -18,7 +18,6 @@ flux suspend image update [name] [flags]
 ```
   # Suspend reconciliation for an existing ImageUpdateAutomation
   flux suspend image update latest-images
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_kustomization.md b/docs/cmd/flux_suspend_kustomization.md
index 3a31148c0f23886f6e78653793b8bbb89db44862..a4114ef19a41d048e43ebda7117aa3670fd670b5 100644
--- a/docs/cmd/flux_suspend_kustomization.md
+++ b/docs/cmd/flux_suspend_kustomization.md
@@ -18,7 +18,6 @@ flux suspend kustomization [name] [flags]
 ```
   # Suspend reconciliation for an existing Kustomization
   flux suspend ks podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_receiver.md b/docs/cmd/flux_suspend_receiver.md
index a41234bec8538192566a01ff64b89b0b8c5aed95..a0ebd0291f6a629278a9a20d435de661cccedc84 100644
--- a/docs/cmd/flux_suspend_receiver.md
+++ b/docs/cmd/flux_suspend_receiver.md
@@ -18,7 +18,6 @@ flux suspend receiver [name] [flags]
 ```
   # Suspend reconciliation for an existing Receiver
   flux suspend receiver main
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_source_bucket.md b/docs/cmd/flux_suspend_source_bucket.md
index ecfdd8317931db63f0f0077a011dcef70fe9f995..d869c3460ca42de57fbbf0ef2b42f3947fa1c494 100644
--- a/docs/cmd/flux_suspend_source_bucket.md
+++ b/docs/cmd/flux_suspend_source_bucket.md
@@ -18,7 +18,6 @@ flux suspend source bucket [name] [flags]
 ```
   # Suspend reconciliation for an existing Bucket
   flux suspend source bucket podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_source_chart.md b/docs/cmd/flux_suspend_source_chart.md
index 137bce9c2bf4006486aee0d362c3a7430fec120b..cdab6a82982ec337be7ebff8c647ae8faa8cfc6e 100644
--- a/docs/cmd/flux_suspend_source_chart.md
+++ b/docs/cmd/flux_suspend_source_chart.md
@@ -18,7 +18,6 @@ flux suspend source chart [name] [flags]
 ```
   # Suspend reconciliation for an existing HelmChart
   flux suspend source chart podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_source_git.md b/docs/cmd/flux_suspend_source_git.md
index d0fdef388136c468e7cd7e8f1e7b02ab2409655d..bf4aa6d2ae6e69378dfa9ed65ce2449882afd094 100644
--- a/docs/cmd/flux_suspend_source_git.md
+++ b/docs/cmd/flux_suspend_source_git.md
@@ -18,7 +18,6 @@ flux suspend source git [name] [flags]
 ```
   # Suspend reconciliation for an existing GitRepository
   flux suspend source git podinfo
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_suspend_source_helm.md b/docs/cmd/flux_suspend_source_helm.md
index b37234758520821b3590e142ac8e0f7b779d6b79..ed4d7a42f03e3b9c200ce52c4de1bb52f7e5c638 100644
--- a/docs/cmd/flux_suspend_source_helm.md
+++ b/docs/cmd/flux_suspend_source_helm.md
@@ -18,7 +18,6 @@ flux suspend source helm [name] [flags]
 ```
   # Suspend reconciliation for an existing HelmRepository
   flux suspend source helm bitnami
-
 ```
 
 ### Options
diff --git a/docs/cmd/flux_uninstall.md b/docs/cmd/flux_uninstall.md
index 28006c1936dd7d87cbba2eb89df672538649510a..1815ddfd3a901472f7ac480d9e5fd7b37153a05c 100644
--- a/docs/cmd/flux_uninstall.md
+++ b/docs/cmd/flux_uninstall.md
@@ -21,7 +21,6 @@ flux uninstall [flags]
 
   # Uninstall Flux but keep the namespace
   flux uninstall --namespace=infra --keep-namespace=true
-
 ```
 
 ### Options