Release (#585)

* Promote to Staging (#567)

* mobile launch in GS Guide

* recovery code note -> when does it change

* EA + forgot MP

* Send in Feature tables

* BE Badge Counter

* Send hidden email option

* weak passwords sort

* safari biometrics

* custom fields - keys

* FIDO Updates

* release notes

* updates to user types article (not rel-related)

* Folders Correction (interplay w/ shared items) (non rel-related)

* Send Options Policy

* Hide Custom Fields Update

* rn updates

* final release edits

* safari-biometrics-updates

* biometrics safari fix

* fido list update

* rn date

* link fix

* Update attachments.md

* Update cli.md

* Update 2020-plan-updates.md

* Update about-bitwarden-plans.md

* Update premium-renewal.md

* Update what-plan-is-right-for-me.md

* Update why-choose-bitwarden-for-your-team.md

* Update about-send.md

* Update create-send.md

* Attachments note

_articles/account/biometrics.md

@@ -83,22 +83,22 @@ Once enabled, a new button will be presented on the Unlock screen:
 
 Unlock with Biometrics is supported for Extensions through an integration with the Bitwarden Desktop app. In practical terms, this means:
 
-1. A Bitwarden Desktop app must be installed, logged in, and running in order to use Unlock with Biometrics for a Browser Extension. Additionally, you will need to enable Unlock with Biometrics in **Desktop** before proceeding.
+1. **For all Browser Extensions**, you will need to enable Unlock with Biometrics in Desktop before proceeding. **For all except Safari**, the Bitwarden Desktop app must be logged in and running in order to use Unlock with Biometrics for a Browser Extension.
 2. Browser Extensions support the same biometrics options as Desktop; for Windows via [Windows Hello](https://docs.microsoft.com/en-us/windows-hardware/design/device-experiences/windows-hello){:target="\_blank"} using PIN, Facial Recognition, or [other hardware that meets Windows Hello biometric requirements](https://docs.microsoft.com/en-us/windows-hardware/design/device-experiences/windows-hello-biometric-requirements){:target="\_blank"} and for macOS via [Touch ID](https://support.apple.com/en-us/HT207054){:target="\_blank"}.
 
 Two things to bear in mind before enabling the integration are **Permissions** and **Supportability**, documented below:
 
 ##### Permissions
 
-To facilitate this integration, your browser will ask you to accept a new permission for Bitwarden to `communicate with cooperating native applications`. This permission is safe, but **optional**, and will enable the integration that is required to enable Unlock with Biometrics.
+To facilitate this integration, browser extensions **except Safari** will ask you to accept a new permission for Bitwarden to `communicate with cooperating native applications`. This permission is safe, but **optional**, and will enable the integration that is required to enable Unlock with Biometrics.
 
 Declining this permission will allow you to use the Browser Extension as normal, without Unlock with Biometrics functionality.
 
 ##### Supportability
 
-Unlock with Biometrics is supported for Extensions on **Firefox** and **Chromium-based** browsers (Chrome, Edge, Opera, Brave, etc.). Unlock with Biometrics is **currently not supported for**:
+Unlock with Biometrics is supported for Extensions on **Chromium-based** browsers (Chrome, Edge, Opera, Brave, etc.), Firefox 87+, and Safari 14+. Unlock with Biometrics is **currently not supported for**:
 
-- Safari
+- Firefox ESR (Firefox v87+ will work).
 - Microsoft App Store Desktop Apps (a side-loaded Windows Desktop App, available at [bitwarden.com/download](https://bitwarden.com/download){:target="\_blank"} will work fine).
 - Side-loaded MacOS Desktop Apps (an App Store Desktop app will work fine).
 
@@ -106,6 +106,8 @@ Unlock with Biometrics is supported for Extensions on **Firefox** and **Chromium
 
 To enable Unlock with Biometrics for your Browser Extension:
 
+{% callout success %}Biometrics must be enabled in your Desktop App before proceeding. Additionally, **if you're using Safari**, you can skip straight to **Step 4**.{% endcallout %}
+
 1. In your Bitwarden Desktop app, navigate to Settings (on Windows, **File** → **Settings**) (on macOS, **Bitwarden** → **Preferences**).
 2. Scroll down to the Options section, and check the **Enable Browser Integration** box.
 

_articles/account/forgot-master-password.md

@@ -17,7 +17,9 @@ Before deleting your account:
 
 **First**, use the [Get master password hint](https://vault.bitwarden.com/#/hint){:target="\_blank"} link if you have a hint setup. Hints will be emailed to the email address associated with your account. If you don't have a hint setup, you'll get an email reporting this.
 
-**Second**, if you're using any Bitwarden client applications (Mobile Apps, Browser Extensions, etc.), you should check whether any of these sessions are still logged in prior to deleting your account. If a client application is still logged in, you should manually catalogue your Vault items to preserve your data.
+**Second**, if you have a designated Trusted Emergency Contact established using [Emergency Access]({{site.baseurl}}/article/emergency-access/), get in contact with them to regain Read or Takeover access to your account.
+
+**Third**, if you're using any Bitwarden client applications (Mobile Apps, Browser Extensions, etc.), you should check whether any of these sessions are still logged in prior to deleting your account. If a client application is still logged in, you should manually catalogue your Vault items to preserve your data.
 {% endcallout %}
 
 If you weren't able to gain access to your Vault, complete the following steps to delete your account:

_articles/faqs/send-faqs.md

@@ -12,6 +12,8 @@ order: 09
 
 **A:** Use of text Sends is available to all Bitwarden users, however creation of file Sends is only available for Premium users, including members of a Paid Organization (Families, Teams, or Enterprise).
 
+Additionally, creation of file Sends requires your Email Address to be verified.
+
 ### Q: Why can't I create a file Send from Firefox or Safari Browser Extension?
 
 **A:** You can! But in order to browse for a file on the Create Send view in a Firefox Browser Extension, you'll need to open the extension in the sidebar or pop out a new window using the popout {% icon fa-external-link fa-rotate-270 %} button:

_articles/faqs/twostep-faqs.md

@@ -15,10 +15,9 @@ This article contains Frequently Asked Questions (FAQs) regarding **Two-step Log
 
 **A:** Bitwarden does not support SMS 2FA due to vulnerabilities, including SIM hijacking. We do not recommend SMS 2FA for other accounts unless it is the only available method. Any second factor is recommended over having none, but most alternatives are safer than SMS 2FA.
 
-### Q: Is FIDO U2F supported on my iOS or Android App?
-
-**A:** At this time, due to platform/OS limitations, FIDO U2F is **only supported for Web Vaults and Browser Extensions**, however we are currently investigating ways to implement this. In the meantime, we recommend enabling another [Two-step Login Method]({% link _articles/two-step-login/setup-two-step-login.md %}) for use with unsupported client applications.
+### Q: Is FIDO U2F or FIDO2 WebAuthn supported on my iOS or Android App?
 
+**A:** At this time, due to platform/OS limitations, FIDO is **only supported for Web Vaults, Browser Extensions, and Windows Desktop Apps**, however we are currently investigating ways to implement this. In the meantime, we recommend enabling another [Two-step Login Method]({% link _articles/two-step-login/setup-two-step-login.md %}) for use with unsupported client applications.
 
 ### Q: Why is Bitwarden not asking for my enabled Two-step Login method?
 

_articles/features/attachments.md

@@ -8,7 +8,7 @@ tags: [attachments, storage, files]
 order: 13
 ---
 
-Files can be attached to Vault items from any Bitwarden application. An individual file attachment must be 100MB or smaller. By default, paid users have access to 1GB of encrypted storage for file attachments. Additional storage can be purchased in 1GB increments.
+Files can be attached to Vault items from any Bitwarden application. An individual file attachment must be 500 MB (100 MB if uploading from Mobile) or smaller. By default, paid users have access to 1GB of encrypted storage for file attachments. Additional storage can be purchased in 1GB increments.
 
 {% callout info %}
 File Attachments are available for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
@@ -118,6 +118,12 @@ For more information, refer to our [CLI documentation]({% link _articles/miscell
   </div>
 </div>
 
+{% callout warning %}
+**A note on Attachments created after May 11, 2021**:
+
+As a result of an Attachment upgrade, Attachments uploaded on the newest clients cannot be opened on older client versions. If you find you're unable to access a recently-created Attachment, upgrade your client to the newest version (**Hint:** The Cloud Web Vault is *always* on the newest version.)
+{% endcallout %}
+
 ## View an Attachment
 
 Viewing an attachment mimics the same procedure used to attach a file. Refer to one of the above sections for help.

_articles/features/auto-fill-browser.md

@@ -16,11 +16,17 @@ Additionally, **basic authentication prompts** work a little differently than re
 
 Bitwarden Browser Extensions have a unique **Tab** view, which automatically detects the URI (e.g. `myturbotax.intuit.com`) of the page displayed in the open tab and surfaces any Vault items with corresponding URIs.
 
-When a Vault item has a corresponding URI, the Bitwarden icon will overlay a notification bubble reporting the number of Vault items for that web page (*pictured below*).
+When a Vault item has a corresponding URI, the Bitwarden icon will overlay a badge counter reporting the number of Vault items for that web page (*pictured below*).
 
-{% image /getting-started/browserext/browserext-tab.png %}
+{% image /getting-started/browserext/browserext-tab.png Badge Counter %}
 
-Simply clicking on the Vault item inside the Browser Extension will auto-fill login information to the detected input fields.
+{% callout success %}
+If you want, you can disable the badge counter using a toggle in the {% icon fa-cogs %} **Settings** → **Options** menu:
+
+{% image autofill/disable-counter-badge.png Disable Badge Counter %}
+{% endcallout %}
+
+Simply clicking on the Vault item inside the Browser Extension **Tab** view will auto-fill login information to the detected input fields.
 
 There are a few alternative auto-fill options for Browser Extensions. In all cases (except [manually](#manually-auto-fill)):
 - The Browser Extension must be unlocked for the auto-fill functionality to operate.

_articles/features/custom-fields.md

@@ -14,6 +14,14 @@ Custom fields, available for any [Vault item type]({% link _articles/account/man
 - **Hidden**: Field value stores freeform input that is hidden from view (particularly useful for Organizations using the [Hide Password access control](https://bitwarden.com/help/article/user-types-access-control/#granular-access-control)).
 - **Boolean**: Field value stores a boolean value (true/false).
 
+## Custom Fields for Keys
+
+In addition to common web service inputs like PINs and Security Questions, Custom Fields can be used to store values **up to 5000 characters in length**, for example RSA 4096-bit SSH keys.
+
+{% callout success %}
+Character limits for custom field values are imposed on the **post-encryption character count**. For example, a 3383-character RSA-2096 Private SSH key would grow to about 4400-characters when it's encrypted and stored in your Vault.  
+{% endcallout %}
+
 ## Auto-fill Custom Fields
 
 The **Name** specified for a custom field is critical to successfully setting up auto-fill for custom fields. When naming the custom field, you should use one of the following HTML form element attributes/values:
@@ -24,11 +32,11 @@ The **Name** specified for a custom field is critical to successfully setting up
 4. HTML form element's `aria-label` attribute.
 5. HTML form element's `placeholder` attribute.
 
-Bitwarden will search the matched-URI webpage for those HTML form element attributes/values **in the above priority-order**. If a custom field's name matches one of those attributes/values, auto-fill will be available into that HTML form element.
+Bitwarden will search the matched-URI webpage for those HTML form element attributes/values **in the above priority-order**. If a custom field's name matches one of those attributes/values, its value can be auto-filled into the HTML form element.
 
 ### Name to Attribute Matching
 
-Field Name to attribute/value matches is **exact** and **case-insensitive** comparison. For example, if your custom field has the name `PIN`:
+Field Name to attribute/value matches is an **exact** and **case-insensitive** comparison. For example, if your custom field has the name `PIN`:
 
 - **Auto-fill offered** for `pin`, `PiN`, `PIN`, etc.
 - **Auto-fill not offered** for `pin2` or `mypin`

_articles/features/reports.md

@@ -54,7 +54,7 @@ Once identified, you should create a unique password for offending accounts or s
 
 ### Weak Passwords Report
 
-The **Weak Passwords Report** identifies weak passwords that can easily be guessed by hackers and automated tools that are used to crack passwords. The Bitwarden Password Generator can help you create stronger passwords.
+The **Weak Passwords Report** identifies weak passwords that can easily be guessed by hackers and automated tools that are used to crack passwords, sorted by severity of the weakness. The Bitwarden Password Generator can help you create stronger passwords.
 
 Once identified, you should use Bitwarden's Password Generator to create a strong password for offending accounts or services.
 

_articles/getting-started/getting-started-mobile.md

@@ -84,6 +84,12 @@ Setup Auto-fill to automatically enter logins from your Android device to a Web
 
    Once toggled, you might be required to change some Android-native settings, depending on your available or enabled Auto-fill options. For more information, see [Auto-fill logins on Android]({% link _articles/features/auto-fill-android.md %}).
 
+### Launch from Mobile Apps
+
+You can launch a website directly from the Bitwarden Mobile App by selecting the {% icon fa-share-square %} **Launch** button in any Vault item with a valid URI. If you're unfamiliar with using URIs, see [Using URIs]({% link _articles/features/uri-match-detection.md %}).
+
+{% image /getting-started/mobile-launch.png %}
+
 ### Unlock with Biometrics
 
 Unlocking Bitwarden with biometrics allows for seamless access to your Vault. If you haven't setup [fingerprint unlock](https://support.google.com/nexus/answer/6285273?hl=en) or [face unlock](https://support.google.com/pixelphone/answer/9517039?hl=en) on your Android device, you'll need to do that first from the Android {% icon fa-cog %} **Settings** app.
@@ -175,6 +181,12 @@ Setup Auto-fill to automatically enter logins from your iOS device to a Web Brow
 
 When you create new logins, make sure you enter a website in the [URI field](#create-items) to surface them for Auto-fill.
 
+### Launch from Mobile Apps
+
+You can launch a website directly from the Bitwarden Mobile App by selecting the {% icon fa-share-square %} **Launch** button in any Vault item with a valid URI. If you're unfamiliar with using URIs, see [Using URIs]({% link _articles/features/uri-match-detection.md %}).
+
+{% image /getting-started/mobile-launch.png %}
+
 ### Unlock with Biometrics
 
 Unlocking Bitwarden with biometrics allows for seamless access to your Vault. If you haven't setup Touch ID or Face ID on your iOS device, you'll need to do that first from the iOS {% icon fa-cog %} **Settings** app.

_articles/getting-started/releasenotes.md

@@ -25,12 +25,33 @@ Bitwarden believes source code transparency is an absolute requirement for secur
 
 To be notified of Release Announcements, subscribe to the [Bitwarden Status RSS Feed](https://status.bitwarden.com/){:target="\_blank"}.
 
+## 2021-05-11
+
+The Bitwarden team is pleased to release a set of features and updates continuing our mission of making password management easy and accessible for individuals and businesses:
+
+- **Privacy & Security Options for Send**: Use a new Send Privacy option to hide your email from recipients (see [here]({{site.baseurl}}/article/send-privacy/#hide-email}}) for details). To prevent abuse, File Sends will now require a verified email address. Additionally, Enterprise Organizations can implement a new policy to set the availability of the Hide Email option (see [here]({{site.baseurl}}/article/policies/#send-options) for details).
+- **FIDO Updates & Expanded Support**: Our FIDO implementation has been upgraded from FIDO U2F to FIDO2 WebAuthn, but existing FIDO U2F keys will retain their integrity. FIDO support has been expanded to more Browser Extensions and the Windows Desktop App (see [here]({{site.baseurl}}/article/setup-two-step-login-fido/) for details).
+- **Custom Fields for Keys**: Custom Field values have been upgraded to support up to 5000 characters, allowing storage of keys like RSA 4096-bit SSH keys (see [here]({{site.baseurl}}/article/custom-fields/#custom-fields-for-keys) for details).
+- **File Size Increases**: You can now create File Attachments or File Sends that are up to 500 MB each. Due to device restrictions, the old 100 MB limit is still in place for Mobile Apps.
+
+   {% callout warning %}As a result of the Attachment upgrade, Attachments uploaded on the newest clients cannot be opened on older client versions. If you find you're unable to access a recently-created Attachment, upgrade your client to the newest version (**Hint:** The Cloud Web Vault is *always* on the newest version.){% endcallout %}
+- **Disable Browser Extension Counter**: Disable the Browser Extension badge counter using a new toggle in the {% icon fa-cogs %} **Settings** → **Options** menu (see [here]({{site.baseurl}}/article/auto-fill-browser/) for details).
+- **Biometrics for Safari**: The Safari Web Extension now includes support for Unlock with Biometrics for Safari 14+ (see [here]({{site.baseurl}}/article/biometrics/) for details).
+- **Search Internationalization**: Vaults can now be searched against 1 character, improving the experience for languages with 1-character words like Simplified and Traditional Chinese.
+- **Sorted Weak Passwords Report**: The Weak Passwords Report is now sorted by the severity of the password's weakness (see [here]({{site.baseurl}}/article/reports/#weak-passwords-report) for details)
+
+{% callout success %}
+Since implementing [Soft Delete]({{site.baseurl}}/article/managing-items/#items-in-the-trash) back in 2020, we've been patient to take out the Trash. **Starting 5/15/2021**, we'll activate the nightly job that will permanently delete items that have been in your trash for 30 days or more.
+
+Prior to 5/15/2021, we recommend digging through your Trash for anything you might want to Restore!
+{% endcallout %}
+
 ## 2021-03-11
 
 Bitwarden is proud to announce the release of Bitwarden Send, and end-to-end encrypted solution for ephemeral sharing. This release includes:
 
 - **Bitwarden Send**: Bitwarden Send is end-to-end encrypted solution for ephemeral sharing. There's lot of material about Send on our website and Help Center, but you can start [here](https://bitwarden.com/products/send){:target="\_blank"} or [here]({% link _articles/send/about-send.md %}).
-- **FIDO U2F Support for Edge**: Two-step Login via FIDO U2F is now available for the Web Vault and Browser Extensions in Microsoft Edge (see [here]({% link _articles/two-step-login/setup-two-step-login-u2f.md %}) for details).
+- **FIDO U2F Support for Edge**: Two-step Login via FIDO U2F is now available for the Web Vault and Browser Extensions in Microsoft Edge (see [here]({% link _articles/two-step-login/setup-two-step-login-fido.md %}) for details).
 - **Domain Exclusion in Browser Extensions**: Bitwarden Browser Extensions can now be configured with domains to explicitly not offer to remember passwords for (see [here]({% link _articles/miscellaneous/exclude-domains.md %}) for details).
 - **Improved Import Error Messages**: We've had lots of folks migrating to Bitwarden recently, so we cleaned up an import error message to help you reconcile issues faster (see [here]({{site.baseurl}}/article/import-data/#length-related-import-errors) for details).
 - **Safari Web Extension Port**: Our Safari App Extension has officially been ported to a Web Extension for use with Safari 14+. Due to changes to Safari, Web Extension use is now limited to only those obtained through Mac App Store downloads (see [here]({% link _articles/account/install-safari-app-extension.md %}) for details).
@@ -44,7 +65,6 @@ When your Browser Extension updates to this version, you may be asked to accept
 
 **Biometric Unlock is currently not available for:**
 - Firefox Browser Extensions below version 87.
-- Safari Browser Extensions.
 - Microsoft App Store Desktop Apps (a side-loaded Windows Desktop App, available at [bitwarden.com/download](https://bitwarden.com/download){:target="\_blank"} will work fine).
 - Side-loaded MacOS Desktop Apps (an App Store Desktop app will work fine).
 

_articles/miscellaneous/cli.md

@@ -737,7 +737,7 @@ Used to specify which [Two-step Login method]({{site.baseurl}}/article/setup-two
 | Yubikey       | 3     |
 
 {% callout info %}
-FIDO U2F and Duo are not supported by the CLI.
+FIDO2 and Duo are not supported by the CLI.
 {% endcallout %}
 
 #### Item Types

_articles/organizations/policies.md

@@ -110,3 +110,11 @@ Vault Items that were created prior to the implementation of this policy or prio
 Enabling the **Disable Send** policy will prevent non-Owner/non-Admin users from creating or editing a Send using [Bitwarden Send]({% link _articles/send/about-send.md %}). Users subject to this policy will still be able to delete existing Sends that have not yet reached their [Deletion Date]({% link _articles/send/send-lifespan.md %}).
 
 A banner is displayed to users in the Send view and on opening any existing Send to indicate that a policy is restricting them to only deleting Sends.
+
+### Send Options
+
+Enabling the **Send Options** policy will allow Owners and Admins to specify options for creating and editing Sends. Owners and Admins are exempt from this policy's enforcement. Options include:
+
+|Option|Description|
+|------|-----------|
+|Do not allow users to hide their email address|Enabling this option disables the [Hide Email option]({{site.baseurl}}/article/send-privacy/#hide-email), meaning that all [received Sends]({{site.baseurl}}/article/receive-send) will include whom they are sent from.|

_articles/organizations/user-types-access-control.md

@@ -8,31 +8,29 @@ tags: [user types, access control]
 order: 06
 ---
 
-Users in Bitwarden Organizations can be granted a variety of User Types and Access Controls in order to manage their permissions.
+Users in Bitwarden Organizations can be granted a variety of User Types and Access Controls in order to manage their permissions and access. You can set User Types and Access Controls when you [invite users to your Organization]({{site.baseurl}}/article/managing-users/), or at any time from the **Manage** → **People** screen in your Organization:
 
-You can designate User Type and Access Control when you invite users to your Organization (see [Add or Remove Users From Your Organization](https://bitwarden.com/help/article/managing-users/)), or at any time from the **Manage** → **People** screen in your Organization.
+{% image organizations/user-types-access-control.png Editing User Types and Access Control %}
 
 ## User Types
 
-User Type determines the level of access that a user will have within your Organization. User Type is configured at the Organization level.
-
-Options include:
+User Type determines the permissions a user will have within your Organization. User Types does not determine [which Collections they have access to](#access-control), rather it determines **what actions they can take** within the context of your Organization's resources and tools. Options include:
 
 |User Type|Permissions|
 |---------|-----------|
 |User|Access shared items in assigned Collections<br>Add, edit, or remove items from assigned Collections (unless **Read Only**)|
-|Manager|All of the above,<br>+ Assign Users to Collections<br>+ Assign User Groups to Collections<br>+ Create or delete new Collections|
+|Manager|All of the above,<br>+ Assign Users to Collections<br>+ Assign User Groups to Collections<br>+ Create or delete Collections|
 |Admin|All of the above,<br>+ Assign Users to User Groups<br>+ Create or delete User Groups<br>+ Invite and confirm new Users<br>+ Manage Enterprise Policies<br>+ View Event Logs<br>+ Export Organization Vault data<br><br>**Admin Users automatically have access to all Collections.**|
 |Owner|All of the above,<br>+ Manage Billing, Subscription, and Integrations<br><br>**Owner Users automatically have access to all Collections.**|
-|Custom|Allows for granular control of user permissions on a user-by-user basis. For more information, see [Custom Role](#custom-role).|
+|Custom|Allows for granular control of user permissions on a user-by-user basis, see [Custom Role](#custom-role).|
 
-{% callout warning %}
-**Only an Owner** can create a new Owner or assign Owner to an existing user. For failover purposes, Bitwarden recommends creating multiple Owner users.
+{% callout info %}
+**Only an Owner** can create a new Owner or assign the Owner type to an existing user. For failover purposes, Bitwarden recommends creating multiple Owner users.
 {% endcallout %}
 
 ### Custom Role
 
-Selecting the **Custom** role for a user allows for granular control of user permissions on a user-by-user basis. A user with the Custom role can have a customizable selection of Manager and Admin capabilities, including:
+Selecting the **Custom** role for a user allows for granular control of permissions on a user-by-user basis. A Custom role user can have a configurable selection of Manager and Admin capabilities, including:
 
 - Manage Assigned collections
 - Access Business Portal
@@ -54,28 +52,24 @@ As an example, the Custom role allows for the creation of a user that can fully
 
 ## Access Control
 
-Access Control determines the Collection assignment of **Users** and **Managers**, as well as permissions within a given Collection. Access Control is configured at the Collection level.
-
-Assigning **Admins** and **Owners** to Collections via Access Control will only impact which Collections appear readily in the **Filters** section of their Vault. Admins and Owners will always be able to access "un-assigned" Collections via the Organization view.
+Access Control determines access to Collections, as well as permissions within each individual Collection:
 
 {% image /organizations/collection-access-control.png Configure Access Control options %}
 
-Selecting **This user can access and modify all items** will allow users to use all Collections in your Organization.
+{% callout info %}
+Recall that [Admins and Owners](#user-types) can automatically access all Collections. For these user types, configuring Access Control will determine **which Collections are readily accessible** in their Personal Vault and client applications (Browser Extension, Mobile, etc.). Admins and Owners will still be able to access "unassigned" Collections from the Organization Vault.
+{% endcallout %}
 
-Selecting **This user can access only the selected collections** will restrict users to only the assigned Collections, and activate Granular Access Control:
+|Access Control|Description|
+|--------------|-----------|
+|**This user can access and modify all items**|Grants the user(s) access to all Collections, as well as the ability to modify Vault items stored therein.<br><br>Selecting this option will collapse the Collection selection section.|
+|**This user can access only the selected Collections**|Grants the user(s) access to only selected Collections, as well as [granular access control](#granular-access-control) over permissions for each Collection.<br><br>Selecting this option will expand the Collection selection section.|
 
 ### Granular Access Control
 
-To assign users to only selected Collections, check the checkbox to the left of each desired Collection. For each checked Collection, you may also configure:
+If you selected **This user can access only the selected Collection**, choose which Collections you want to provide them access to. For each Collection, you can also configure the following options:
 
-**Hide Passwords**
-
-Selecting **Hide Password** prevents users from seeing or copying all passwords, TOTP seeds, or *Hidden* custom fields. Users with **Hide Passwords** active may only use items in the Collection via Auto-Fill.
-
-{% callout warning %}
-Enabling **Hide Passwords** prevents easy copy-and-paste of hidden items, however it does not completely prevent user access to this information. Treat hidden passwords as you would any shared credential.
-{% endcallout %}
-
-**Read Only**
-
-Selecting **Read Only** prevents users from adding, editing, or removing items within the Collection. Users with **Read Only** active may still see and use all passwords, TOTP seeds, and *Hidden* custom fields.
+|Option|Description|
+|------|-----------|
+|**Hide Passwords**|Prevents users from seeing or copying all passwords, TOTP seeds, or *Hidden* custom fields. Users with **Hide Passwords** active may only use items in the Collection via Auto-Fill.<br><br>**Hide Passwords** prevents easy copy-and-paste of hidden items, however it does not completely prevent user access to this information. Treat hidden passwords as you would any shared credential.|
+|**Read Only**|Prevents users from adding, editing, or removing items within the Collection. Users with **Read Only** access may still see and use all passwords, TOTP seeds, and *Hidden* custom fields.|

_articles/plans-and-pricing/2020-plan-updates.md

@@ -33,7 +33,7 @@ We've also reduced the price of a Families Organization to $40/year (*compared t
 |Features|Classic 2019|Current (2020-)|
 |--------|------------|---------------|
 |No. of users|5|6|
-|For all members of the Organization:<br><br>- Advanced 2FA Options (e.g. Duo, YubiKey, U2F)<br>- Encrypted file attachments<br>- Bitwarden Authenticator (TOTP)<br>- Vault Health Reports<br>- Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|For all members of the Organization:<br><br>- Advanced 2FA Options (e.g. Duo, YubiKey, FIDO2)<br>- Encrypted file attachments<br>- Bitwarden Authenticator (TOTP)<br>- Vault Health Reports<br>- Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |Cost|$52 / year (incl. separate purchase of Premium Features)|$40 / year|
 
 ## Teams Organizations
@@ -56,7 +56,7 @@ There is no longer a minimum number of users required for a Teams Organization (
 |Base no. of users|5|1|
 |Max no. of users|Unlimited|Unlimited|
 |For Organization items:<br><br>-Encrypted file attachements<br>-Bitwarden Authenticator (TOTP)<br>-Vealth Health Reports|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|For members of the Organization:<br><br>- Advanced 2FA Options (e.g. Duo, YubiKey, U2F)<br>- Encrypted file attachments<br>- Bitwarden Authenticator (TOTP)<br>- Vault Health Reports<br>- Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|For members of the Organization:<br><br>- Advanced 2FA Options (e.g. Duo, YubiKey, FIDO2)<br>- Encrypted file attachments<br>- Bitwarden Authenticator (TOTP)<br>- Vault Health Reports<br>- Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |Event Logs|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |User Groups|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |API Access|-|<i class="fa fa-check" aria-hidden="true"></i>|

_articles/plans-and-pricing/about-bitwarden-plans.md

@@ -51,7 +51,8 @@ In the following table, "premium features" (included for **Premium Individual**
 |Secure Password Generator|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |Cloud or Self-hosting|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |[Encrypted Export]({% link _articles/importing/encrypted-export.md %})|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*[Two-step login]({% link _articles/two-step-login/setup-two-step-login.md %})|via authenticator apps or email|via authenticator apps, email, Yubikey, U2F, and Duo|via authenticator apps, email, Yubikey, U2F, and Duo (does not include [Duo for Organizations]({% link _articles/two-step-login/setup-two-step-login-duo.md %}))|
+|[Bitwarden Send]({{site.baseurl}}/article/about-send/)|Text Sharing|Text + File Sharing|Text + File Sharing|
+|*[Two-step login]({% link _articles/two-step-login/setup-two-step-login.md %})|via authenticator apps or email|via authenticator apps, email, Yubikey, FIDO2, and Duo|via authenticator apps, email, Yubikey, FIDO2, and Duo (does not include [Duo for Organizations]({% link _articles/two-step-login/setup-two-step-login-duo.md %}))|
 |*[Encrypted file attachments]({% link _articles/features/attachments.md %})|-|1 GB|1 GB per user + 1 GB shared|
 |*[Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) (TOTP)|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |*[Vault Health Reports]({% link _articles/features/reports.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
@@ -95,7 +96,8 @@ In the following table, "premium features" (included for **Teams Organizations**
 |Max no. of users|2|Unlimited|Unlimited|
 |Max no. of Collections|2|Unlimited|Unlimited|
 |[Encrypted Export]({% link _articles/importing/encrypted-export.md %})|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*[Two-step login]({% link _articles/two-step-login/setup-two-step-login.md %})|via authenticator apps or email|via authenticator apps, email, Yubikey, U2F, and Duo|via authenticator apps, email, Yubikey, U2F, and Duo|
+|[Bitwarden Send]({{site.baseurl}}/article/about-send/)|Text Sharing|Text + File Sharing|Text + File Sharing|
+|*[Two-step login]({% link _articles/two-step-login/setup-two-step-login.md %})|via authenticator apps or email|via authenticator apps, email, Yubikey, FIDO2, and Duo|via authenticator apps, email, Yubikey, FIDO2, and Duo|
 |[Duo for Organizations]({% link _articles/two-step-login/setup-two-step-login-duo.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |*[Encrypted file attachments]({% link _articles/features/attachments.md %})|-|1 GB per user + 1 GB shared|1 GB per user + 1 GB shared|
 |*[Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) (TOTP)|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|

_articles/plans-and-pricing/premium-renewal.md

@@ -18,7 +18,7 @@ If we cannot process your payment method, or if you have cancelled your subscrip
 
 **Two-step Login**
 
-You will **not** be locked out of your Vault, however you will not be able to use advanced Two-step Login options like Yubikey, U2F, or Duo for authentication.
+You will **not** be locked out of your Vault, however you will not be able to use advanced Two-step Login options like Yubikey, FIDO2, or Duo for authentication.
 - If you have a core Two-step Login option enabled (authenticator app or email), you will be prompted to use the enabled option.
 - If you do not have another Two-step Login option enabled, you will authenticate into your Vault without Two-step Login.
 

_articles/plans-and-pricing/what-plan-is-right-for-me.md

@@ -42,7 +42,7 @@ Will you be a Bitwarden Solo-Practitioner, or will you securely share data betwe
 
 As a Bitwarden Solo-Practicioner, will you be a Bitwarden Black Belt using Premium features like:
 
-- Advanced 2FA options, like Yubikey, U2F, and Duo
+- Advanced 2FA options, like Yubikey, FIDO2, and Duo
 - 1 GB of encrypted file attachments
 - Bitwarden Authenticator (TOTP)
 - Emergency Access

_articles/plans-and-pricing/why-choose-bitwarden-for-your-team.md

@@ -62,7 +62,7 @@ with a multi-layered, defense-in-depth approach. Bitwarden software is open sour
 |---------------------------------|:--------------------------------:|:--------------------------------------------------------------------:|:-----------------------------------:|:-----------------------------------------------:|:-----------------------------------------------:|
 | Open Source                   | —          | —                                                      | —                        | —                               | <i class="fa fa-check" aria-hidden="true"></i>|
 End-to-End Encryption               | <i class="fa fa-check" aria-hidden="true"></i>          | <i class="fa fa-check" aria-hidden="true"></i>                                                      | <i class="fa fa-check" aria-hidden="true"></i>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
- |Two-Factor Athentication | 2FA, U2F, YubiKey, Duo          | 2FA, YubiKey, Duo                                                      | 2FA, U2F                        | 2FA, U2F                               |  2FA, U2F, YubiKey, Duo
+ |Two-Factor Athentication | 2FA, FIDO2, YubiKey, Duo          | 2FA, YubiKey, Duo                                                      | 2FA, FIDO2                        | 2FA, FIDO2                               |  2FA, FIDO2, YubiKey, Duo
   |Independently Audited | <i class="fa fa-check" aria-hidden="true"></i>          | <i class="fa fa-check" aria-hidden="true"></i>                                                      | <i class="fa fa-check" aria-hidden="true"></i>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
   |SOC 2 Certified | <i class="fa fa-check" aria-hidden="true"></i>          | <i class="fa fa-check" aria-hidden="true"></i>                                                      | —                       | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
   |24/7 Support | <i class="fa fa-check" aria-hidden="true"></i>          | <i class="fa fa-check" aria-hidden="true"></i>                                                      | <i class="fa fa-check" aria-hidden="true"></i>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  24-Hour + Priority Support

_articles/send/about-send.md

@@ -10,13 +10,13 @@ order: 01
 
 ## What is Send?
 
-Bitwarden Send is a secure and ephemeral way to transmit sensitive information to **anyone**. Sends can include plaintext or file attachments up to 100 MB. Every Send is assigned a randomly generated and secure link, which can be [shared with anyone]({% link _articles/send/receive-send.md %}) (including those who *do not* have Bitwarden accounts) via text, email, or whatever communication channel you prefer. Every Send is:
+Bitwarden Send is a secure and ephemeral way to transmit sensitive information to **anyone**. Sends can include plaintext or file attachments up to 500 MB (100 MB if creating from Mobile). Every Send is assigned a randomly generated and secure link, which can be [shared with anyone]({% link _articles/send/receive-send.md %}) (including those who *do not* have Bitwarden accounts) via text, email, or whatever communication channel you prefer. Every Send is:
 
 - **End-to-end Encrypted**: Data in a Send is [encrypted]({{site.baseurl}}/article/send-encryption/#send-encryption) on creation, and only [decrypted]({{site.baseurl}}/article/send-encryption/#send-decryption) when a recipient opens the Send link. The contents of a Send are stored **encrypted** in Bitwarden systems, just like a traditional Vault item. The link generated for each send doesn't contain any data related to the Send's contents, so it's safe to share over intermediary communications services without exposing information to Bitwarden or any used intermediary services.
 
 - **Dynamically Ephemeral**: Sends are designed for ephemeral sharing, so every [Send that you create]({% link _articles/send/create-send.md %}) will have a specified [lifespan]({% link _articles/send/send-lifespan.md %}) (*max 31 days*) that can be configured using pre-set options or a custom timestamp for down-to-the-minute specification. When its deletion date is reached, the Send and its contents will be completely purged from Bitwarden systems. Using additional options like [Expiration Date]({{site.baseurl}}/article/send-lifespan/#expiration-date) and [Maximum Access Count]({{site.baseurl}}/article/send-lifespan/#maximum-access-count), you can ensure that access to recipients is terminated according to your needs.
 
-- **Customizably Private**: Protect the contents of your Send by optionally [configuring a password]({{site.baseurl}}/article/send-privacy/#send-passwords) for access so that no unintended recipients can see the contained information. For text Sends, you can also optionally [require users to toggle visibility]({{site.baseurl}}/article/send-privacy/#hide-text) to prevent exposure to unintentional onlookers.
+- **Customizably Private**: Protect the contents of your Send by optionally [configuring a password]({{site.baseurl}}/article/send-privacy/#send-passwords) for access or [hiding your email address from recipients]({{site.baseurl}}/article/send-privacy/#hide-email). For text Sends, you can also optionally [require users to toggle visibility]({{site.baseurl}}/article/send-privacy/#hide-text) to prevent exposure to unintentional onlookers.
 
 ## The Send View
 
@@ -28,7 +28,4 @@ Sends are created, edited, managed, and deleted from the **Send** view in any Bi
 
 Using Bitwarden Send is a simple two-step process:
 
-1. [Create your Send]({% link _articles/send/create-send.md %}), setting whichever [lifespan options]({% link _articles/send/send-lifespan.md %}) and [privacy options]({% link _articles/send/send-privacy.md %}) are required to fit your sharing needs.
-2. Share the Send link with the [intended recipients]({% link _articles/send/receive-send.md %}), using whatever communication channel you prefer.
-
-As the Sender, we recommend that you keep track of your Send's [configured lifespan]({% link _articles/send/send-lifespan.md %}). To make that as easy as possible, Sends in your Send view will display [a set of status icons]({{site.baseurl}}/article/send-faqs/#q-what-do-the-icons-next-to-my-sends-indicate) whenever a lifespan event (for example, expiration) has occurred.
+1. [Create your Send]({% link _articles/send/create-send.md %}), setting whichever [lifespan options]({% link _articles/send/send-lifespan.md %}) and [

_articles/send/create-send.md

@@ -47,7 +47,7 @@ Complete the following steps to create a new Send from the Bitwarden [Web Vault]
    - **What type of Send is this?**: Specify whether this Send will be **Text** or a **File**:
 
      |**Text**|Type or paste the desired text into the input box. Toggle the **When accessing the Send, hide the text by default** option to require recipients to [toggle visibility]({{site.baseurl}}/article/send-privacy/#hide-text) when they open a Send.|
-     |**File**|Select the **Choose File** button and browse for the file to send. The maximum file size per Send is 100 MB. (**Requires Premium**)|
+     |**File**|Select the **Choose File** button and browse for the file to send. The maximum file size per Send is 500 MB (100 MB on Mobile). (**Requires Premium** & Verified Email)|
 
    - **Name**: Specify an identifiable, meaningful name for this Send.
 
@@ -60,7 +60,8 @@ Complete the following steps to create a new Send from the Bitwarden [Web Vault]
    |**Maximum Access Count**|The Send will be [disabled]({{site.baseurl}}/article/send-lifespan/#maximum-access-count-behavior) after the specified access count is reached. By default, unspecified.|
    |**Password**|[Require a password]({{site.baseurl}}/article/send-privacy/#send-passwords) to be entered by recipients of this Send in order to gain access.|
    |**Notes**|Enter private notes for this Send, which will only be visible to the Sender.|
-   **Disable this send so that no one can access it**|Check this box to prevent this Send from being accessible to any recipients. You will still be able to interact this Send from your Send view.|
+   |**Hide my email address from recipients**|[Hide your email]({{site.baseurl}}/article/send-privacy/#hide-email) from Send recipients.|
+   |**Disable this send so that no one can access it**|Check this box to prevent this Send from being accessible to any recipients. You will still be able to interact this Send from your Send view.|
 
    {% callout success%}The rest of this article covers copying a Send link to your clipboard, but you can do that automatically by checking the **Copy the link to share this Send to my clipboard upon save** option before you click **Save**.{% endcallout %}
 
@@ -94,7 +95,7 @@ Complete the following steps to create a new Send from a Bitwarden Browser Exten
    - **Type**: Specify whether this Send will be **Text** or a **File**:
 
      |**Text** | Type or paste the desired text into the input box. Toggle the **When accessing the Send, hide the text by default** option to require recipients to [toggle visibility]({{site.baseurl}}/article/send-privacy/#hide-text) when they open a Send.|
-     |**File** | Select the **Choose File** button and browse for the file to send. The maximum file size per Send is 100 MB. (**Requires Premium**)<br><br>If you're using **Firefox or Safari**, you'll need to popout ({% icon fa-external-link fa-rotate-270 %}) the Browser Extension in order to browse for the file to send.|
+     |**File** | Select the **Choose File** button and browse for the file to send. The maximum file size per Send is 500 MB (100 MB on Mobile). (**Requires Premium** & Verified Email)<br><br>If you're using **Firefox or Safari**, you'll need to popout ({% icon fa-external-link fa-rotate-270 %}) the Browser Extension in order to browse for the file to send.|
 
     By default, a Send will be scheduled for deletion 7 days from its creation. You may configure this and other options using the {% icon fa-chevron-down %} **Options** menu (see Step 4), otherwise select **Save** to finish creating your Send.
 
@@ -105,6 +106,7 @@ Complete the following steps to create a new Send from a Bitwarden Browser Exten
    |**Maximum Access Count**|The Send will be [disabled]({{site.baseurl}}/article/send-lifespan/#maximum-access-count-behavior) after the specified access count is reached. By default, unspecified.|
    |**Password**|[Require a password]({{site.baseurl}}/article/send-privacy/#send-passwords) to be entered by recipients of this Send in order to gain access.|
    |**Notes**|Enter private notes for this Send, which will only be visible to the Sender.|
+   |**Hide my email address from recipients**|[Hide your email]({{site.baseurl}}/article/send-privacy/#hide-email) from Send recipients.|
    |**Disable this send so that no one can access it**|Check this box to prevent this Send from being accessible to any recipients. You will still be able to interact this Send from your Send view.|
 
    {% callout success%}The rest of this article covers copying a Send link to your clipboard, but you can do that automatically by checking the **Copy the link to share this Send to my clipboard upon save** option before you click **Save**.{% endcallout %}
@@ -138,7 +140,7 @@ Complete the following steps to create a new Send from a Bitwarden Desktop App:
    - **Type**: Specify whether this Send will be **Text** or a **File**:
 
      | **Text** | Type or paste the desired text into the input box. Toggle the **When accessing the send, hide text by default** option to require recipients to [toggle visibility]({% link _articles/send/send-privacy.md %}) when they open a Send.|
-     | **File** | Select the **Choose File** button and browse for the file to send. The maximum file size per Send is 100 MB. (**Requires Premium**)|
+     | **File** | Select the **Choose File** button and browse for the file to send. The maximum file size per Send is 500 MB (100 MB on Mobile). (**Requires Premium** & Verified Email)|
 
      By default, a Send will be scheduled for deletion 7 days from its creation. You may configure this and other options using the {% icon fa-chevron-down %} **Options** menu (see Step 4), otherwise select **Save** to finish creating your Send.
 
@@ -149,6 +151,7 @@ Complete the following steps to create a new Send from a Bitwarden Desktop App:
    |**Maximum Access Count**|The Send will be [disabled]({{site.baseurl}}/article/send-lifespan/#maximum-access-count-behavior) after the specified access count is reached. By default, unspecified.|
    |**Password**|[Require a password]({{site.baseurl}}/article/send-privacy/#send-passwords) to be entered by recipients of this Send in order to gain access.|
    |**Notes**|Enter private notes for this Send, which will only be visible to the Sender.|
+   |**Hide my email address from recipients**|[Hide your email]({{site.baseurl}}/article/send-privacy/#hide-email) from Send recipients.|
    |**Disable this send so that no one can access it**|Check this box to prevent this Send from being accessible to any recipients. You will still be able to interact this Send from your Send view.|
 
    {% callout success%}The rest of this article covers copying a Send link to your clipboard, but you can do that automatically by checking the **Copy the link to share this Send to my clipboard upon save** option before you click **Save**.{% endcallout %}
@@ -182,7 +185,7 @@ Complete the following steps to create a new Send from Bitwarden Mobile App:
    - **Type**: Specify whether this Send will be **Text** or a **File**:
 
      |**Text** | Type or paste the desired text into the input box. Toggle the **When accessing the Send, hide the text by default** option to require recipients to [toggle visibility]({% link _articles/send/send-privacy.md %}) when they open a Send.|
-     |**File** | Tap the **Choose File** button and browse for the file to send. The maximum file size per Send is 100 MB. (**Requires Premium**)|
+     |**File** | Tap the **Choose File** button and browse for the file to send. The maximum file size per Send is 100 MB (500 MB on other clients). (**Requires Premium** & Verified Email)|
 
    - **Name**: Specify an identifiable, meaningful name for this Send.
 
@@ -195,6 +198,7 @@ Complete the following steps to create a new Send from Bitwarden Mobile App:
    |**Maximum Access Count**|The Send will be [disabled]({{site.baseurl}}/article/send-lifespan/#maximum-access-count-behavior) after the specified access count is reached. By default, unspecified.|
    |**Password**|[Require a password]({{site.baseurl}}/article/send-privacy/#send-passwords) to be entered by recipients of this Send in order to gain access.|
    |**Notes**|Enter private notes for this Send, which will only be visible to the Sender.|
+   |**Hide my email address from recipients**|[Hide your email]({{site.baseurl}}/article/send-privacy/#hide-email) from Send recipients.|
    |**Disable this send so that no one can access it**|Check this box to prevent this Send from being accessible to any recipients. You will still be able to interact this Send from your Send view.|
 
    {% callout success%}Toggling the **Share upon save** option before you tap **Save** will open the share menu on your device so you can quickly share your Send link.{% endcallout %}

_articles/send/receive-send.md

@@ -22,6 +22,27 @@ Depending on the [options configured]({% link _articles/send/create-send.md %})
 - Enter a Password to access the contents of the Send.
 - Manually toggle visibility on a hidden-text Send.
 
+## Hidden-email Sends
+
+By default, Send objects will display the email address of the Sender to recipients, as in the above screenshot. Senders can optionally hide their email address from the Send object, which will substitute in a warning message:
+
+{% image send/send-email-hidden-file.png %}
+
+If you receive a Send with this error message, here's what you should do:
+
+- **Was this Send expected?**
+
+   If this Send was expected, get in touch with the expected Sender. Validate with this person that the received Send link (`https://vault.bitwarden.com/#/send/xxx/yyy`) matches the one they created.
+- **Was this Send unexpected?**
+
+   If this Send was unexpected, you should identify the Sender before interacting with it. Ask your colleagues, managers, or friends who have Bitwarden accounts whether they might have sent you something. If you do identify the Sender, validate with this person that the received Send link (`https://vault.bitwarden.com/#/send/xxx/yyy`) matches the one they created. **If you can't identify the Sender**, don't interact with the Send.
+
+{% callout warning %}
+Taking the above measures to ensure the trustworthiness of a hidden-email Send are particularly important in the case of File Sends. **Don't download mysterious files.**
+{% endcallout %}
+
+## Deleted, Expired, and Disabled Sends
+
 When a Send has [been deleted, expired, or disabled]({% link _articles/send/send-lifespan.md %}), recipients who attempt to use the generated Send link will be shown a screen that reports the Send does not exist or is no longer available:
 
 {% image /send/send-unavailable.png A deleted, expired, or disabled Send %}

_articles/send/send-privacy.md

@@ -7,9 +7,9 @@ popular: false
 tags: [bitwarden send, send, passwords, hidden text]
 order: 05
 ---
-Protect the contents of your Send by optionally configuring a [password for access](#passwords) so that no unintended recipients can see the contained information. For text Sends, you can also optionally require recipients to [toggle visibility](#hide-text) to prevent exposure to unintentional onlookers.
+Protect the contents of your Send by optionally configuring a [password for access](#passwords) so that no unintended recipients can see the contained information, and/or to [hide your email from recipients](). For text Sends, you can also optionally require recipients to [toggle visibility](#hide-text) to prevent exposure to unintentional onlookers.
 
-The **Password** and **Hide Text** options are configurable from the Create New Send view, or from the Edit Send views at any time prior to the Send's [deletion]({{site.baseurl}}/article/send-lifespan/#deletion-behavior).
+The **Password**, **Hide Email**, and **Hide Text** options are configurable from the Create New Send view, or from the Edit Send views at any time prior to the Send's [deletion]({{site.baseurl}}/article/send-lifespan/#deletion-behavior).
 
 ## Send Passwords
 
@@ -17,7 +17,7 @@ For any Send, you may configure a password that recipients will be required to e
 
 {% image /send/send-pw-protected.png Receiving a password-protected Send%}
 
-Once you password-protect a Send, you won't be able to view the configured password again, however you can [change](#change-send-passwords) or [remove](#remove-send-password) at any time:
+Once you password-protect a Send, you won't be able to view the configured password again, however you can [change](#change-send-passwords) or [remove](#remove-send-password) it at any time:
 
 ### Change Send Passwords
 
@@ -29,6 +29,20 @@ You can change a Send's password at any time from the **Edit Send** view. Changi
 
 You can remove a Send's password at any time using the {% icon fa-undo %} **Remove Password** menu option. Removing a Send's password **will not** require you to enter the previous password.
 
+## Hide Email
+
+{% callout success %}
+For Enterprise Organizations, the availability of this option can be set using an [Enterprise Policy]({{site.baseurl}}/articles/policies/#send-options).
+{% endcallout %}
+
+By default, Send objects will display the email address of the Sender to recipients:
+
+{% image send/send-email-visible.png Sender Email Visible %}
+
+Toggle the **Hide my email address from recipients** option to remove your email address from the Send object. Send recipients can still validate the trustworthiness of of expected Sends by cross-referencing the **Send link** with their Sender. Hidden-email Send objects will issue a warning to recipients encouraging them to do so:
+
+{% image send/send-email-hidden.png Sender Email Hidden %}
+
 ## Hide Text
 
 For text Sends, toggle the **When accessing the Send, hide the text by default** option to require recipients to {% icon fa-eye %} **Toggle Visibility** in order to see its contents. Hiding the text on a Send is a good way to ensure the contents of a Send aren't exposed to unintentional onlookers:

_articles/two-step-login/bitwarden-field-guide-two-step-login.md

@@ -49,9 +49,9 @@ Enabling Two-step Login will require you to complete a secondary step each time
 
 **For Premium users**, Bitwarden offers several advanced Two-step Login methods:
 
-- Duo Security with Duo Push, SMS, phone call, and U2F security keys
+- Duo Security with Duo Push, SMS, phone call, and security keys
 - YubiKey (any 4/5 series device or YubiKey NEO/NFC)
-- FIDO U2F (any FIDO U2F certified key)
+- FIDO (any FIDO2 WebAuthn certified key)
 
 To learn more about your options, and for help setting up any method, see [Two-step Login Methods]({% link _articles/two-step-login/setup-two-step-login.md %}).
 

_articles/two-step-login/setup-two-step-login-fido.md

@@ -0,0 +1,70 @@
+---
+layout: article
+title: Two-step Login via FIDO2 WebAuthn
+categories: [two-step-login]
+featured: false
+popular: false
+tags: [two-step login, 2fa, two factor authentication, account, u2f, fido]
+order: 07
+redirect_from:
+  - /article/setup-two-step-login-u2f/
+---
+
+Two-step Login using FIDO2 WebAuthn authenticators is available for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
+
+Any FIDO2 WebAuthn Certified authenticator can be used, including Security Keys like YubiKeys, SoloKeys, and Nitrokeys, as well as native biometrics options like Windows Hello and Touch ID.
+
+{% callout success %}
+Existing FIDO U2F security keys will still be usable and will be marked **(Migrated from FIDO)** on the Two-step Login → Manage FIDO2 WebAuthn dialog.
+{% endcallout %}
+
+FIDO2 WebAuthn cannot be used on all Bitwarden applications. Enable another Two-step Login method in order to access your vault on unsupported applications. Supported applications include:
+
+- **Web Vault** on a computer with a [FIDO2-supported Browser](https://fidoalliance.org/fido2/fido2-web-authentication-webauthn/){:target="\_blank"}.
+- **Browser Extensions** for a [FIDO2-supported Browser](https://fidoalliance.org/fido2/fido2-web-authentication-webauthn/){:target="\_blank"}.
+- **Desktop Application** on Windows 10 and above.
+
+## Setup FIDO2 WebAuthn
+
+Complete the following steps to enable Two-step Login using FIDO2 WebAuthn:
+
+{% callout warning %}
+**Losing access to your authenticator can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place or have an alternate Two-step Login method enabled and available.
+
+[Get Your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
+{% endcallout %}
+
+1. Log in to the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.
+2. Select **Settings** from the top navigation bar.
+3. Select **Two-step Login** from the left-side menu.
+4. Locate the **FIDO2 WebAuthn** option and select the **Manage** button.
+
+   {% image two-step/twostep-options-fido2.png Select the Manage button %}
+
+   You will be prompted to enter your Master Password to continue.
+
+5. Give your security key a friendly **Name**.
+6. Plug the security key into your computer's USB port and select **Read Key**.
+
+   If your security key has a button, touch it.
+
+7. Select **Save**. A green `Enabled` message will indicate that Two-step Login using FIDO2 WebAuthn has been successfully enabled and your key will appear with a green checkbox ( {% icon fa-check %} ).
+8. Select the **Close** button and confirm that the **FIDO2 WebAuthn** option is now enabled, as indicated by a green checkbox ( {% icon fa-check %} ).
+
+Repeat this process to add up to 5 FIDO2 WebAuthn security keys to your account.
+
+{% callout info %}
+When you setup Two-step Login, you should logout of all your Bitwarden apps to immediately activate Two-step Login for each app. You will eventually be logged out automatically.
+{% endcallout %}
+
+## Use FIDO2 WebAuthn
+
+The following assumes that **FIDO2 WebAuthn** is your [highest-priority enabled method](https://bitwarden.com/help/article/setup-two-step-login/#using-multiple-methods). Complete the following steps to access your Vault using Two-step Login:
+
+1. Log in to your Bitwarden Vault (*Web Vault* or *Browser Extension*) and enter your Email Address and Master Password.
+
+   You will be prompted to insert your security key into your computer's USB port. If it has a button, touch it.
+
+   {% image two-step/u2f/fido2.png %}
+
+You will not be required to complete your secondary Two-step Login setup to **Unlock** your Vault once logged in. For help configuring Log Out vs. Lock behavior, see [Vault Timeout Options]({% link _articles/account/vault-timeout.md %}).

_articles/two-step-login/setup-two-step-login-u2f.md

@@ -1,67 +0,0 @@
----
-layout: article
-title: Two-step Login via FIDO U2F
-categories: [two-step-login]
-featured: false
-popular: false
-tags: [two-step login, 2fa, two factor authentication, account, u2f, fido]
-order: 07
----
-
-Two-step Login using [FIDO U2F](https://www.yubico.com/solutions/fido-u2f/){:target="_blank"} is available for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
-
-Any FIDO U2F certified device can be used, including YubiKeys, SoloKeys, Google Titan, Nitrokeys, and more.
-
-{% callout info %}
-**FIDO U2F cannot be used on all Bitwarden applications.** Enable another Two-step Login method in order to access your vault on unsupported applications.
-
-Supported applications:
-
-- Web Vault on a computer with a U2F-enabled Browser (Chrome, Opera, Vivaldi, Edge, or [Firefox with FIDO U2F enabled](https://www.yubico.com/2017/11/how-to-navigate-fido-u2f-in-firefox-quantum/){:target="_blank"}).
-- Browser Extensions for a U2F-enabled Browser (Chrome, Opera, Vivaldi, Edge, or [Firefox with FIDO U2F enabled](https://www.yubico.com/2017/11/how-to-navigate-fido-u2f-in-firefox-quantum/){:target="_blank"}).
-{% endcallout %}
-
-## Setup FIDO U2F
-
-Complete the following steps to enable Two-step Login using FIDO U2F:
-
-{% callout warning %}
-**Losing access to your FIDO U2F device can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place or have an alternate Two-step Login method enabled and available.
-
-[Get Your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
-{% endcallout %}
-
-1. Log in to the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.
-2. Select **Settings** from the top navigation bar.
-3. Select **Two-step Login** from the left-side menu.
-4. Locate the **FIDO U2F Security Key** option and select the **Manage** button.
-
-   {% image two-step/twostep-options-u2foverlay.png Select the Manage button %}
-
-   You will be prompted to enter your Master Password to continue.
-
-5. Give your security key a friendly **Name**.
-6. Plug the security key into your computer's USB port and select **Read Key**.
-
-   If your security key has a button, touch it.
-
-7. Select **Save**. A green `Enabled` message will indicate that Two-step Login using FIDO U2F has been successfully enabled and your key will appear with a green checkbox ( {% icon fa-check %} ).
-8. Select the **Close** button and confirm that the **FIDO U2F Security Key** option is now enabled, as indicated by a green checkbox ( {% icon fa-check %} ).
-
-Repeat this process to add up to 5 FIDO U2F security keys to your account.
-
-{% callout info %}
-When you setup Two-step Login, you should logout of all your Bitwarden apps to immediately activate Two-step Login for each app. You will eventually be logged out automatically.
-{% endcallout %}
-
-## Use FIDO U2F
-
-The following assumes that **FIDO U2F** is your [highest-priority enabled method](https://bitwarden.com/help/article/setup-two-step-login/#using-multiple-methods). Complete the following steps to access your Vault using Two-step Login:
-
-1. Log in to your Bitwarden Vault (*Web Vault* or *Browser Extension*) and enter your Email Address and Master Password.
-
-   You will be prompted to insert your security key into your computer's USB port. If it has a button, touch it.
-
-   {% image two-step/u2f/web.png %}
-
-You will not be required to complete your secondary Two-step Login setup to **Unlock** your Vault once logged in. For help configuring Log Out vs. Lock behavior, see [Vault Timeout Options]({% link _articles/account/vault-timeout.md %}).

_articles/two-step-login/setup-two-step-login.md

@@ -31,9 +31,9 @@ For Premium users (including members of Paid Organizations), Bitwarden offers se
 
 |Method|Setup Instructions|
 |------|------------------|
-|via Duo Security with Duo Push, SMS, phone call, and U2F security keys|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-duo.md %}).|
+|via Duo Security with Duo Push, SMS, phone call, and security keys|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-duo.md %}).|
 |via YubiKey (any 4/5 series device or YubiKey NEO/NFC)|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-yubikey.md %}).|
-|via FIDO U2F (any FIDO U2F certified key)|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-u2f.md %}).|
+|via FIDO2 WebAuthn (any FIDO2 WebAuthn Certified authenticator)|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-fido.md %}).|
 
 ## Two-step Login for Teams and Enterprise
 
@@ -41,14 +41,14 @@ While all of the above methods can be enabled on an individual-by-individual bas
 
 |Method|Setup Instructions|
 |------|------------------|
-|via Duo Security with Duo Push, SMS, phone call, and U2F security keys|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-duo.md %}).|
+|via Duo Security with Duo Push, SMS, phone call, and security keys|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-duo.md %}).|
 
 ## Using Multiple Methods
 
 You can choose to enable multiple Two-step Login methods. When you log in to a Vault with multiple enabled methods, Bitwarden will first prompt you for the highest-priority method according to the following order of preference:
 
 1. Duo (Organizations)
-2. FIDO U2F
+2. FIDO2 WebAuthn
 3. YubiKey
 4. Duo (Individual)
 5. Authenticator App

_articles/two-step-login/two-step-recovery-code.md

@@ -28,6 +28,12 @@ To get your Recovery Code from your [Web Vault](https://vault.bitwarden.com){:ta
 
 Save your Recovery Code in the way that makes the most sense for you. Believe it or not, printing your code and keeping it somewhere safe is one of the best ways to ensure that the code isn't vulnerable to theft or inadvertent deletion.
 
+{% callout info %}
+**When does a recovery code change?**
+
+Neither disabling and re-enabling Two-step Login nor changing your Master Password will change your recovery code. Your recovery code will only change [when you use it](#use-you-recovery-code). On using your recovery code, immediately get a new one and save it in the way that makes the most sense for you.
+{% endcallout %}
+
 ### Use your Recovery Code
 
 To use your Recovery Code, navigate to [https://vault.bitwarden.com/#/recover-2fa/](https://vault.bitwarden.com/#/recover-2fa/) (or, if you're self-hosting, [https://your.domain.com/#/recover-2fa/](#use-your-recovery-code)).