Misc (#807)

* tip - export format when uploading to a new account

* update on premise - cron example

* note on failed pin attempts

* strike email requirement for self-host licensing

* FAQ item on changing sp entity id, acs, callback path, etc.

* tips on --apikey for CLI in SSO required organizations

* issue 804

_articles/account/export-your-data.md

@@ -55,6 +55,8 @@ To export your personal Vault data from the Web Vault:
 1. Select **Tools** from the top navigation bar.
 2. Select **Export Vault** from the left-hand Tools menu.
 3. On the Vault Export page, choose a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
+
+   {% callout success %}If you need to import this data into a new Bitwarden account, choose the regular `.json` format (**not** `.json (Encrypted)`).{% endcallout %}
 4. Enter your **Master Password** and select the **Export Vault** button.
 
 {% endcapture %}
@@ -70,6 +72,8 @@ To export your personal Vault data from a Browser Extension:
 1. Open the {% icon fa-cogs %} **Settings** tab.
 2. Scroll down to the **Tools** section and select the **Export Vault** option.
 3. On the Export Vault view, choose a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
+
+   {% callout success %}If you need to import this data into a new Bitwarden account, choose the regular `.json` format (**not** `.json (Encrypted)`).{% endcallout %}
 4. Enter your **Master Password** and select **Submit**.
 
 {% callout info %}
@@ -90,6 +94,8 @@ To export your personal Vault data from a Desktop app:
 
 1. From the menu bar, navigate to **File** → **Export Vault**.
 2. In the Export Vault window, choose a **File Format** (`.json`, `.csv`, or `.json (Encryped)`).
+
+   {% callout success %}If you need to import this data into a new Bitwarden account, choose the regular `.json` format (**not** `.json (Encrypted)`).{% endcallout %}
 3. Enter your **Master Password** and select the {% icon fa-download %} **Download** button.
 
 {% endcapture %}
@@ -105,6 +111,8 @@ To export your personal Vault data from a Mobile app:
 1. Tap the {% icon fa-cogs %} **Settings** tab.
 2. Scroll down to the **Tools** section and tap the **Export Vault** option.
 3. On the Export Vault view, choose a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
+
+   {% callout success %}If you need to import this data into a new Bitwarden account, choose the regular `.json` format (**not** `.json (Encrypted)`).{% endcallout %} 
 4. Enter your **Master Password** and tap the **Export Vault** button.
 
 {% endcapture %}

_articles/account/forgot-master-password.md

@@ -11,7 +11,7 @@ description: "This article explains what to do if you forgot your master passwor
 
 As described in the [Your Master Password]({{site.baseurl}}/article/master-password/) article, Bitwarden has no knowledge of, way to retrieve, or way to reset your Master Password.
 
-If you've already lost your Master Password, there is unfortunately no way for anyone to recover the account or the data stored in your Personal Vault unless you're enrolled in [Organization Master Password Reset]({{site.baseurl}}/article/admin-reset/). You will need to delete your account and start a new one.
+If you've already lost your Master Password, there is unfortunately no way for anyone to recover the account or the data stored in your Personal Vault unless you're enrolled in [Organization Master Password Reset]({{site.baseurl}}/article/admin-reset/) or have a designated [trusted emergency contact]({{site.baseurl}}/article/emergency-access). You will need to delete your account and start a new one.
 
 {% callout success %}
 Before deleting your account:
@@ -20,7 +20,7 @@ Before deleting your account:
 
 **Second**, if you're having issues logging in with a Bitwarden client application, try logging in using another type of client, or on another device.
 
-**Third**, 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 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. Or, if your Organization uses [Admin Password Reset]({{site.baseurl}}/article/admin-reset/), reach out to an administrator.
 
 **Lastly**, 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 %}

_articles/account/master-password.md

@@ -56,7 +56,7 @@ Other logged-in client applications (Mobile Apps, Browser Extensions, etc.) may
 
 As described in the [About Your Master Password](#about-your-master-password) section, Bitwarden has no knowledge of, way to retrieve, or way to reset your Master Password.
 
-If you've already lost your Master Password, there is unfortunately no way for the team to recover the account or the data therein. You will need to delete your account and start a new one.
+If you've already lost your Master Password, there is unfortunately no way for anyone to recover the account or the data stored in your Personal Vault unless you're enrolled in [Organization Master Password Reset]({{site.baseurl}}/article/admin-reset/) or have a designated [trusted emergency contact]({{site.baseurl}}/article/emergency-access). You will need to delete your account and start a new one.
 
 {% callout success %}
 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.

_articles/account/unlock-with-pin.md

@@ -13,6 +13,10 @@ Bitwarden can be configured to accept a Personal Identification Number (PIN) as
 
 PINs can **only be used to unlock** your Vault, you will still be required to use your Master Password and any enabled [Two-step Login method]({{site.baseurl}}/article/setup-two-step-login/) when you **log in**. If you're not sure of the difference, scroll down to [Understanding Unlock vs. Log In](#understanding-unlock-vs-log-in).
 
+{% callout info %}
+After 5 failed PIN attempts, the Bitwarden app will automatically log out of your account.
+{% endcallout %}
+
 ## Enable Unlock with PIN
 
 Unlock with PIN can be enabled for Bitwarden Browser Extensions, Desktop, and Mobile: