Merge pull request #2331 from mitchellh/b-awsami

Change docs usage of aws.ami to amazon.ami to be consistent with terraform

website/source/docs/post-processors/atlas.html.markdown

@@ -37,7 +37,7 @@ The configuration allows you to specify and access the artifact in Atlas.
   have access to the organization, hashicorp in this example, in order to add an artifact to
   the organization in Atlas.
 
-* `artifact_type` (string) - For uploading AMIs to Atlas, `artifact_type` will always be `aws.ami`.
+* `artifact_type` (string) - For uploading AMIs to Atlas, `artifact_type` will always be `amazon.ami`.
   This field must be defined because Atlas can host other artifact types, such as Vagrant boxes.
 
 -> **Note:** If you want to upload Vagrant boxes to Atlas, for now use the [Vagrant Cloud post-processor](/docs/post-processors/vagrant-cloud.html).
@@ -85,7 +85,7 @@ to `https://atlas.hashicorp.com/api/v1`.
         "type": "atlas",
         "token": "{{user `atlas_token`}}",
         "artifact": "hashicorp/foobar",
-        "artifact_type": "aws.ami",
+        "artifact_type": "amazon.ami",
         "metadata": {
           "created_at": "{{timestamp}}"
         }

website/source/intro/getting-started/remote-builds.html.markdown

@@ -66,7 +66,7 @@ Now we have Atlas building an AMI with Redis pre-configured. This is great, but
     {
       "type": "atlas",
       "artifact": "ATLAS_USERNAME/packer-tutorial",
-      "artifact_type": "aws.ami"
+      "artifact_type": "amazon.ami"
     }
   ]
 }