Misc 07 12 (#673)

* add APR to feature table

* add APR to 2019-2020 plan diff

* update enterprise 2019-2020 description

* clarification in data-storage

* faq re: requiring 2fa, org duo, etc.

* 'why keep your server updated' description updates

* Updated B.Extension TOTP Copy information

_articles/faqs/twostep-faqs.md

@@ -15,6 +15,10 @@ 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: Can I require my Organization's users to use Two-step Login?
+
+**A:** You can require your Organization's users to use Two-step Login by enabling the [Two-step Login Policy]({{site.baseurl}}/article/policies/#two-step-login). Additionally, you can setup [Organization-wide Duo 2FA]({{site.baseurl}}/article/two-step-login-duo) to ensure that all of your users have a secure Two-step Login method at their disposal.
+
 ### 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.

_articles/features/auto-fill-browser.md

@@ -86,10 +86,17 @@ Using this convention, you can setup your Browser extension to, for example:
 If there are multiple Login items with the detected URI, the last-used login will be used for the auto-fill operation.
 {% endcallout %}
 
-### TOTP Copy
-
-If you use [Bitwarden Authenticator]({{site.baseurl}}/article/authenticator-keys/), you can enable the **Copy TOTP to clipboard after auto-fill** option to automatically copy a TOTP code to the clipboard when a Login is autofilled.
-
 ## Manually Auto-fill
 
 You can auto-fill items manually that don't have saved URIs by opening them in the {% icon fa-lock %} **My Vault** view, and selecting the **Auto-fill** button.
+
+## TOTP Copy
+
+If you use [Bitwarden Authenticator]({{site.baseurl}}/article/authenticator-keys/), Bitwarden will automatically copy a Login item's TOTP code to the clipboard when the Login item is autofilled by any of the above methods.
+
+{% callout success %}
+You can disable this option and set a custom interval with which to clear your clipboard from the Browser Extension's {% icon fa-cogs %} **Settings** tab: 
+
+{% image autofill/clipboard.png Clipboard Settings %}
+
+{% endcallout %}

_articles/hosting/updating-on-premise.md

@@ -8,9 +8,9 @@ tags: [hosting, update]
 order: 06
 ---
 
-**It is critically important to keep your Self-hosted Bitwarden instance up to date.**
+**It is critically important to keep your Self-hosted Bitwarden instance up to date.** Updates may include fixes that are important for the security of your Bitwarden instance, including patches to any vulnerabilities. Data stored in your Bitwarden Vault, including passwords, should be considered critical data and therefore protected with up-to-date software. 
 
-Updates may include fixes that are important for the security of your Bitwarden instance. Additionally, newer versions of client applications may not support older versions of your self-hosted instance.
+ Additionally, newer versions of client applications may not support older versions of your self-hosted instance.
 
 {% callout warning %}
 We highly recommend backing up your data before updating your self-hosted instance. For more information, see [Backup your Hosted Data]({% link _articles/hosting/backup-on-premise.md %}).

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

@@ -65,7 +65,7 @@ There is no longer a minimum number of users required for a Teams Organization (
 
 ## Enterprise Organizations
 
-Upgrading from Classic 2019 to the current Enterprise plan unlocks the highly anticipated Login with SSO feature-set, simplifying access for enterprise users by fully integrating with your existing Identity Management solution.
+Upgrading from Classic 2019 to the current Enterprise plan unlocks the highly anticipated Login with SSO feature-set, simplifying access for enterprise users by fully integrating with your existing Identity Management solution. It also unlocks [Admin Password Reset]({{site.baseurl}}/article/admin-reset/), allowing designated administrators to recover Enterprise Organization user accounts and restore access in the event that an employee forgets their Master Password. 
 
 As before, all members of your Enterprise Organization will automatically get all premium features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more.
 
@@ -77,6 +77,7 @@ As before, there is no limit to the number of users in your Enterprise Organizat
 |--------|------------|---------------|
 |Pre-existing Enterprise functionality, including:<br><br>-Premium features for all users<br>-Event Logs<br>-User Groups<br>-API access<br>-Directory Connector<br>-Enterprise Policies|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |Login with SSO|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Admin Password Reset]({{site.baseurl}}/article/admin-reset/)|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |Cost|$3 Per User Per Month, billed annually|$5 Per User Per Month, billed annually|
 
 {% callout info %}

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

@@ -110,6 +110,7 @@ In the following table, "premium features" (included for **Teams Organizations**
 |[Directory Connector]({% link _articles/directory-connector/directory-sync.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |[Login with SSO]({% link _articles/login-with-sso/about-sso.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |[Enterprise Policies]({% link _articles/organizations/policies.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Admin Password Reset]({{site.baseurl}}/article/admin-reset/)|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |[Custom Management Role]({% link _articles/organizations/user-types-access-control.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |[Self-host option]({% link _articles/hosting/install-on-premise.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |Cost to you|Free|$3 Per User Per Month, billed annually<br>or<br>$4 Per User Per Month, billed monthly|$5 Per User Per Month, billed annually<br>or<br>$6 Per User Per Month, billed monthly|

_articles/security/data-storage.md

@@ -23,7 +23,7 @@ Bitwarden processes and stores all data securely in the [Microsoft Azure Cloud](
 Don't trust Bitwarden Servers? You don't have to. Open source is beautiful. You can easily host the entire Bitwarden stack yourself. You control your data. Learn more [here]({% link _articles/hosting/install-on-premise.md %}).
 ## On your Local Machine
 
-Data that is stored on your computer/device is also encrypted and only decrypted when you unlock your Vault. Vault data can be found in the following locations based on the client application in use:
+Data that is stored on your computer/device is also encrypted and only decrypted when you unlock your Vault. Decrypted data is stored **in memory** in the following locations and is **never written to persistent storage**:
 
 #### Desktop App