Merge branch 'basecamp:main' into main

basecamp · Sep 27, 2024 · 92b2278 · 92b2278
2 parents 1ae8dcf + 347ce2c
commit 92b2278
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/docs/commands/redeploy.md b/docs/commands/redeploy.md
@@ -4,6 +4,6 @@ title: Redeploy
 
 # kamal redeploy
 
-Deploy your app, but skip bootstrapping servers, starting Traefik, pruning, and registry login.
+Deploy your app, but skip bootstrapping servers, starting kamal-proxy, pruning, and registry login.
 
 You must run [`kamal deploy`](../deploy) at least once first.
diff --git a/docs/commands/remove.md b/docs/commands/remove.md
@@ -4,6 +4,6 @@ title: Remove
 
 # kamal remove
 
-This will remove app, Traefik and accessory containers and log out of the docker registry.
+This will remove app, kamal-proxy and accessory containers and log out of the docker registry.
 
 It will prompt for confirmation unless you add the `-y` option.
diff --git a/docs/configuration/environment-variables.md b/docs/configuration/environment-variables.md
@@ -22,7 +22,7 @@ env:
 
 Kamal uses dotenv to automatically load environment variables set in the `.kamal/secrets` file.
 
-If you are using destinations, secrets will instead be read from `.kamal/secrets-<DESTINATION>` if it exists.
+If you are using destinations, secrets will instead be read from `.kamal/secrets.<DESTINATION>` if it exists.
 
 Common secrets across all destinations can be set in `.kamal/secrets-common`.
 
@@ -33,7 +33,7 @@ KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
 RAILS_MASTER_KEY=$(cat config/master.key)
 ```
 
-You can also use [secret helpers](../commands/secrets) for some common password managers.
+You can also use [secret helpers](../../commands/secrets) for some common password managers.
 
 ```
 SECRETS=$(kamal secrets fetch ...)

diff --git a/docs/upgrading/secrets-changes.md b/docs/upgrading/secrets-changes.md
@@ -4,9 +4,9 @@ title: Secrets changes
 
 # Kamal 2: Secrets changes
 
-Secrets have moved from `.env`/`.env.rb` to `.kamal/secrets.`
+Secrets have moved from `.env`/`.env.rb` to `.kamal/secrets`.
 
-If you are using destinations, secrets will be read from `.kamal/secrets-<DESTINATION>` first or `.kamal/secrets` if it is not found.
+If you are using destinations, secrets will be read from `.kamal/secrets.<DESTINATION>` first or `.kamal/secrets` if it is not found.
 
 ## [Interpolating secrets](#interpolating-secrets)
 
@@ -23,7 +23,7 @@ SECRET_FROM_ENV=$SECRET_FROM_ENV
 SECRET_FROM_COMMAND=$(op read ...)
 ```
 
-See [here](../configuration/environment-variables#using-kamal-secrets) for more details
+See [here](../configuration/environment-variables#secrets) for more details
 
 ## [Environment variables in deploy.yml](#environment-variables-in-deployyml)