diff --git a/.drevops/docs/.utils/.aspell.en.pws b/.drevops/docs/.utils/.aspell.en.pws index 3bdcd9b3d..1061142f5 100644 --- a/.drevops/docs/.utils/.aspell.en.pws +++ b/.drevops/docs/.utils/.aspell.en.pws @@ -53,6 +53,7 @@ PHPMD PHPStan PHPUnit PRs +PSR Packagist PhpStorm Profiler @@ -80,10 +81,13 @@ Upgradable VueJS WIP Webhook +Webserver Xdebug +YAML YOURORG YOURSITE acquia +amazee amazeeio assignees autotesting @@ -95,10 +99,12 @@ changelog checkstyle codebase commandfiles +config contrib cron customisations dev +docblock drush env fe @@ -116,21 +122,27 @@ md newrelic npm onboarding +overcomplicated php phpcs pre readme +roadmap runtime +runtime's sanitization scaffolded scalability sql +suboptimal toc +tokenizes toolset txt uat uncommented unmapped +untrusted upgradable url webhook diff --git a/.drevops/docs/.utils/lint.sh b/.drevops/docs/.utils/lint.sh index 2645dfdcf..2e85ed443 100755 --- a/.drevops/docs/.utils/lint.sh +++ b/.drevops/docs/.utils/lint.sh @@ -8,24 +8,24 @@ set -eu [ "${DREVOPS_DEBUG-}" = "1" ] && set -x -CUR_DIR="$(dirname "${BASH_SOURCE[0]}")" +cur_dir="$(dirname "${BASH_SOURCE[0]}")" -DICTIONARY="${CUR_DIR}/.aspell.en.pws" +dictionary="${cur_dir}/.aspell.en.pws" targets=() while IFS= read -r -d $'\0'; do targets+=("${REPLY}") done < <( find \ - "${CUR_DIR}/.." \ + "${cur_dir}/.." \ -type f \ \( -name "*.md" \) \ -not -path "*vendor*" -not -path "*node_modules*" \ -print0 ) -echo -n "==> Validating dictionary." -if head -1 "${DICTIONARY}" | grep -q "personal_ws-1.1 en 28"; then +echo -n "==> Validating dictionary... " +if head -1 "${dictionary}" | grep -q "personal_ws-1.1 en 28"; then echo "OK" else echo "ERROR: invalid dictionary format" @@ -45,14 +45,14 @@ for file in "${targets[@]}"; do # Remove HTML. sed -E 's/<([^<]+)>//g' | # Remove code blocks. - sed -n '/\`\`\`/,/\`\`\`/ !p' | + sed '/^[[:space:]]*```/,/^[[:space:]]*```/d' | # Remove inline code. - sed -n '/\`/,/\`/ !p' | + sed 's/`[^`]*`//g' | # Remove anchors. sed -E 's/\[.+\]\([^\)]+\)//g' | # Remove links. sed -E 's/http(s)?:\/\/([^ ]+)//g' | - aspell --lang=en --encoding=utf-8 --personal="${DICTIONARY}" list | tee /dev/stderr | [ "$(wc -l)" -eq 0 ] + aspell --lang=en --encoding=utf-8 --personal="${dictionary}" list | tee /dev/stderr | [ "$(wc -l)" -eq 0 ] if [ "$?" -ne 0 ]; then exit 1 diff --git a/.drevops/docs/.utils/terminalizer/README.md b/.drevops/docs/.utils/terminalizer/README.md index 0206e4b31..14761519e 100644 --- a/.drevops/docs/.utils/terminalizer/README.md +++ b/.drevops/docs/.utils/terminalizer/README.md @@ -18,7 +18,7 @@ npm install -g terminalizer terminalizer record ``` -2. Update produced YML file with settings from `example.yml`. +2. Update produced YAML file with settings from `example.yml`. 3. Render ```shell diff --git a/.drevops/docs/content/workflows/deployment.md b/.drevops/docs/content/workflows/deployment.md index 267041403..2322e4d9e 100644 --- a/.drevops/docs/content/workflows/deployment.md +++ b/.drevops/docs/content/workflows/deployment.md @@ -20,7 +20,7 @@ variable as a comma-separated list of one or multiple supported deployment types After setting up the deployment integration, you can begin using it by adding the `$DREVOPS_DEPLOY_PROCEED` variable with a value of `1` in the CircleCI user -interface. This variable is used as a failsafe to prevent accidental +interface. This variable is used as a fail-safe to prevent accidental deployments while setting up DrevOps. ## Using deployments diff --git a/.drevops/docs/content/workflows/variables.md b/.drevops/docs/content/workflows/variables.md index f2d1284db..96675b122 100644 --- a/.drevops/docs/content/workflows/variables.md +++ b/.drevops/docs/content/workflows/variables.md @@ -445,7 +445,7 @@ Defined in: `ACQUIA ENVIRONMENT` Overwrite existing database if it exists. -Usually set to `0` in deployed environments and can be temporary set to `1` for
a specific deployment.
Set this to `1` in .env.local to override when developing localy. +Usually set to `0` in deployed environments and can be temporary set to `1` for
a specific deployment.
Set this to `1` in .env.local to override when developing locally. Default value: `UNDEFINED` diff --git a/.env b/.env index 1318b8cab..002210a2d 100644 --- a/.env +++ b/.env @@ -83,7 +83,7 @@ DREVOPS_PROVISION_USE_PROFILE=0 # # Usually set to 0 in deployed environments and can be temporary set to 1 for # a specific deployment. -# Set this to 1 in .env.local to override when developing localy. +# Set this to 1 in .env.local to override when developing locally. DREVOPS_PROVISION_OVERRIDE_DB=0 # Skip database sanitization.