Skip to content

Commit

Permalink
Merge pull request #3224 from MicrosoftDocs/user/mikehoffms/enterpris…
Browse files Browse the repository at this point in the history
…e-search

Add "Microsoft Search in Bing" in "Address bar" section of Privacy
  • Loading branch information
zoherghadyali authored Jul 24, 2024
2 parents c4b4863 + 25f254f commit 7506a5f
Show file tree
Hide file tree
Showing 10 changed files with 150 additions and 65 deletions.
2 changes: 1 addition & 1 deletion microsoft-edge/develop-web-microsoft-edge.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ See [Accessibility in Microsoft Edge](accessibility/index.md).

<!-- leaf node (article; omit per PR review) -->
<!-- ====================================================================== -->
<!-- ## Privacy whitepaper
<!-- ## Microsoft Edge Privacy Whitepaper
The Microsoft Edge _browser privacy promise_ provides you with protection, transparency, control, and respect. Microsoft Edge has many features and services associated with privacy. This whitepaper explains how your data is used, how to control the different features, and how to manage your collected data.
Expand Down
2 changes: 1 addition & 1 deletion microsoft-edge/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"externalReference": [],
"globalMetadata": {
"breadcrumb_path": "/microsoft-edge/breadcrumbs/toc.json",
"feedback_system": "GitHub",
"feedback_system": "OpenSource",
"feedback_github_repo": "MicrosoftDocs/edge-developer",
"searchScope": ["Microsoft Edge", "Microsoft Edge Developer"],
"titleSuffix": "Microsoft Edge Developer documentation",
Expand Down
2 changes: 1 addition & 1 deletion microsoft-edge/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ additionalContent:
- text: Visual Studio Code
url: ./visual-studio-code/index.md

- text: Privacy Whitepaper
- text: Microsoft Edge Privacy Whitepaper
url: ./privacy-whitepaper/index.md
# Card
- title: Microsoft Edge Legacy documentation
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
199 changes: 142 additions & 57 deletions microsoft-edge/privacy-whitepaper/index.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion microsoft-edge/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@
href: dev-videos/index.md
displayName: youtube

- name: Privacy whitepaper
- name: Microsoft Edge Privacy Whitepaper
href: privacy-whitepaper/index.md

- name: The Web We Want initiative
Expand Down
2 changes: 1 addition & 1 deletion microsoft-edge/webdriver-chromium/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ For more information about Application Guard, see:
<!-- ====================================================================== -->
## Opt out of diagnostic data collection

By default, Microsoft Edge WebDriver sends diagnostic data such as the status of the [New Session](https://www.w3.org/TR/webdriver2/#new-session) WebDriver command to Microsoft. To turn off diagnostic data collection for Microsoft Edge WebDriver, set the `MSEDGEDRIVER_TELEMETRY_OPTOUT` environment variable to `1`. For more information about the data that Microsoft Edge WebDriver collects, see the [Microsoft Edge Privacy Whitepaper](/microsoft-edge/privacy-whitepaper#microsoft-edge-webdriver).
By default, Microsoft Edge WebDriver sends diagnostic data such as the status of the [New Session](https://www.w3.org/TR/webdriver2/#new-session) WebDriver command to Microsoft. To turn off diagnostic data collection for Microsoft Edge WebDriver, set the `MSEDGEDRIVER_TELEMETRY_OPTOUT` environment variable to `1`. For more information about the data that Microsoft Edge WebDriver collects, see [Microsoft Edge WebDriver](../privacy-whitepaper/index.md#microsoft-edge-webdriver) in _Microsoft Edge Privacy Whitepaper_.


<!-- ====================================================================== -->
Expand Down
4 changes: 2 additions & 2 deletions microsoft-edge/webview2/concepts/data-privacy.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ms.date: 06/02/2023

WebView2 collects a set of optional and required diagnostic data to keep WebView2 secure and up to date, diagnose issues, and improve WebView2. By agreeing to the WebView2 Runtime Terms and Conditions License, WebView2 developers acknowledge that WebView2 will collect the data that's described in this article. To view the license, go to [Download the WebView2 Runtime](https://developer.microsoft.com/microsoft-edge/webview2/#download-section), where clicking any of the download buttons, such as **Get the Link**, **Download**, or **x64**, shows the license in a dialog.

Additionally, WebView2 follows the standards that are outlined in the [Microsoft Edge Privacy Whitepaper](../../privacy-whitepaper/index.md). WebView2 has mechanisms to ensure privacy. WebView2 data collection follows the same strict standards as Microsoft Edge. For more information, see [Microsoft Privacy Statement – Microsoft privacy](https://privacy.microsoft.com/privacystatement).
Additionally, WebView2 follows the standards that are outlined in [Microsoft Edge Privacy Whitepaper](../../privacy-whitepaper/index.md). WebView2 has mechanisms to ensure privacy. WebView2 data collection follows the same strict standards as Microsoft Edge. For more information, see [Microsoft Privacy Statement – Microsoft privacy](https://privacy.microsoft.com/privacystatement).

The main diagnostic data sources are:
* Chromium and Microsoft Edge telemetry infrastructure.
Expand Down Expand Up @@ -55,7 +55,7 @@ These features are described below.

Microsoft Defender SmartScreen ("SmartScreen") is a security feature that is enabled by default to help users safely browse the web. The `IsReputationCheckingRequired` property controls whether SmartScreen is enabled. Generally, all other services in `edge://settings/privacy` are turned off, for WebView2.

If you don't disable SmartScreen, you must provide notice to all users that your software includes Microsoft Defender SmartScreen, and collects and sends the user's information to Microsoft as disclosed in [Microsoft Privacy Statement](https://aka.ms/privacy) and the [Microsoft Edge Privacy Whitepaper](../../privacy-whitepaper/index.md#smartscreen).
If you don't disable SmartScreen, you must provide notice to all users that your software includes Microsoft Defender SmartScreen, and collects and sends the user's information to Microsoft as disclosed in [Microsoft Privacy Statement](https://aka.ms/privacy) and in [SmartScreen](../../privacy-whitepaper/index.md#smartscreen) in _Microsoft Edge Privacy Whitepaper_.

##### [.NET/C#](#tab/dotnetcsharp)

Expand Down
2 changes: 1 addition & 1 deletion microsoft-edge/webview2/concepts/overview-features-apis.md
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ See also:

Microsoft Defender SmartScreen ("SmartScreen") is enabled by default. The `IsReputationCheckingRequired` property controls whether SmartScreen is enabled.

If you don't disable SmartScreen, you must provide notice to all users that your software includes Microsoft Defender SmartScreen, and collects and sends the user's information to Microsoft as disclosed in [Microsoft Privacy Statement](https://aka.ms/privacy) and the [Microsoft Edge Privacy Whitepaper](../../privacy-whitepaper/index.md#smartscreen).
If you don't disable SmartScreen, you must provide notice to all users that your software includes Microsoft Defender SmartScreen, and collects and sends the user's information to Microsoft as disclosed in [Microsoft Privacy Statement](https://aka.ms/privacy) and in [SmartScreen](../../privacy-whitepaper/index.md#smartscreen) in _Microsoft Edge Privacy Whitepaper_.

See also:
* [SmartScreen](./data-privacy.md#smartscreen) in _Data and privacy in WebView2_.
Expand Down

0 comments on commit 7506a5f

Please sign in to comment.