Skip to content

Commit 12ed130

Browse files
authored
Merge pull request #97231 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents f394bf5 + 81c4d08 commit 12ed130

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

articles/azure-functions/functions-bindings-timer.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,10 @@ Here are some examples of NCRONTAB expressions you can use for the timer trigger
281281

282282
The numbers in a CRON expression refer to a time and date, not a time span. For example, a 5 in the `hour` field refers to 5:00 AM, not every 5 hours.
283283

284-
The default time zone used with the CRON expressions is Coordinated Universal Time (UTC). To have your CRON expression based on another time zone, create an app setting for your function app named `WEBSITE_TIME_ZONE`. Set the value to the name of the desired time zone as shown in the [Microsoft Time Zone Index](https://technet.microsoft.com/library/cc749073).
284+
The default time zone used with the CRON expressions is Coordinated Universal Time (UTC). To have your CRON expression based on another time zone, create an app setting for your function app named `WEBSITE_TIME_ZONE`. Set the value to the name of the desired time zone as shown in the [Microsoft Time Zone Index](https://technet.microsoft.com/library/cc749073).
285+
286+
> [!NOTE]
287+
> `WEBSITE_TIME_ZONE` is not currently supported on the Linux Consumption plan.
285288
286289
For example, *Eastern Standard Time* is UTC-05:00. To have your timer trigger fire at 10:00 AM EST every day, use the following NCRONTAB expression that accounts for UTC time zone:
287290

articles/marketplace/determine-your-listing-type.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Determine Your Publishing Option in Azure Marketplace | Azure
33
description: This article describes the eligibility criteria and publishing requirements partners trying to understand how to publish apps to the Azure Marketplace.
44
services: Azure, Marketplace, Compute, Storage, Networking, Blockchain, Security
55

6-
author: jm-aditi-ms
6+
author: ellacroi
77
manager: pabutler
88

99

@@ -43,7 +43,7 @@ Before you select a publishing option, it's important to understand the storefro
4343

4444
## Understand storefront selection
4545

46-
The storefront where your offer will be presented, Azure Marketplace and/or AppSource, will be automatically determined by your offer details and target audience, as well as the categories and industries selected by you when creating your offer.
46+
Each storefront serves unique customer requirements. The storefront where your offer will be published will be determined by offer type, offer transact capabilities and category and/or industry selection to target a specific audience.
4747

4848
>[!Note]
4949
>"Cross-listing" (for SaaS Apps only): when a list or trial-based offer meets the criteria for both a technical and business user audience, your offer will be listed in both storefronts. Learn more about the publishing options below.

articles/role-based-access-control/resource-provider-operations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5566,7 +5566,7 @@ The resource provider operations are always evolving. To get the latest operatio
55665566
> | Action | Microsoft.StorSimple/managers/devices/deactivate/action | Deactivates a device. |
55675567
> | Action | Microsoft.StorSimple/managers/devices/delete | Deletes the Devices |
55685568
> | Action | Microsoft.StorSimple/managers/devices/disks/read | Lists or gets the Disks |
5569-
> | Action | Microsoft.StorSimple/managers/devices/download/action | Dowload updates for a device. |
5569+
> | Action | Microsoft.StorSimple/managers/devices/download/action | Download updates for a device. |
55705570
> | Action | Microsoft.StorSimple/managers/devices/failover/action | Failover of the device. |
55715571
> | Action | Microsoft.StorSimple/managers/devices/failover/operationResults/read | Lists or gets the Operation Results |
55725572
> | Action | Microsoft.StorSimple/managers/devices/failoverTargets/read | Lists or gets the Failover targets of the devices |

0 commit comments

Comments
 (0)