From f0b31bfd41a5b6bd547d17b0ee083535f25d2f03 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Thu, 31 May 2018 13:33:07 +0000 Subject: [PATCH] Merged PR 8645: fix example --- windows/configuration/guidelines-for-assigned-access-app.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/windows/configuration/guidelines-for-assigned-access-app.md b/windows/configuration/guidelines-for-assigned-access-app.md index ec9939ed8a..91b729e5c8 100644 --- a/windows/configuration/guidelines-for-assigned-access-app.md +++ b/windows/configuration/guidelines-for-assigned-access-app.md @@ -110,7 +110,11 @@ Entry | Result `contoso.com` | Blocks all requests to contoso.com, www.contoso.com, and sub.www.contoso.com `https://*` | Blocks all HTTPS requests to any domain. `mail.contoso.com` | Blocks requests to mail.contoso.com but not to www.contoso.com or contoso.com +<<<<<<< HEAD +`.contoso.com` | Blocks contoso.com but not its subdomains, like subdomain.contoso.com. +======= `.contoso.com` | Blocks contoso.com but not its subdomains, like contoso.com/docs. +>>>>>>> refs/remotes/origin/master `.www.contoso.com` | Blocks www.contoso.com but not its subdomains. `*` | Blocks all requests except for URLs in the Blocked URL Exceptions list. `*:8080` | Blocks all requests to port 8080.