Skip to content

Commit 656c1b2

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ts_hdfs2
2 parents c683feb + cd893ed commit 656c1b2

File tree

9 files changed

+1225
-24
lines changed

9 files changed

+1225
-24
lines changed

articles/active-directory/fundamentals/active-directory-users-reset-password-azure-portal.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ As an administrator, you can reset a user's password if the password is forgotte
4040

4141
3. In the **Reset password** page, select **Reset password**.
4242

43-
A temporary password is auto-generated for the user.
43+
> [!Note]
44+
> When using Azure Active Directory, a temporary password is auto-generated for the user. When using Active Directory on-premises, you create the password for the user.
4445
4546
4. Copy the password and give it to the user. The user will be required to change the password during the next sign-in process.
4647

articles/marketplace/TOC.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -448,20 +448,38 @@
448448
href: ./partner-center-portal/account-migration-from-cpp-to-pc.md
449449
- name: Create a new offer
450450
items:
451-
- name: Offer creation checklist
452-
href: ./partner-center-portal/offer-creation-checklist.md
453-
- name: Create a SaaS offer
454-
href: ./partner-center-portal/create-new-saas-offer.md
455-
- name: SaaS metered billing
456-
href: ./partner-center-portal/saas-metered-billing.md
451+
- name: Dynamics 365 offers
457452
items:
458-
- name: Marketplace metering service APIs - FAQ
459-
href: ./partner-center-portal/marketplace-metering-service-apis-faq.md
460-
- name: Marketplace metering service APIs
461-
href: ./partner-center-portal/marketplace-metering-service-apis.md
462-
- name: SaaS Fulfillment APIs
463-
href: ./partner-center-portal/pc-saas-fulfillment-apis.md
453+
- name: Create a Dynamics 365 for Customer Engagement & PowerApps offer
454+
href: ./partner-center-portal/create-new-customer-engagement-offer.md
455+
- name: Create a Dynamics 365 for Operations offer
456+
href: ./partner-center-portal/create-new-operations-offer.md
457+
- name: Create a Dynamics 365 Business Central offer
458+
href: ./partner-center-portal/create-new-business-central-offer.md
459+
- name: SaaS offers
464460
items:
461+
- name: SaaS offer creation checklist
462+
href: ./partner-center-portal/offer-creation-checklist.md
463+
- name: Create a SaaS offer
464+
href: ./partner-center-portal/create-new-saas-offer.md
465+
- name: SaaS metered billing
466+
href: ./partner-center-portal/saas-metered-billing.md
467+
items:
468+
- name: Marketplace metering service APIs - FAQ
469+
href: ./partner-center-portal/marketplace-metering-service-apis-faq.md
470+
- name: Marketplace metering service APIs
471+
href: ./partner-center-portal/marketplace-metering-service-apis.md
472+
- name: SaaS Fulfillment APIs
473+
href: ./partner-center-portal/pc-saas-fulfillment-apis.md
474+
items:
475+
- name: Register a SaaS application
476+
href: ./partner-center-portal/pc-saas-registration.md
477+
- name: SaaS Fulfillment APIs v2
478+
href: ./partner-center-portal/pc-saas-fulfillment-api-v2.md
479+
- name: SaaS Fulfillment APIs v1 (deprecated)
480+
href: ./partner-center-portal/pc-saas-fulfillment-api-v1.md
481+
- name: SaaS fulfillment APIs - FAQ
482+
href: ./partner-center-portal/saas-fulfillment-apis-faq.md
465483
- name: Register a SaaS application
466484
href: ./partner-center-portal/pc-saas-registration.md
467485
- name: SaaS Fulfillment APIs v2

articles/marketplace/partner-center-portal/create-new-business-central-offer.md

Lines changed: 407 additions & 0 deletions
Large diffs are not rendered by default.

articles/marketplace/partner-center-portal/create-new-customer-engagement-offer.md

Lines changed: 390 additions & 0 deletions
Large diffs are not rendered by default.

articles/marketplace/partner-center-portal/create-new-operations-offer.md

Lines changed: 386 additions & 0 deletions
Large diffs are not rendered by default.

articles/marketplace/partner-center-portal/create-new-saas-offer.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Create a new SaaS offer in the Commercial Marketplace
33
description: How to create a new Software as a Service (SaaS) offer for listing or selling in the Azure Marketplace, AppSource, or through the Cloud Solution Provider (CSP) program using the Commercial Marketplace portal on Microsoft Partner Center.
4-
author: mattwojo
4+
author: qianw211
55
manager: evansma
6-
ms.author: mattwoj
6+
ms.author: v-qiwe
77
ms.service: marketplace
88
ms.topic: conceptual
9-
ms.date: 06/27/2019
9+
ms.date: 08/14/2019
1010
---
1111

1212
# Create a new SaaS offer
@@ -17,7 +17,7 @@ To begin creating Software as a Service (SaaS) offers, ensure that you first [Cr
1717

1818
Select the + **New offer…** button, then select the **Software as a Service** menu item.
1919

20-
If you select one of the other offer types, you will be redirected to the older [Cloud Partner Portal](https://cloudpartner.azure.com/). Only SaaS offers are available in the Commercial Marketplace portal on Partner Center at this time.
20+
If you select another offer type, you may be redirected to the older [Cloud Partner Portal](https://cloudpartner.azure.com/). Only SaaS and Dynamics 365 offers are available in the Commercial Marketplace portal on Partner Center at this time.
2121

2222
![Create offer window on Partner Center](./media/new-offer-click.png)
2323

articles/marketplace/partner-center-portal/offer-creation-checklist.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
2-
title: Offer creation checklist - Commercial Marketplace for Azure
3-
description: The details you can provide in the offer creation process. - Commercial Marketplace for Azure
2+
title: SaaS offer creation checklist - Commercial Marketplace for Azure
3+
description: The details you can provide in the SaaS offer creation process. - Commercial Marketplace for Azure
44
author: qianw211
55
manager: evansma
66
ms.author: v-qiwe
77
ms.service: marketplace
88
ms.topic: conceptual
9-
ms.date: 05/30/2019
9+
ms.date: 08/14/2019
1010
---
1111

12-
# Offer creation checklist
12+
# SaaS offer creation checklist
1313

14-
The offer creation process will take you through multiple pages. Here are the details you can provide on each page, with links to learn more about each item.
14+
The SaaS offer creation process will take you through multiple pages. Here are the details you can provide on each page, with links to learn more about each item.
1515

1616
Items you are required to provide or specify are noted below. Some areas are optional or have default values provided, that you can change as desired. You don't have to work on these sections in the order listed here.
1717

articles/media-services/previous/media-services-manage-channels-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ When creating a Channel, you can specify allowed IP addresses in one of the foll
114114
A [Program](https://docs.microsoft.com/rest/api/media/operations/program) enables you to control the publishing and storage of segments in a live stream. Channels manage Programs. The Channel and Program relationship is very similar to traditional media where a channel has a constant stream of content and a program is scoped to some timed event on that channel.
115115
You can specify the number of hours you want to retain the recorded content for the program by setting the **ArchiveWindowLength** property. This value can be set from a minimum of 5 minutes to a maximum of 25 hours.
116116

117-
ArchiveWindowLength also dictates the maximum amount of time clients can seek back in time from the current live position. Programs can run over the specified amount of time, but content that falls behind the window length is continuously discarded. This value of this property also determines how long the client manifests can grow.
117+
ArchiveWindowLength also dictates the maximum amount of time clients can seek back in time from the current live position. Programs can run over the specified amount of time, but content that falls behind the window length is continuously discarded. The value of this property also determines how long the client manifests can grow.
118118

119119
Each program is associated with an Asset. To publish the program you must create a locator for the associated asset. Having this locator will enable you to build a streaming URL that you can provide to your clients.
120120

articles/storage/common/storage-redundancy-gzrs.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Only general-purpose v2 storage accounts support GZRS and RA-GZRS. For more info
2626
GZRS and RA-GZRS are currently available for preview in the following regions:
2727

2828
- US East
29-
- Europe West
3029

3130
Microsoft continues to enable GZRS and RA-GZRS in additional Azure regions. Check the [Azure Service Updates](https://azure.microsoft.com/updates/) page regularly for information about supported regions.
3231

0 commit comments

Comments
 (0)