From 4034f988dfcd3648d839581e3e6ef754216785d8 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 9 Aug 2017 14:01:45 -0400 Subject: [PATCH] update import command docs Fix the -state and -state-out wording to be consistent with other commands. Remove the erroneous reference to remote state in the website version of the flag description. --- command/import.go | 9 +++++---- website/docs/commands/import.html.md | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/command/import.go b/command/import.go index b2c0549ff..e455bb53c 100644 --- a/command/import.go +++ b/command/import.go @@ -235,11 +235,12 @@ Options: specifying aliases, such as "aws.eu". Defaults to the normal provider prefix of the resource being imported. - -state=path Path to read and save state (unless state-out - is specified). Defaults to "terraform.tfstate". + -state=PATH Path to the source state file. Defaults to the configured + backend, or "terraform.tfstate" - -state-out=path Path to write updated state file. By default, the - "-state" path will be used. + -state-out=PATH Path to the destination state file to write to. If this + isn't specified, the source state file will be used. This + can be a new or existing path. -var 'foo=bar' Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful diff --git a/website/docs/commands/import.html.md b/website/docs/commands/import.html.md index 4862f87ec..2662b72ed 100644 --- a/website/docs/commands/import.html.md +++ b/website/docs/commands/import.html.md @@ -53,12 +53,12 @@ The command-line flags are all optional. The list of available flags are: provider based on the prefix of the resource being imported. You usually don't need to specify this. -* `-state=path` - The path to read and save state files (unless state-out is - specified). Ignored when [remote state](/docs/state/remote.html) is used. +* `-state=path` - Path to the source state file to read from. Defaults to the + configured backend, or "terraform.tfstate". -* `-state-out=path` - Path to write the final state file. By default, this is - the state path. Ignored when [remote state](/docs/state/remote.html) is - used. +* `-state-out=path` - Path to the destination state file to write to. If this + isn't specified the source state file will be used. This can be a new or + existing path. * `-var 'foo=bar'` - Set a variable in the Terraform configuration. This flag can be set multiple times. Variable values are interpreted as