diff --git a/docs/index.html b/docs/index.html
index b353147..00b9f55 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -860,7 +860,11 @@
FAQ
Troubleshooting
Customer responsibility
-Parameter reference
+Parameter reference
+
+
Send us feedback
Quick Start reference deployments
GitHub repository
@@ -1444,6 +1448,86 @@ Parameter reference
+
+
Deploy AWS Marketplace SaaS entitlement and subscription portal
+
+Table 1. AWS Integration and Automation configuration
+
+
+
+
+
+
+
+Parameter label (name) |
+Default value |
+Description |
+
+
+
+
+SaaS pricing model
+(TypeOfSaaSListing ) |
+contracts_with_subscription
|
+The SaaS pricing model of your product. |
+
+
+Registration page
+(CreateRegistrationWebPage ) |
+true
|
+Choose 'true' to create a new registration page hosted by Amazon CloudFront. If you already have a custom registration page, choose 'false'. |
+
+
+S3 bucket name
+(WebsiteS3BucketName ) |
+Requires input
|
+The S3 bucket that holds the static HTML registration page files. If this bucket doesn’t exist, it is created. |
+
+
+Product code
+(ProductCode ) |
+Requires input
|
+The product code provided by AWS Marketplace at the time the limited listing was published. |
+
+
+Subscriptions SNS topic ARN
+(SubscriptionSNSTopic ) |
+Requires input
|
+If your product is a SaaS subscription or Saas contract with subscription, use the entitlement SNS topic provided by AWS Marketplace at the time the limited listing was published. |
+
+
+Entitlements SNS topic ARN
+(EntitlementSNSTopic ) |
+Requires input
|
+If your product is a SaaS contract, use the entitelement SNS topic provided by AWS Marketplace at the time the limited listing was published. |
+
+
+New subscribers DynamoDB table name
+(NewSubscribersTableName ) |
+AWSMarketplaceSubscribers
|
+The custom value for the New Subscribers table. Value must be unique per product. |
+
+
+Metering records Amazon DynamoDB table name
+(AWSMarketplaceMeteringRecordsTableName ) |
+AWSMarketplaceMeteringRecords
|
+Custom value for the metering records table. Value must be unique per product. |
+
+
+Admin email address
+(MarketplaceTechAdminEmail ) |
+Requires input
|
+The email address that receives SNS notifications for new customer registrations, entitlement changes, and subscription events. |
+
+
+Artifact S3 bucket name
+(ArtifactBucketName ) |
+aws-quickstart
|
+Name of the S3 bucket name that contains that artifacts. This string can include numbers, lowercase letters, uppercase letters, and hyphens (-). It cannot start or end with a hyphen (-). |
+
+
+
+
diff --git a/docs/partner_editable/additional_info.adoc b/docs/partner_editable/additional_info.adoc
index 9f857ef..01ee973 100644
--- a/docs/partner_editable/additional_info.adoc
+++ b/docs/partner_editable/additional_info.adoc
@@ -18,11 +18,7 @@ On your software’s registration page, you can collect whatever information is
The registration page identifies and accepts the *x-amzn-marketplace-token* token from the AWS Marketplace form data. The token includes the customer’s identifier for billing. The page then passes the token value to the AWS Marketplace Metering Service and AWS Marketplace Entitlement Service APIs to resolve for the unique customer identifier and corresponding product code.
-<<<<<<< HEAD
-The Quick Start creates a static HTML registration page hosted on Amazon S3. The page takes user inputs that are defined in the HTML form and submits them to the customer endpoint on AWS Marketplace. The page is delivered via a CloudFront distribution, which can be configured to use domain/CNAME. The POST request coming from AWS Marketplace is intercepted by the Lambda@Edge *src/lambda-edge/edge-redirect.js* function, which transforms the POST request to a GET request and passes the *x-amzn-marketplace-token* in the query string. The handler for the customer endpoint on AWS Marketplace is defined in the *src/register-new-subscriber.js* function, which calls the *resolveCustomer* endpoint and validates the token. If the token is valid, the customer record is created in the *AWSMarketplaceSubscribers* DynamoDB table, and the new customer data is stored.
-=======
The Quick Start creates a static HTML registration page hosted on Amazon S3. The page takes user inputs that are defined in the HTML form and submits them to the customer endpoint on AWS Marketplace. The page is delivered via a CloudFront distribution, which can be configured to use domain/CNAME. The POST request coming from AWS Marketplace is intercepted by the Lambda *src/redirect.js* function, which transforms the POST request to a GET request and passes the *x-amzn-marketplace-token* in the query string. The handler for the customer endpoint on AWS Marketplace is defined in the *src/register-new-subscriber.js* function, which calls the *resolveCustomer* endpoint and validates the token. If the token is valid, the customer record is created in the *AWSMarketplaceSubscribers* DynamoDB table, and the new customer data is stored.
->>>>>>> doc-edits
=== Grant access to new subscribers
@@ -52,21 +48,6 @@ New records in the *AWSMarketplaceMeteringRecords* table should be stored in the
....
{
-<<<<<<< HEAD
- "create_timestamp": 113123,
- "customerIdentifier": "ifAPi5AcF3",
- "dimension_usage": [
- {
- "dimension": "users",
- "value": 3
- },
- {
- "dimension": "admin_users",
- "value": 1
- }
- ],
- "metering_pending": "true"
-=======
"create_timestamp": {
"N": "113123"
},
@@ -100,7 +81,6 @@ New records in the *AWSMarketplaceMeteringRecords* table should be stored in the
"metering_pending": {
"S": "true"
}
->>>>>>> doc-edits
}
....
@@ -126,31 +106,6 @@ After the record is submitted to the AWS Marketplace API, the record updates, an
== Post-deployment steps
// If post-deployment steps are required, add them here. If not, remove the heading
-<<<<<<< HEAD
-=== Set up your registration page
-
-After your stack has launched successfully, set up your registration page and connect it with the API Gateway created by the stack. Your registration page will be hosted in the website S3 bucket that was created by the stack earlier.
-
-. https://awsmp-usageinstructions.s3.amazonaws.com/SaaSQuickStartRegistrationPage.zip[Download^] the website files to your local computer.
-. Unzip the file and open the *web* folder to access the files inside.
-. Retrieve the API ID of the API Gateway deployed by the stack.
-. Open the file named *scripts.js* and update the *baseUrl* property in line 1 with the API ID you just retrieved from the API Gateway console. Save the changes to the file.
-
-==== Example
-
- ** *Before*: `const baseUrl = 'https://API-ID.execute-api.us-east-1.amazonaws.com/Prod/';`
- ** *After*: `const baseUrl = 'https://qy7ryx6nkg.execute-api.us-east-1.amazonaws.com/Prod/';`
-
-[start=5]
-. Open the website S3 bucket created by the stack in your S3 console, and upload the five files in the web folder to the S3 bucket.
-
-Your integration is now ready for use. Since CloudFront distribution is used to ensure low latency for the registration page, the SaaS fulfillment URL is the CloudFront CName (domain name) of the distribution created by the stack.
-
-Go to the https://console.aws.amazon.com/cloudfront/home?region=us-east-1[CloudFront console^] to retrieve the domain name. Be sure to provide the domain name to the AWS Marketplace Seller Operations team to associate with your limited SaaS listing.
-
-* SaaS fulfillment URL format: https://__
-* Example URL: https://d142rocbcrghws.cloudfront.net
-=======
=== Update the SaaS Fulfillment URL
Update the fulfillment URL for your SaaS listing.
@@ -160,7 +115,6 @@ Update the fulfillment URL for your SaaS listing.
. Update this field with the *AWSMarketplaceFulfillmentURL* value found in the stack outputs.
Your integration is now ready for use.
->>>>>>> doc-edits
=== Confirm the Amazon SNS subscription