Merge pull request #236146 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 9d93c4a2b857 · 2023-04-27T14:53:10.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,2 +1,2 @@
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
diff --git a/README.md b/README.md
@@ -4,23 +4,23 @@ Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://
 
 ## Getting Started
 
-Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
+Contributing to open source is more than just providing updates. It's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
 
 ### Prerequisites
 
-You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
+You've decided to contribute. That's great! To contribute to the documentation, you need a few tools.
 
 #### GitHub
 
 Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
 
 #### Tools
 
-To install necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
+To install the necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
 
 ## License
 
-Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
+Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE), and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
 
 ## Code of Conduct
 
diff --git a/SECURITY.md b/SECURITY.md
@@ -12,13 +12,13 @@ If you believe you have found a security vulnerability in any Microsoft-owned re
 
 Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
 
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+If you prefer to submit without logging in, email [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
 
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+You should receive a response within 24 hours. If you do not, you can email us to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Type of issue (e.g., buffer overflow, SQL injection, cross-site scripting, etc.)
   * Full paths of source file(s) related to the manifestation of the issue
   * The location of the affected source code (tag/branch/commit or direct URL)
   * Any special configuration required to reproduce the issue
@@ -28,7 +28,7 @@ Please include the requested information listed below (as much as you can provid
 
 This information will help us triage your report more quickly.
 
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+If you are reporting for a bug bounty, providing more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
 
 ## Preferred Languages
 
diff --git a/ThirdPartyNotices.md b/ThirdPartyNotices.md
@@ -1,7 +1,7 @@
 ## Legal Notices
 Microsoft and any contributors grant you a license to the Microsoft documentation and other content
 in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
-see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the
+see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT). See the
 [LICENSE-CODE](LICENSE-CODE) file.
 
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
@@ -11,5 +11,5 @@ Microsoft's general trademark guidelines can be found at http://go.microsoft.com
 
 Privacy information can be found at https://privacy.microsoft.com/en-us/
 
-Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
-or trademarks, whether by implication, estoppel or otherwise.
+Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
+or trademarks, whether by implication, estoppel, or otherwise.
diff --git a/articles/active-directory/devices/device-management-azure-portal.md b/articles/active-directory/devices/device-management-azure-portal.md
@@ -174,6 +174,7 @@ You must be assigned one of the following roles to view or manage device setting
 
 - **Additional local administrators on Azure AD joined devices**: This setting allows you to select the users who are granted local administrator rights on a device. These users are added to the Device Administrators role in Azure AD. Global Administrators in Azure AD and device owners are granted local administrator rights by default. 
 This option is a premium edition capability available through products like Azure AD Premium and Enterprise Mobility + Security.
+- **Enable Azure AD Local Administrator Password Solution (LAPS) (preview)**: LAPS is the management of local account passwords on Windows devices. LAPS provides a solution to securely manage and retrieve the built-in local admin password. With cloud version of LAPS, customers can enable storing and rotation of local admin passwords for both Azure AD and Hybrid Azure AD join devices. To learn how to manage LAPS in Azure AD, see [the overview article](howto-manage-local-admin-passwords.md).
 
 - **Restrict non-admin users from recovering the BitLocker key(s) for their owned devices (preview)**: In this preview, admins can block self-service BitLocker key access to the registered owner of the device. Default users without the BitLocker read permission will be unable to view or copy their BitLocker key(s) for their owned devices.
 
diff --git a/articles/active-directory/devices/media/device-management-azure-portal/device-settings-azure-portal.png b/articles/active-directory/devices/media/device-management-azure-portal/device-settings-azure-portal.png
diff --git a/articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure.md b/articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure.md
@@ -527,13 +527,7 @@ $smssignin = Get-MgUserAuthenticationPhoneMethod -UserId $userId
 Users in scope fail to provision. The provisioning logs details include the following error message:
 
 ```
-The provisioning service was forbidden from performing an operation on Azure Active Directory, which is unusual. 
-A simultaneous change to the target object may have occurred, in which case, the operation might succeed when it is retried.
-Alternatively, the target of the operation, or one of its properties, may be mastered on-premises, in which case, 
-the provisioning service is not permitted to update it, and the corresponding source entry should be removed from the provisioning service's scope.
-Otherwise, authorizations may have been customized in such a way as to prevent the provisioning service from modifying the target object or one of its properties; 
-if so, then, again, the corresponding source entry should be removed from scope. 
-This operation was retried 0 times. 
+Guest invitations not allowed for your company. Contact your company administrator for more details.
 ```
 
 **Cause**
diff --git a/articles/active-directory/verifiable-credentials/linkedin-employment-verification.md b/articles/active-directory/verifiable-credentials/linkedin-employment-verification.md
@@ -13,7 +13,7 @@ ms.author: barclayn
 
 # LinkedIn employment verification
 
-If your organization wants its employees get verified on LinkedIn, you need to follow these few steps:
+If your organization wants its employees to get verified on LinkedIn, you need to follow these few steps:
 
 1. Setup your Microsoft Entra Verified ID service by following these [instructions](verifiable-credentials-configure-tenant.md).
 1. [Create](how-to-use-quickstart-verifiedemployee.md#create-a-verified-employee-credential) a Verified ID Employee credential.
diff --git a/articles/aks/workload-identity-deploy-cluster.md b/articles/aks/workload-identity-deploy-cluster.md
@@ -176,7 +176,7 @@ You can retrieve this information using the Azure CLI command: [az keyvault list
 To disable the Azure AD workload identity on the AKS cluster where it's been enabled and configured, you can run the following command:
 
 ```azurecli
-az aks update --resource-group myResourceGroup --name myAKSCluster --enable-workload-identity false
+az aks update --resource-group myResourceGroup --name myAKSCluster --disable-workload-identity
 ```
 
 ## Next steps
diff --git a/articles/azure-monitor/app/opencensus-python-request.md b/articles/azure-monitor/app/opencensus-python-request.md
@@ -121,64 +121,32 @@ You can find a Flask sample application that tracks requests in the [Azure Monit
 
 ## Track FastAPI applications
 
-OpenCensus doesn't have an extension for FastAPI. To write your own FastAPI middleware:
-
 1. The following dependencies are required:
     - [fastapi](https://pypi.org/project/fastapi/)
     - [uvicorn](https://pypi.org/project/uvicorn/)
 
       In a production setting, we recommend that you deploy [uvicorn with gunicorn](https://www.uvicorn.org/deployment/#gunicorn).
 
-1. Add [FastAPI middleware](https://fastapi.tiangolo.com/tutorial/middleware/). Make sure that you set the span kind server: `span.span_kind = SpanKind.SERVER`.
-
-1. Run your application. Calls made to your FastAPI application should be automatically tracked. Telemetry should be logged directly to Azure Monitor.
-
-    ```python 
-    # Opencensus imports
-    from opencensus.ext.azure.trace_exporter import AzureExporter
-    from opencensus.trace.samplers import ProbabilitySampler
-    from opencensus.trace.tracer import Tracer
-    from opencensus.trace.span import SpanKind
-    from opencensus.trace.attributes_helper import COMMON_ATTRIBUTES
-    # FastAPI imports
-    from fastapi import FastAPI, Request
-    # uvicorn
-    import uvicorn
-
-    app = FastAPI()
-
-    HTTP_URL = COMMON_ATTRIBUTES['HTTP_URL']
-    HTTP_STATUS_CODE = COMMON_ATTRIBUTES['HTTP_STATUS_CODE']
-    
-    exporter=AzureExporter(connection_string='<your-appinsights-connection-string-here>')
-    sampler=ProbabilitySampler(1.0)
-
-    # fastapi middleware for opencensus
-    @app.middleware("http")
-    async def middlewareOpencensus(request: Request, call_next):  
-        tracer = Tracer(exporter=exporter, sampler=sampler)       
-        with tracer.span("main") as span:
-            span.span_kind = SpanKind.SERVER
+2. Download and install `opencensus-ext-fastapi` from [PyPI](https://pypi.org/project/opencensus-ext-fastapi/). 
 
-            response = await call_next(request)
+    `pip install opencensus-ext-fastapi`
 
-            tracer.add_attribute_to_current_span(
-                attribute_key=HTTP_STATUS_CODE,
-                attribute_value=response.status_code)
-            tracer.add_attribute_to_current_span(
-                attribute_key=HTTP_URL,
-                attribute_value=str(request.url))
+3. Instrument your application with the `fastapi` middleware.
 
-        return response
+    ```python
+    from fastapi import FastAPI
+    from opencensus.ext.fastapi.fastapi_middleware import FastAPIMiddleware
 
-    @app.get("/")
-    async def root():
-        return "Hello World!"
+    app = FastAPI(__name__)
+    app.add_middleware(FastAPIMiddleware)
 
-    if __name__ == '__main__':
-        uvicorn.run("example:app", host="127.0.0.1", port=5000, log_level="info")
+    @app.get('/')
+    def hello():
+        return 'Hello World!'
     ```
 
+4. Run your application. Calls made to your FastAPI application should be automatically tracked. Telemetry should be logged directly to Azure Monitor.
+
 ## Next steps
 
 * [Application Map](./app-map.md)
diff --git a/articles/cognitive-services/language-service/question-answering/how-to/authoring.md b/articles/cognitive-services/language-service/question-answering/how-to/authoring.md
@@ -592,6 +592,7 @@ In this example, we will add a new source to an existing project. You can also r
 | `ENDPOINT`               | This value can be found in the **Keys & Endpoint** section when examining your resource from the Azure portal. Alternatively you can find the value in **Language Studio** > **question answering** > **Deploy project** > **Get prediction URL**. An example endpoint is: `https://southcentralus.api.cognitive.microsoft.com/`. If this was your endpoint in the code sample below, you would only need to add the region specific portion of `southcentral` as the rest of the endpoint path is already present.|
 | `API-KEY` | This value can be found in the **Keys & Endpoint** section when examining your resource from the Azure portal. You can use either Key1 or Key2. Always having two valid keys allows for secure key rotation with zero downtime. Alternatively you can find the value in **Language Studio** > **question answering** > **Deploy project** > **Get prediction URL**. The key value is part of the sample request.|
 | `PROJECT-NAME` | The name of project where you would like to update sources.|
+|`METHOD`| PATCH |
 
 ### Example query
 
@@ -606,7 +607,7 @@ curl -X PATCH -H "Ocp-Apim-Subscription-Key: {API-KEY}" -H "Content-Type: applic
       "sourceContentStructureKind": "semistructured"
     }
   }
-]'  -i 'https://{ENDPOINT}.api.cognitive.microsoft.com/language/query-knowledgebases/projects/{PROJECT-NAME}/sources?api-version=2021-10-01'
+]'  -i '{LanguageServiceName}.cognitiveservices.azure.com//language/query-knowledgebases/projects/{projectName}/sources?api-version=2021-10-01'
 ```
 
 A successful call to update a source results in an `Operation-Location` header being returned which can be used to check the status of the import job. In many of our examples, we haven't needed to look at the response headers and thus haven't always been displaying them. To retrieve the response headers our curl command uses `-i`. Without this parameter prior to the endpoint address, the response to this command would appear empty as if no response occurred.
diff --git a/markdown templates/aml-templates/template-concepts.md b/markdown templates/aml-templates/template-concepts.md
@@ -1,6 +1,6 @@
 ---
 title: CONCEPT SUCH AS Web Services in Azure Machine Learning in 59 chars or less. Include the name Azure Machine Learning. Test title here https://moz.com/learn/seo/title-tag 
-description: This string describes the article in 115 to 145 characters. Use SEO kind of action verbs here. such as - Learn how to do this and that using customer words. This info is displayed on the search page inline with the article date stamp. If your intro para describes your article's intent, you can use it here edited for length.
+description: This string describes the article in 115 to 145 characters. Use SEO kind of action verbs here. For example, Learning how to do this and that using customer words. This info is displayed on the search page in line with the article date stamp. If your intro paragraph describes your article's intent, you can use it here, edited for length.
 services: machine-learning
 ms.service: machine-learning
 ms.subservice: core
@@ -15,7 +15,7 @@ ms.date: 04/10/2018
 ## Section here H2 
 Paragraph here. 
 **This phrase is bold**
-*This phrase is italics*
+*This phrase is in italics*
 
 This is a [hyperlink to an article](template-concepts.md)
 
@@ -49,7 +49,7 @@ This is a numbered list:
 
 5. Fifth item
 
-## This list is bulleted list:
+## This list is a bulleted list:
 - Item 1
 - Item 2
 - Item 3
diff --git a/markdown templates/aml-templates/template-howto.md b/markdown templates/aml-templates/template-howto.md
@@ -1,6 +1,6 @@
 ---
 title: Verb action for Azure Machine Learning in 59 chars or less. Include the name Azure Machine Learning. Test title here https://moz.com/learn/seo/title-tag  (EXAMPLE - Deploying web services in Python with Azure Machine Learning)
-description: Learn how to do this and that using customer words in Azure Machine Learning. This string describes the article in 115 to 145 characters. Use SEO kind of action verbs here. This info is displayed on the search page inline with the article date stamp. If your intro para describes your article's intent, you can use it here edited for length.
+description: Learn how to do this and that using customer words in Azure Machine Learning. This string describes the article in 115 to 145 characters. Use SEO kind of action verbs here. This info is displayed on the search page in line with the article date stamp. If your intro para describes your article's intent, you can use it here, edited for length.
 services: machine-learning
 ms.service: machine-learning
 ms.subservice: core
@@ -10,28 +10,28 @@ ms.author: your-msft-alias
 author: your-github-account-name
 ms.date: 04/10/2018
 ---
-# This H1 is the title of the article. It appears in search, appears at the top of article, second greatest impact on search, 100 chars or less
+# This H1 is the title of the article. It appears in search, appears at the top of the article, and has the second greatest impact on search. 100 chars or less.
 
 Guidance [here](https://review.learn.microsoft.com/help/contribute/contribute-how-to-write-seo-basics?branch=main)
 
 
-1st paragraph	provides the primary intent of the article in 1 or 2 short sentences. 
+1st paragraph provides the primary intent of the article in 1 or 2 short sentences. 
 
 ## Prerequisites
-To step through this how-to guide, you need:
+To step through this how-to guide, you need the following:
 - [A machine learning account](template-howto.md)
 
 ## Section here H2 
 Paragraph here. 
 **This phrase is bold.**
-*This phrase is italics.*
+*This phrase is in italics.*
 
 This is a [hyperlink to an article](./template-concepts.md)
 
 This is an image:
 
 ![This is an image description](media/overview-what-is-azure-ml/aml-concepts.png)
-Note that images need to be stored in the media folder with a subdirectory matching the name of the article and then the filename.
+Note that images need to be stored in the media folder with a subdirectory matching the article's name and then the filename.
 
 ## Section here H2
 This table has headings:
@@ -59,7 +59,7 @@ This is a numbered list:
 
 5. Fifth item
 
-## This list is bulleted list:
+## This list is a bulleted list:
 - Item 1
 - Item 2
 - Item 3
diff --git a/markdown templates/markdown-template-for-support-articles-troubleshoot.md b/markdown templates/markdown-template-for-support-articles-troubleshoot.md
diff --git a/markdown templates/virtual-machines-ps-template-compare-sm-arm-task.md b/markdown templates/virtual-machines-ps-template-compare-sm-arm-task.md

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).`
`2`		`-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.`
	`2`	`+For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.`