Merge pull request #72 from AdobeDocs/Prerelease

Prerelease rollout

src/pages/api/14-locale-codes.md

@@ -89,4 +89,5 @@ Several API methods allow the use of locale codes so that you can retrieve asset
 | en_TT | English - Trinidad and Tobago |
 | en_TM | English - Turkmenistan |
 | es_UY | Spanish - Uruguay |
+| zh_CN | Simplified Chinese - China |
 | zh_MO | Chinese - Macao |

src/pages/faq/18-fotolia-migration-resources.md

@@ -52,7 +52,7 @@ Here is a list of existing Fotolia API endpoints and their new Stock API equival
 | [refreshToken](https://us.fotolia.com/Services/API/Rest/Method/refreshToken)     | /ims/token (IMS)     | Renew authentication token                     | See [Authentication](#authentication) |
 | [getUserData](https://us.fotolia.com/Services/API/Rest/Method/getUserData) | Member/Profile | Return information about the logged user and get available credits | To get license quota, use Member/Profile. Stock does not store information about the user, only about entitlements available |
 
-If you have a business requirement to access Stock Contributor APIs, please please [contact us](mailto:Grp-AdobeStockPartnerships@adobe.com?subject=%5BFotolia%5D%20Stock%20API%20question).
+Please note that [Adobe Stock Contributor](https://contributor.stock.adobe.com/) does not have a public API.
 
 <a id="search-filters-and-parameters"></a>
 
@@ -94,7 +94,6 @@ Nearly all the Fotolia search parameters and filters are also available in Adobe
 
 The following API endpoints and methods will be deprecated in Adobe Stock API as they are either not currently being used, no longer supported, or no longer necessary. These APIs either receive no traffic, or have such low usage that they are candidates for removal.
 
-If you have a business requirement for any of the APIs below, please [contact us](mailto:[email protected]?subject=%5BFotolia%5D%20Stock%20API%20question).
 
 | Fotolia                              | Adobe Stock | Description                                                               |
 |--------------------------------------|-------------|---------------------------------------------------------------------------|
@@ -136,7 +135,7 @@ Unlike Fotolia, all Standard assets require one license or credit to purchase, r
 
 > **Note for Print on Demand (POD) customers:** If you license assets for use with printed goods that you sell, there are special rules you must follow. For example, you must use universal credits instead of subscription plans when licensing. Also, you will need to license the asset again in most cases, especially if used for different customer orders or for multiple products. And lastly, you will need to accept special terms and conditions before you can begin selling Stock images on your printed goods.
 >
-> Note that if you purchase Extended licenses, these precautions are not necessary, but the cost per asset is much higher. To discuss your use case and expected volume, please [contact us](mailto:Grp-AdobeStockPartnerships@adobe.com?subject=%5BFotolia%5D%20Stock%20API%20question) for additional terms and instructions.
+> Note that if you purchase Extended licenses, these precautions are not necessary, but the cost per asset is much higher. To discuss your use case and expected volume, please contact your Adobe account representative or [request a callback](https://www.adobe.com/creativecloud/business/enterprise.html#creativecloud-rfi) for additional terms and instructions.
 
 In terms of technical workflow, continue reading for an overview. Please refer to [Licensing assets and stuff](/getting-started/apps/06-licensing-assets.md) for full details.
 
@@ -183,15 +182,15 @@ You may start testing the Search APIs at any time; all that is required is a fre
 
 ### Get a Stock account
 
-If you are an individual customer, go to the [Plans and Pricing](https://stock.adobe.com/plans) page to sign up for an account. Note that if you plan to sell images for print use (e.g., you have a Print on Demand business), you will need to [contact us](mailto:Grp-AdobeStockPartnerships@adobe.com?subject=%5BFotolia%5D%20Stock%20API%20question) for additional terms and instructions, and to discuss your volume and use case. If you plan to use assets only for internal use (such as for general marketing and design), then you can choose your plan accordingly.
+If you are an individual customer, go to the [Plans and Pricing](https://stock.adobe.com/plans) page to sign up for an account. Note that if you plan to sell images for print use (e.g., you have a Print on Demand business), please contact your Adobe account representative or [request a callback](https://www.adobe.com/creativecloud/business/enterprise.html#creativecloud-rfi) to get a quote for a Stock for Enterprise contract. If you plan to use assets only for internal use (such as for general marketing and design), then you can choose your plan accordingly.
 
-If you do not need your own account but need to sign in others using the OAuth model, refer to the [Authorization code workflow](/Stock-Authorization-Code-Workflow.pdf) guide. If you have a business need, you may [contact us](mailto:[email protected]?subject=%5BFotolia%5D%20Stock%20API%20question) if you need access to a demo account with dummy credits to test licensing.
+If you do not need your own account but need to sign in others using the OAuth model, refer to the [Authorization code workflow](/Stock-Authorization-Code-Workflow.pdf) guide. 
 
 <a id="sign-a-contract"></a>
 
 ### Sign a contract
 
-As discussed earlier, if you plan to use Adobe Stock for commercial purposes--especially for selling printed goods--you will need to [contact us](mailto:Grp-AdobeStockPartnerships@adobe.com?subject=%5BFotolia%5D%20Stock%20API%20question). In many cases, you may need only accept our terms and conditions, and will be ready to begin.
+As discussed earlier, if you plan to use Adobe Stock for commercial purposes--especially for selling printed goods--please contact your Adobe account representative or [request a callback](https://www.adobe.com/creativecloud/business/enterprise.html#creativecloud-rfi).
 
 <a id="build-an-app"></a>
 

src/pages/faq/index.md

@@ -11,34 +11,31 @@ title: Stock API FAQs and supplemental info
 description: Stock API Frequently Asked Questions.
 ---
 <!-- omit in toc -->
-
 # Stock API: Technical frequently asked questions
 
 A list of technical frequently asked questions. Don't see your question answered here? Email us at [email protected]. If you are looking for the Stock API Business FAQ, it is [located here](/faq/stock-api-business-faq.md).
-- [Stock API: Technical frequently asked questions](#stock-api-technical-frequently-asked-questions)
-  - [General](#general)
-    - [What thumbnail preview sizes are available?](#what-thumbnail-preview-sizes-are-available)
-    - [Why don't all assets show up in Search API results?](#why-dont-all-assets-show-up-in-search-api-results)
-    - [Why am I getting 429 errors from the API?](#why-am-i-getting-429-errors-from-the-api)
-    - [Why are there more search results returned than the 'limit' value?](#why-are-there-more-search-results-returned-than-the-limit-value)
-  - [Downloading](#downloading)
-    - [How do I download a comp image?](#how-do-i-download-a-comp-image)
-    - [How do I bulk download all of my license history?](#how-do-i-bulk-download-all-of-my-license-history)
-    - [Why can't I download an asset from license history?](#why-cant-i-download-an-asset-from-license-history)
-    - [For vector assets, can I request a JPEG or PNG version instead of AI or SVG?](#for-vector-assets-can-i-request-a-jpeg-or-png-version-instead-of-ai-or-svg)
-  - [Enterprise](#enterprise)
-    - [Why can’t I create a JWT Service Account for my CC Pro subscription?](#why-cant-i-create-a-jwt-service-account-for-my-cc-pro-subscription)
-    - [How can I detect assets from the CC Pro plan in my license history?](#how-can-i-detect-assets-from-the-cc-pro-plan-in-my-license-history)
-    - [How do I add license references?](#how-do-i-add-license-references)
-    - [Why do I get an error when sending the JWT?](#why-do-i-get-an-error-when-sending-the-jwt)
-  - [Print on Demand (POD)](#print-on-demand-pod)
-    - [How do you license assets more than once?](#how-do-you-license-assets-more-than-once)
-    - [Why do I see Premium and Video in my search results if I don't have credits?](#why-do-i-see-premium-and-video-in-my-search-results-if-i-dont-have-credits)
-    - [How do I filter out Premium content?](#how-do-i-filter-out-premium-content)
-    - [How do I filter for high-resolution images only?](#how-do-i-filter-for-high-resolution-images-only)
-    - [How do I check if the images I am selling are still available on Stock?](#how-do-i-check-if-the-images-i-am-selling-are-still-available-on-stock)
-    - [How do I filter out Free content?](#how-do-i-filter-out-free-content)
-      - [Filtering free assets with the Files API](#filtering-free-assets-with-the-files-api)
+- [General](#general)
+  - [What thumbnail preview sizes are available?](#what-thumbnail-preview-sizes-are-available)
+  - [Why don't all assets show up in Search API results?](#why-dont-all-assets-show-up-in-search-api-results)
+  - [Why am I getting 429 errors from the API?](#why-am-i-getting-429-errors-from-the-api)
+  - [Why are there more search results returned than the 'limit' value?](#why-are-there-more-search-results-returned-than-the-limit-value)
+- [Downloading](#downloading)
+  - [How do I download a comp image?](#how-do-i-download-a-comp-image)
+  - [How do I bulk download all of my license history?](#how-do-i-bulk-download-all-of-my-license-history)
+  - [Why can't I download an asset from license history?](#why-cant-i-download-an-asset-from-license-history)
+  - [For vector assets, can I request a JPEG or PNG version instead of AI or SVG?](#for-vector-assets-can-i-request-a-jpeg-or-png-version-instead-of-ai-or-svg)
+- [Enterprise](#enterprise)
+  - [Why can’t I create a JWT Service Account for my CC Pro subscription?](#why-cant-i-create-a-jwt-service-account-for-my-cc-pro-subscription)
+  - [How can I detect assets from the CC Pro plan in my license history?](#how-can-i-detect-assets-from-the-cc-pro-plan-in-my-license-history)
+  - [How do I add license references?](#how-do-i-add-license-references)
+  - [Why do I get an error when sending the JWT?](#why-do-i-get-an-error-when-sending-the-jwt)
+- [Print on Demand (POD)](#print-on-demand-pod)
+  - [How do you license assets more than once?](#how-do-you-license-assets-more-than-once)
+  - [Why do I see Premium and Video in my search results if I don't have credits?](#why-do-i-see-premium-and-video-in-my-search-results-if-i-dont-have-credits)
+  - [How do I filter out Premium content?](#how-do-i-filter-out-premium-content)
+  - [How do I filter for high-resolution images only?](#how-do-i-filter-for-high-resolution-images-only)
+  - [How do I check if the images I am selling are still available on Stock?](#how-do-i-check-if-the-images-i-am-selling-are-still-available-on-stock)
+  - [How do I filter out Free content?](#how-do-i-filter-out-free-content)
 
 <a id="general"></a>
 
@@ -532,6 +529,7 @@ Please also note that the Free collection can change. An image which is availabl
 
 1.  POD customers who do *offline* curation of Stock assets must use other methods to filter out free assets. For example, any images that are hand curated and saved in the customers database should be reviewed periodically for free content using the [**Files API**](/api/19-bulk-metadata-files-reference.md).
 
+<!-- omit from toc -->
 #### Filtering free assets with the Files API
 
 Free assets can be identified by their metadata, specifically by the `premium_level_id` field. **A value of '1' indicates a Free asset.**

src/pages/faq/stock-api-business-faq.md

@@ -17,7 +17,6 @@ description: Stock API Frequently Asked Questions.
 A list of questions and answers for customers and partners looking to use Stock APIs, from a business perspective. For technical questions on the Stock APIs, see the [Technical FAQ](/faq/).
 
 <!-- MarkdownTOC -->
-
 - [General FAQ](#general-faq)
   - [How can I contact Adobe Stock to discuss a business proposal or get technical assistance?](#how-can-i-contact-adobe-stock-to-discuss-a-business-proposal-or-get-technical-assistance)
   - [How much does it cost to access Adobe Stock API?](#how-much-does-it-cost-to-access-adobe-stock-api)

src/pages/faq/terms-for-adobe-stock-developers.md

@@ -13,42 +13,6 @@ description: Stock API Frequently Asked Questions.
 
 # Terms for Adobe Stock Developers
 
-By using the Adobe Stock Developer Tools (defined below), I acknowledge that I have read and agreed to these Terms for Adobe Stock Developers ("**Stock Developer Terms**"). These Stock Developer Terms incorporate by reference the Adobe Developer Additional Terms found at https://wwwimages2.adobe.com/content/dam/acom/en/legal/servicetou/Adobe-Developer-Additional-Terms_en_US_20180605_2200.pdf (or successor URL), and capitalized terms not defined here have the same meaning as defined in the Adobe Developer Additional Terms. These Stock Developer Terms are supplemental to, and will not replace or limit any other agreement you have with Adobe, except that in the event of any conflict between the Adobe Developer Additional Terms, these Stock Developer Terms will control with regard to Adobe Stock only. You are solely responsible and liable for the use of the Adobe Stock Developer Tools by your employer, employees, contractors, colleagues, and clients.
+See http://www.adobe.com/go/developer-terms.
 
-1. __Definitions.__
-
-    1.1. Adobe Stock Affiliate Partners participate in an affiliate, referral, or similar partner program for the promotion of Adobe Stock pursuant to a separate written agreement with Adobe. Subject to the Adobe Stock Affiliate Partner's agreement with Adobe, you may use the Adobe Stock SDKs and APIs solely for the purposes of promoting Adobe Stock.
-
-    1.2. Adobe Stock Developer Tools are the SDKs, APIs, portals, and other Adobe-offered developer resources for Adobe Stock.
-
-    1.3. Asset Management Services include Adobe Experience Manager and other third party solutions deployed by Adobe customers directly or via third party services that allow users to organize, select, and maintain records related to searched and/or licensed Adobe Stock Works, including systematically connecting licensed Adobe Stock Works to the customer's internal platforms (e.g., digital asset management and content management systems).
-
-    1.4. Marketing Platforms integrate Adobe Stock Works into workflows for your websites and ad builders, and for your email, content marketing, and social media platforms.
-
-    1.5. Print-on-Demand provides end users with the ability to use Adobe Stock Works to create customized printed materials intended for end users' advertising, marketing and promotional purposes; and units of tangible goods intended for sale to a single end user.
-
-    1.6. Third Party Software Integrations are digital products or services that utilize the Adobe Stock SDKs or APIs for the purpose of including access to Adobe Stock Works in custom applications.
-
-2. __Login, Search, and License Services.__ If your Developer Software is for Asset Management Services, Print-on-Demand, Third-Party Software Integrations, or Marketing Platforms, you may use the Adobe Stock SDKs and APIs solely to enable Adobe customers: (A) to log in to the applicable Adobe Stock customer account through your Developer Software, provided that you must obtain express permission from the Adobe customer to access the applicable user's account; and (B) who are logged in to Adobe Stock through your Developer Software to search and license Adobe Stock Works pursuant to the customer's agreement with Adobe. Adobe may discontinue the licensing of any Adobe Stock Work and deny the downloading of any Adobe Stock Work at any time.
-
-3. __Treatment of Adobe Stock Works.__
-
-    3.1. If you are granted access by Adobe to Adobe Stock Works, you may use them solely for the purposes of developing and deploying the Developer Software. You may not allow any Adobe Stock Work to be downloaded from your Developer Software as a standalone file, unless licensed to the end user by Adobe Stock. If your Developer Software is for Print-on-Demand, Third-Party Software Integrations, or Marketing Platforms, you may allow third parties to view watermarked or thumbnail versions of the Adobe Stock Works that have not been licensed. 
-
-    3.2. You must ensure that: (A) Adobe Stock Works cannot be copied, distributed, altered or displayed other than as permitted by these Stock Developer Terms; (B) the contributors' names are visible on or adjacent to each Adobe Stock Work displayed in your Developer Software in the following format: "Contributor Name / Adobe Stock". You must not: (C) state or imply that any Adobe Stock Work is created or owned by you, or remove any watermarks, notices, metadata, or other information from the Adobe Stock Works; or (D) place or allow third parties to place: (1) materials near or next to the Adobe Stock Works if the material contains or displays adult content, promotes illegal activities or the sale of tobacco, or is otherwise defamatory, illegal, obscene, or indecent, including but not limited to pornography, escort services, or adult entertainment clubs, or similar venues; or (2) advertisements or other materials that obscure or alter the Adobe Stock Works or attribution to the Adobe Stock Works.
-
-4. __Editorial Adobe Stock Works.__ If your Developer Software is for (A) Print-on-Demand, Marketing Platforms or Stock Affiliate Partners, or any other purpose not expressly defined in these Stock Developer Terms, you may not access, use, or display any Adobe Stock Works that include "editorial" in the file name or metadata; or (B) Asset Management Services or authorized Third Party Software Integrations, you must ensure "Editorial Use Only" is displayed prominently adjacent to any Adobe Stock Work includes "editorial" in the file name or metadata.
-
-5. __Limited Use for Affiliate Partners.__ If your Developer Software is for Adobe Stock Affiliate Partners, you may use the Adobe Stock SDKs and APIs and Adobe Stock Works solely for the purposes of promoting Adobe Stock, subject to the Adobe Stock Affiliate Partner's agreement with Adobe.
-
-6. __Credit and Disclaimer.__ Your Developer Software must clearly and conspicuously display attribution to Adobe Stock in the following format "Powered by Adobe Stock" hyperlinked to <http://stock.adobe.com> [or successor URL] and visible to end users of your Developer Software; and you must place the following disclaimer on the Developer Software: "This product uses the Adobe Stock [SDK and/or API], but is not certified, endorsed or sponsored by Adobe. [Your Name] is not affiliated with or related to Adobe."
-
-7. __Trade and Advertising.__ Your display of the Adobe Stock Works must comply with all applicable trade and advertising rules and regulations.
-
-8. __Caching.__ You must not cache or store any Adobe Stock Works or other data obtained via the Adobe Stock SDKs or APIs other than for reasonable periods, and no longer than as necessary to operate the Developer Software. You will refresh the collection of Adobe Stock Works and other data obtained via the Adobe Stock SDKs or APIs no less than once per day. 
-
-9. __Machine Learning and Artificial Intelligence.__ You must not use the Adobe Stock Works or any title, caption information, keywords or other metadata associated with the Adobe Stock Works for any (A) machine learning or artificial intelligence purposes; or (B) technologies designed or intended for the identification of natural persons.
-
-10. __Effect of Termination on Adobe Stock Works.__ Upon termination of these Stock Developer Terms or request by Adobe, you will immediately remove any and all versions of the Adobe Stock Works that have not been otherwise licensed from Adobe. Adobe will have no liability for claims arising out your use of locally stored Adobe Stock Works.
-
-11. __Disclaimer.__ Adobe is not responsible for your use of any information, materials, feedback, or answers to your questions which may be provided by Adobe or its representatives as a courtesy only.
+Source: https://www.adobe.com/legal/terms.html.