Skip to content

Commit b212c6b

Browse files
authored
Merge pull request #50776 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 8050628 + ab87c47 commit b212c6b

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

articles/active-directory/develop/active-directory-acs-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ SharePoint 2013, 2016, and SharePoint Online customers have long used ACS for au
103103

104104
| Feature | Guidance |
105105
| ------- | -------- |
106-
| Authenticating users from Azure AD | Previously, Azure AD did not support SAML 1.1 tokens required by SharePoint for authentication, and ACS was used as an intermediary that made SharePoint compatibile with Azure AD token formats. Now, you can [connect SharePoint directly to Azure AD using token issuance policies](https://docs.microsoft.com/Office365/Enterprise/using-azure-ad-for-sharepoint-server-authentication). |
106+
| Authenticating users from Azure AD | Previously, Azure AD did not support SAML 1.1 tokens required by SharePoint for authentication, and ACS was used as an intermediary that made SharePoint compatibile with Azure AD token formats. Now, you can [connect SharePoint directly to Azure AD using Azure AD App Gallery SharePoint on premise app](https://docs.microsoft.com/azure/active-directory/saas-apps/sharepoint-on-premises-tutorial). |
107107
| [App authentication & server-to-server authentication in SharePoint on-prem](https://technet.microsoft.com/library/jj219571(v=office.16).aspx) | Not affected by ACS retirement; no changes necessary. |
108108
| [Low trust authorization for SharePoint add-ins (provider hosted and SharePoint hosted)](https://docs.microsoft.com/sharepoint/dev/sp-add-ins/three-authorization-systems-for-sharepoint-add-ins) | Not affected by ACS retirement; no changes necessary. |
109109
| [SharePoint cloud hybrid search](https://blogs.msdn.microsoft.com/spses/2015/09/15/cloud-hybrid-search-service-application/) | Not affected by ACS retirement; no changes necessary. |

articles/ansible/ansible-manage-azure-dynamic-inventories.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,27 @@ The purpose of tags is to enable the ability to quickly and easily work with sub
131131

132132
1. Insert the following code into the newly created `nginx.yml` file:
133133

134-
```yml
135-
---
136-
- name: Install and start Nginx on an Azure virtual machine
137-
hosts: azure
138-
become: yes
139-
tasks:
140-
- name: install nginx
141-
apt: pkg=nginx state=installed
142-
notify:
143-
- start nginx
144-
145-
handlers:
146-
- name: start nginx
147-
service: name=nginx state=started
148-
```
134+
```yml
135+
---
136+
- name: Install and start Nginx on an Azure virtual machine
137+
hosts: azure
138+
become: yes
139+
tasks:
140+
- name: install nginx
141+
apt: pkg=nginx state=installed
142+
notify:
143+
- start nginx
144+
145+
handlers:
146+
- name: start nginx
147+
service: name=nginx state=started
148+
```
149149
150150
1. Run the `nginx.yml` playbook:
151151

152-
```azurecli-interactive
153-
ansible-playbook -i azure_rm.py nginx.yml
154-
```
152+
```azurecli-interactive
153+
ansible-playbook -i azure_rm.py nginx.yml
154+
```
155155

156156
1. Once you run the playbook, you see results similar to the following output:
157157

0 commit comments

Comments
 (0)