Skip to content

Commit

Permalink
Spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
steve-fenton-octopus committed Oct 24, 2023
1 parent af1b3fa commit b6b37f5
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 27 deletions.
25 changes: 15 additions & 10 deletions dictionary-octopus.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
apikey
astro
deallocate
deallocated
runbook
runbooks
FIPS
HKEY
HKLM
hotfix
hotfixes
HSTS
ITSM
FIPS
maxage
msiexec
MTTR
nologs
NTLM
octobak
OIDC
onlylogs
HSTS
MTTR
sthumb
swaggerui
apikey
reprioritize
reprovisioned
reprovisioning
runbook
runbooks
sthumb
swaggerui
systemprofile
upgradelog
xmark
msiexec
systemprofile
WIXUI
DONTVALIDATEPATH
Octo
octopusid
Schannel
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"img": "node --no-experimental-fetch ./src/themes/accelerator/utilities/img.mjs",
"dev": "node --no-experimental-fetch ./src/themes/accelerator/utilities/img.mjs && astro dev",
"test": "astro build && npx playwright install --with-deps && npx playwright test",
"spellcheck": "git fetch origin main:refs/remotes/origin/main && git diff origin/main --name-only | cspell --file-list stdin",
"spellcheck": "git fetch origin main:refs/remotes/origin/main && git diff origin/main --name-only --diff-filter=ACMRTUXB | cspell --file-list stdin",
"build": "astro build",
"preview": "astro preview",
"astro": "astro",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ navOrder: 3
import OctopusBackupMasterKey from 'src/shared-content/upgrade/upgrade-octopus-backup-master-key.include.md';
import UpgradeDownloadLatestVersion from 'src/shared-content/upgrade/upgrade-download-latest-version.include.md';
import UpgradeOctopusBackupDatabase from 'src/shared-content/upgrade/upgrade-octopus-backup-database.include.md';
import UpgradeInplaceUpgrade from 'src/shared-content/upgrade/upgrade-inplace-upgrade.include.md';
import UpgradeInPlaceUpgrade from 'src/shared-content/upgrade/upgrade-in-place-upgrade.include.md';
import UpgradeTestingUpgradedInstance from 'src/shared-content/upgrade/upgrade-testing-upgraded-instance.include.md';
import UpgradeHighAvailability from 'src/shared-content/upgrade/upgrade-high-availability.include.md';
import UpgradeRestoreBackup from 'src/shared-content/upgrade/upgrade-restore-backup.include.md';
Expand Down Expand Up @@ -64,7 +64,7 @@ The steps for this are:

<UpgradeOctopusBackupDatabase />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ navOrder: 2
import OctopusBackupMasterKey from 'src/shared-content/upgrade/upgrade-octopus-backup-master-key.include.md';
import UpgradeDownloadLatestVersion from 'src/shared-content/upgrade/upgrade-download-latest-version.include.md';
import UpgradeOctopusBackupDatabase from 'src/shared-content/upgrade/upgrade-octopus-backup-database.include.md';
import UpgradeInplaceUpgrade from 'src/shared-content/upgrade/upgrade-inplace-upgrade.include.md';
import UpgradeInPlaceUpgrade from 'src/shared-content/upgrade/upgrade-in-place-upgrade.include.md';
import UpgradeTestingUpgradedInstance from 'src/shared-content/upgrade/upgrade-testing-upgraded-instance.include.md';
import UpgradeHighAvailability from 'src/shared-content/upgrade/upgrade-high-availability.include.md';
import UpgradeRestoreBackup from 'src/shared-content/upgrade/upgrade-restore-backup.include.md';
Expand Down Expand Up @@ -45,7 +45,7 @@ The steps for this are:

<UpgradeOctopusBackupDatabase />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ navSearch: false
import OctopusBackupMasterKey from 'src/shared-content/upgrade/upgrade-octopus-backup-master-key.include.md';
import UpgradeDownloadLatestVersion from 'src/shared-content/upgrade/upgrade-download-latest-version.include.md';
import UpgradeOctopusBackupDatabase from 'src/shared-content/upgrade/upgrade-octopus-backup-database.include.md';
import UpgradeInplaceUpgrade from 'src/shared-content/upgrade/upgrade-inplace-upgrade.include.md';
import UpgradeInPlaceUpgrade from 'src/shared-content/upgrade/upgrade-in-place-upgrade.include.md';
import UpgradeTestingUpgradedInstance from 'src/shared-content/upgrade/upgrade-testing-upgraded-instance.include.md';
import UpgradeHighAvailability from 'src/shared-content/upgrade/upgrade-high-availability.include.md';
import UpgradeRestoreBackup from 'src/shared-content/upgrade/upgrade-restore-backup.include.md';
Expand Down Expand Up @@ -71,7 +71,7 @@ The steps for this are:

<UpgradeOctopusBackupDatabase />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down Expand Up @@ -129,7 +129,7 @@ DELETE FROM ExtensionConfiguration WHERE Id in ('authentication-octopusid', 'jir
Remember to replace `OctopusDeploy` with the name of your database.
:::

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down Expand Up @@ -172,7 +172,7 @@ The steps for this are:

<UpgradeOctopusBackupDatabase />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down Expand Up @@ -204,7 +204,7 @@ While unlikely, an upgrade may fail. It could fail on a database upgrade script

Earlier versions of 3.x, including 3.1, 3.4, and 3.5, also carry some additional caveats to make a note of. Before upgrading to a modern version of Octopus Deploy, please keep these in mind.

### Upgrading to Octopus 3.1 or greater \{#UpgradingfromOctopus3.x-UpgradingTo31UpgradingtoOctopus3.1orgreater}
### Upgrading to Octopus 3.1 or greater

Summary: Tentacle was upgraded from .NET 4.0 to .NET 4.5 to enable TLS 1.2.

Expand Down Expand Up @@ -243,21 +243,21 @@ No, from **Octopus 3.1** onward, we are dropping official support for Octopus Se
Read more about the [Octopus - Tentacle communication](/docs/security/octopus-tentacle-communication/) protocol and [Troubleshooting Schannel and TLS](/docs/security/octopus-tentacle-communication/troubleshooting-schannel-and-tls).
:::

### Upgrading to Octopus 3.4 or greater \{#UpgradingfromOctopus3.x-UpgradingtoOctopus3.4orgreater}
### Upgrading to Octopus 3.4 or greater

See the [Release Notes](https://octopus.com/downloads/compare?from=3.3.27&amp;to=3.4.0) for breaking changes and more information.

**Using TeamCity NuGet feeds?** You will need to upgrade your TeamCity server to v9.0 or newer and [enable the NuGet v2 API](https://teamcity-support.jetbrains.com/hc/en-us/community/posts/206817105-How-to-enable-NuGet-feed-v2). **Octopus 3.4**+ no longer supports the custom NuGet v1 feeds from TeamCity 7.x-8.x. We recommend upgrading to the latest TeamCity version available due to continual improvements in their NuGet feed - or switch to using the [Octopus built-in repository](/docs/packaging-applications/package-repositories).

**Want to use SemVer 2 for packages or releases?** You will need to upgrade OctoPack and/or Octopus CLI to 3.4 or newer.

### Upgrading to Octopus 3.5 or greater \{#UpgradingfromOctopus3.x-UpgradingtoOctopus3.5orgreater}
### Upgrading to Octopus 3.5 or greater

Some server configuration values are moved from the config file into the database in 3.5+.

If you are upgrading to a 3.5+ version, please backup your server config file prior to upgrading. If you need to downgrade, then replace the config with the original file after the downgrade and restart the Octopus Server.

## Troubleshooting \{#UpgradingfromOctopus3.x-Troubleshooting}
## Troubleshooting

In a few cases, a bug in a 3rd party component causes the installer to display a "Installation directory must be on a local hard drive" error. If this occurs, running the install again from an elevated command prompt using the following command (replacing Octopus.3.3.4-x64.msi with the name of the installer you are using):

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ navSearch: false
import OctopusBackupMasterKey from 'src/shared-content/upgrade/upgrade-octopus-backup-master-key.include.md';
import UpgradeDownloadLatestVersion from 'src/shared-content/upgrade/upgrade-download-latest-version.include.md';
import UpgradeOctopusBackupDatabase from 'src/shared-content/upgrade/upgrade-octopus-backup-database.include.md';
import UpgradeInplaceUpgrade from 'src/shared-content/upgrade/upgrade-inplace-upgrade.include.md';
import UpgradeInPlaceUpgrade from 'src/shared-content/upgrade/upgrade-in-place-upgrade.include.md';
import UpgradeTestingUpgradedInstance from 'src/shared-content/upgrade/upgrade-testing-upgraded-instance.include.md';
import UpgradeHighAvailability from 'src/shared-content/upgrade/upgrade-high-availability.include.md';
import UpgradeRestoreBackup from 'src/shared-content/upgrade/upgrade-restore-backup.include.md';
Expand Down Expand Up @@ -68,7 +68,7 @@ The steps for this are:

<UpgradeOctopusBackupDatabase />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down Expand Up @@ -107,7 +107,7 @@ The steps for this are:

<UpgradeOctopusBackupDatabase />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down Expand Up @@ -149,7 +149,7 @@ Creating a clone of an existing instance involves:

<UpgradeDisableTargetsClonedInstance />

<UpgradeInplaceUpgrade />
<UpgradeInPlaceUpgrade />

<UpgradeTestingUpgradedInstance />

Expand Down

0 comments on commit b6b37f5

Please sign in to comment.