From 535ea72847d4b45014bc503b1f17c5152bc66e65 Mon Sep 17 00:00:00 2001
From: fred_the_tech_writer <69817454+fschillingeriv@users.noreply.github.com>
Date: Thu, 11 Mar 2021 11:58:16 -0500
Subject: [PATCH] Release Updates (#474)
* Send Staging (#447)
* - js for in-page tabs
- send category early drafts of articles
- send images
* fix scrolling on tab
* send web vault
* mobile image
* redone 'receive send' article
* send from browser ext & mobile
* send work
* improvements to 'about'
* send additions
* so much send
* lotsa send
* all send all the time
* ain't nothin but a send thang
* cli
* send cli
* simple cli sends in /create-send/
* simple disable & delete in /send-lifespan/
* send desktop screenshots
* send final cleanup
* cli final cleanup
* send edits
* fix
* send final touches
* fixed links & non-send updates
* new import message documentation, several import articles condensed to use tabs, U2F support for Edge, excluded domains article, remove in innacurate note on emergency accesss
* Firefox Attachment Workflow + Date Picker for custom timestamps
* safari attach file Send req
* excluded domains addition
* fix tab titles
* release notes
* unlock articles
* link to status feed
* small typos
* test
* updated release notes
* lastpass article form fill rewrites
* import to org & personal clarifications
* send self-hosting, safari web extension edits, and release notes
---
_articles/account/biometrics.md | 163 +++++++-----
_articles/account/export-your-data.md | 177 +++++++++----
_articles/account/forgot-master-password.md | 14 +-
.../account/install-safari-app-extension.md | 16 +-
_articles/account/managing-items.md | 5 +-
_articles/account/master-password.md | 41 +--
_articles/account/unlock-with-pin.md | 90 +++++--
.../directory-sync-desktop.md | 2 +-
_articles/faqs/import-faqs.md | 63 ++++-
_articles/faqs/send-faqs.md | 39 +++
_articles/features/attachments.md | 97 +++++++-
.../create-bitwarden-account.md | 14 +-
.../getting-started-webvault.md | 6 +-
_articles/getting-started/releasenotes.md | 12 +-
_articles/importing/encrypted-export.md | 122 +++++++--
_articles/importing/import-data.md | 118 ++-------
_articles/importing/import-from-lastpass.md | 90 ++++---
_articles/miscellaneous/cli.md | 22 ++
_articles/miscellaneous/exclude-domains.md | 18 ++
_articles/miscellaneous/vault-sync.md | 39 ++-
_articles/organizations/import-to-org.md | 101 ++------
_articles/organizations/policies.md | 8 +-
_articles/send/about-send.md | 34 +++
_articles/send/create-send.md | 235 ++++++++++++++++++
_articles/send/receive-send.md | 27 ++
_articles/send/send-cli.md | 195 +++++++++++++++
_articles/send/send-hosting.md | 19 ++
_articles/send/send-lifespan.md | 211 ++++++++++++++++
_articles/send/send-privacy.md | 36 +++
.../setup-two-step-login-u2f.md | 4 +-
_categories/send.md | 5 +
_config.yml | 2 +
images/be-excludeddomains.png | Bin 0 -> 87723 bytes
images/be-offer.png | Bin 0 -> 38705 bytes
images/biometrics/be-bio-unlock.png | Bin 0 -> 53805 bytes
images/importing/ciphererror_2021.png | Bin 0 -> 31668 bytes
images/importing/org-tools.png | Bin 0 -> 72302 bytes
images/organizations/org-export.png | Bin 74027 -> 77308 bytes
images/send/expired-send.png | Bin 0 -> 12470 bytes
images/send/received-send.png | Bin 0 -> 149492 bytes
images/send/send-access-ticker.png | Bin 0 -> 16280 bytes
images/send/send-be-share.png | Bin 0 -> 14619 bytes
images/send/send-browserext.png | Bin 0 -> 189751 bytes
images/send/send-cli.png | Bin 0 -> 107320 bytes
images/send/send-create-webvault.png | Bin 0 -> 35726 bytes
images/send/send-delete-be.png | Bin 0 -> 15171 bytes
images/send/send-delete-mob.png | Bin 0 -> 126692 bytes
images/send/send-delete.png | Bin 0 -> 47979 bytes
images/send/send-desktop-add.png | Bin 0 -> 148051 bytes
images/send/send-desktop-delete.png | Bin 0 -> 148842 bytes
images/send/send-desktop-disable.png | Bin 0 -> 39129 bytes
images/send/send-desktop-share.png | Bin 0 -> 151537 bytes
images/send/send-desktop.png | Bin 0 -> 147726 bytes
images/send/send-disable-be.png | Bin 0 -> 38273 bytes
images/send/send-disable-mobile.png | Bin 0 -> 167684 bytes
images/send/send-disable-wv.png | Bin 0 -> 27008 bytes
images/send/send-ff-popout.png | Bin 0 -> 32625 bytes
images/send/send-file.png | Bin 0 -> 22311 bytes
images/send/send-from-webvault.png | Bin 0 -> 40246 bytes
images/send/send-hidden-text.png | Bin 0 -> 27915 bytes
images/send/send-in-browser.png | Bin 0 -> 19586 bytes
images/send/send-iphone.png | Bin 0 -> 175548 bytes
images/send/send-mobile.png | Bin 0 -> 129030 bytes
images/send/send-new-pw.png | Bin 0 -> 27587 bytes
images/send/send-pw-protected.png | Bin 0 -> 28762 bytes
images/send/send-share-mob.png | Bin 0 -> 125610 bytes
images/send/send-unavailable.png | Bin 0 -> 134085 bytes
images/send/send-variety.png | Bin 0 -> 52491 bytes
images/send/send-webvault.png | Bin 0 -> 43091 bytes
69 files changed, 1600 insertions(+), 425 deletions(-)
create mode 100644 _articles/faqs/send-faqs.md
create mode 100644 _articles/miscellaneous/exclude-domains.md
create mode 100644 _articles/send/about-send.md
create mode 100644 _articles/send/create-send.md
create mode 100644 _articles/send/receive-send.md
create mode 100644 _articles/send/send-cli.md
create mode 100644 _articles/send/send-hosting.md
create mode 100644 _articles/send/send-lifespan.md
create mode 100644 _articles/send/send-privacy.md
create mode 100644 _categories/send.md
create mode 100644 images/be-excludeddomains.png
create mode 100644 images/be-offer.png
create mode 100644 images/biometrics/be-bio-unlock.png
create mode 100644 images/importing/ciphererror_2021.png
create mode 100644 images/importing/org-tools.png
create mode 100644 images/send/expired-send.png
create mode 100644 images/send/received-send.png
create mode 100644 images/send/send-access-ticker.png
create mode 100644 images/send/send-be-share.png
create mode 100644 images/send/send-browserext.png
create mode 100644 images/send/send-cli.png
create mode 100644 images/send/send-create-webvault.png
create mode 100644 images/send/send-delete-be.png
create mode 100644 images/send/send-delete-mob.png
create mode 100644 images/send/send-delete.png
create mode 100644 images/send/send-desktop-add.png
create mode 100644 images/send/send-desktop-delete.png
create mode 100644 images/send/send-desktop-disable.png
create mode 100644 images/send/send-desktop-share.png
create mode 100644 images/send/send-desktop.png
create mode 100644 images/send/send-disable-be.png
create mode 100644 images/send/send-disable-mobile.png
create mode 100644 images/send/send-disable-wv.png
create mode 100644 images/send/send-ff-popout.png
create mode 100644 images/send/send-file.png
create mode 100644 images/send/send-from-webvault.png
create mode 100644 images/send/send-hidden-text.png
create mode 100644 images/send/send-in-browser.png
create mode 100644 images/send/send-iphone.png
create mode 100644 images/send/send-mobile.png
create mode 100644 images/send/send-new-pw.png
create mode 100644 images/send/send-pw-protected.png
create mode 100644 images/send/send-share-mob.png
create mode 100644 images/send/send-unavailable.png
create mode 100644 images/send/send-variety.png
create mode 100644 images/send/send-webvault.png
diff --git a/_articles/account/biometrics.md b/_articles/account/biometrics.md
index 249ac324..7977182c 100644
--- a/_articles/account/biometrics.md
+++ b/_articles/account/biometrics.md
@@ -8,104 +8,139 @@ tags: [unlock, face id, touch id, hello, windows, mac, ios, android]
order: 11
---
-Bitwarden can be configured to accept biometrics as a method to unlock your Vault. Biometrics can **only be used to unlock** your Vault, you will still be required to log in to your Vault with your Master Password and any enabled [Two-step Login method]({% link _articles/two-step-login/setup-two-step-login.md %}).
+Bitwarden can be configured to accept biometrics as a method to unlock your Vault.
-Biometric features are part of the built-in security in your device and/or operating system. Bitwarden leverages native APIs to perform this validation, and as such **does not receive any biometrics information** from the device.
+Biometrics 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]({% link _articles/two-step-login/setup-two-step-login.md %}) 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).
-## Mobile Applications
-
-Biometric Unlock is supported for both the Android (Google Play or FDroid) and iOS Mobile Applications:
-- For **Android**, via [fingerprint unlock](https://support.google.com/nexus/answer/6285273?hl=en){:target="\_blank"} or [face unlock](https://support.google.com/pixelphone/answer/9517039?hl=en){:target="\_blank"}.
-- For **iOS**, via [Touch ID](https://support.apple.com/en-us/HT201371){:target="\_blank"} and [Face ID](https://support.apple.com/en-us/HT208109){:target="\_blank"}.
-
-### Enable Biometric Unlock in Mobile
-
-Complete the following steps to enable Biometric Unlock in your Mobile App:
-
-{% callout info %}
-Your Biometric method of choice must be enabled on your device or operating system **before** it can be enabled in Bitwarden.
+{% callout success %}
+Biometric features are part of the built-in security in your device and/or operating system. Bitwarden leverages native APIs to perform this validation, and therefore **Bitwarden does not receive any biometrics information** from the device.
{% endcallout %}
-1. Open your **Settings** tab.
-2. In the Security section, your available Biometrics options will be listed. Tap the Biometric method you would like to enable:
+## Enable Unlock with Biometrics
-{% image /biometrics/ios_faceid.jpeg Enable Face ID in iOS%}
+Unlock with Biometrics can be enabled for Bitwarden on Mobile, Desktop, and Browser Extensions:
-A green `Enabled` status will appear when activated. Once Biometric Unlock is enabled, your device will automatically prompt for your biometric data when unlocking the app.
+
+
+{% capture mobile_info %}
-## Desktop Applications
+#### Enable for Mobile
-Biometric Unlock is supported for both the Windows and macOS Desktop Applications:
-- 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"}.
-- For **macOS**, via [Touch ID](https://support.apple.com/en-us/HT207054){:target="\_blank"}.
+Unlock with Biometrics is supported for Android (Google Play or FDroid) via [fingerprint unlock](https://support.google.com/nexus/answer/6285273?hl=en){:target="\_blank"} or [face unlock](https://support.google.com/pixelphone/answer/9517039?hl=en){:target="\_blank"}, and for iOS via [Touch ID](https://support.apple.com/en-us/HT201371){:target="\_blank"} and [Face ID](https://support.apple.com/en-us/HT208109){:target="\_blank"}.
-### Enable Biometric Unlock in Desktop
+To enable Unlock with Biometrics for your Mobile device:
-Complete the following steps to enable Biometric Unlock in your Desktop App:
+1. In your device's native settings (e.g. the iOS {% icon fa-cog %} **Settings** app), make sure your biometric method is turned on.
+2. In your Bitwarden app, open the {% icon fa-cogs %} **Settings** tab.
+3. Scroll down to the Security section and tap the biometrics option you want to enable. What's available on this screen is determined by your device's hardware capabilities and what you've enabled (**Step 1**), for example:
-{% callout info %}
-Your Biometric method of choice must be enabled on your device or operating system **before** it can be enabled in Bitwarden.
-{% endcallout %}
+ {% image /biometrics/ios_faceid.jpeg Enable Face ID in iOS%}
-1. Open your **Settings** (on Windows, **File** → **Settings**) (on macOS, **Bitwarden** → **Preferences**).
-2. In the Security section, your available Biometrics options will be listed as checkbox items. Check the Biometric method you would like to enable:
+Tapping the option should prompt you to input your biometric (i.e. face or thumb-print). A green `Enabled` status indicator (pictured above) will indicate when Unlock with Biometrics is successfully enabled.
- {% image /biometrics/windows.png Configuring Hello in Windows %}
+{% endcapture %}
+{{ mobile_info | markdownify}}
+
+
+{% capture desktop_info %}
-{% callout info %}
-If you do not see the option to enable Windows Hello within the Desktop preferences, you may need to install the [Microsoft Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads).
-{% endcallout %}
+#### Enable for Desktop
-Once Biometric Unlock is enabled, a new button will be presented on the Unlock screen. Selecting this button (for example, **Unlock with Windows Hello**) will initiate unlock. You may at any time choose to unlock your Vault with your Master Password instead.
+Unlock with Biometrics is supported 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"}.
+
+To enable Unlock with Biometrics for your Desktop app:
+
+1. In your device's native settings (e.g. the macOS {% icon fa-cog %} **System Preferences** app), make sure your biometric method is turned on.
+
+ {% callout success%}Windows Users may need to install the [Microsoft Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads){:target="\_blank"} before Windows Hello can be turned on in Desktop Preferences.{% endcallout %}
+2. In your Bitwarden app, open your Settings (on Windows, **File** → **Settings**) (on macOS, **Bitwarden** → **Preferences**).
+3. Scroll down to the Security section and select the biometrics option you want to enable. What's available on this screen is determined by your device's hardware capabilities and what you've turned on (**Step 1**), for example:
+
+ {% image /biometrics/windows.png Unlock with Windows Hello %}
+
+Once enabled, a new button will be presented on the Unlock screen:
{% image /biometrics/hello-unlock.png Unlock with Windows Hello %}
-## Browser Extensions
+{% endcapture %}
+{{ desktop_info | markdownify}}
+
+
+{% capture browser_extension %}
-Biometric Unlock is supported for **Chromium-based** (e.g. Chrome, Edge) Bitwarden Browser Extensions by integration with a native Bitwarden Desktop App (the Desktop App must also be running the latest version). Through the Desktop App's access to Biometric APIs, Browser Extensions support Biometric Unlock:
-- 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"}.
-- For **macOS**, via [Touch ID](https://support.apple.com/en-us/HT207054){:target="\_blank"}.
+#### About Biometrics in Browser Extensions
-{% callout note %}
-**Biometric Unlock is currently not available for:**
+Unlock with Biometrics is supported for Extensions through an integration with the Bitwarden Desktop app. In practical terms, this means:
-- Firefox Browser Extensions (keep an eye on the required up-stream enhancement to make `nativeMessaging` optional [here](https://bugzilla.mozilla.org/show_bug.cgi?id=1630415){:target="\_blank"}).
-- Safari Browser Extensions.
+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.
+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.
+
+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 **Chromium-based** browsers (Chrome, Edge, Opera, Brave, etc.). Unlock with Biometrics is **currently not supported for**:
+
+- Safari
+- Firefox (there's a required up-stream enhancement to make `nativeMessaging` optional, documented [here](https://bugzilla.mozilla.org/show_bug.cgi?id=1630415){:target="\_blank"}).
- 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).
-In the cases of FireFox and the Microsoft App Store, this is due to native messaging limitations (see [Native Messaging Permissions](#native-messaging-permissions)). In all cases, Bitwarden team is investigating and will provide updates as things progress.
-{% endcallout %}
+#### Enable for Browser Extensions
-The Bitwarden Desktop Application must be installed, logged in, and running in order to use Biometric Unlock in a Browser Extension. Additionally, you will need to [enable Biometric Unlock in the desktop app](#enable-biometric-unlock-in-desktop) before proceeding.
+To enable Unlock with Biometrics for your Browser Extension:
-### Native Messaging Permissions
+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.
-When your Chromium-based Browser Extension updates to the version that supports Biometric Unlock (v1.48.0), you may be asked to accept a new permission for Bitwarden to `Communicate with cooperating native applications`. This permission is safe, but **optional**, and will enable the Browser Extension to communicate with the Bitwarden Desktop App, which is required to enable Biometric Unlock, as described above.
+ {% callout note %}Optionally, check the **Require verification for browser integration** option to require [account fingerprint]({% link _articles/features/fingerprint-phrase.md %}) verification when you activate the integration.{% endcallout %}
+3. In your Browser, navigate to the Extensions manager (e.g. `chrome://extensions` or `brave://extensions`), open Bitwarden, and toggle the **Allow access to file URLs** option.
-{% callout success %}
-Some browsers may additionally require you to **Allow access to file URLs** for Browser Extension Biometrics to function properly.
-{% endcallout %}
-Declining this permission will allow you to use v1.48.0 as normal, without Biometric Unlock functionality.
+ Not all browsers will require this to be toggled on, so feel free to skip this step and circle back to it only if the remaining procedure doesn't work.
+4. In your Browser Extension, open the {% icon fa-cogs %} **Settings** tab.
+5. Scroll down to the Security section and check the **Unlock with biometrics** box.
-### Enable Biometric Unlock for Browser Extensions
+ {% callout success %}You may be prompted at this stage to allow Bitwarden to `communicate with cooperating native applications`. This permission is safe, but **optional** and solely enables the Browser Extension to communicate with Desktop as described above.{% endcallout %}
-Complete the following steps to enable Biometric Unlock in your Browser Extension:
+ You should be prompted by your Desktop app to input your biometric. Doing so will complete the initial setup procedure. If you've opted to require verification (**Step 2**), you'll need to approve a fingerprint validation check.
-1. In the Desktop App, navigate to **Settings** (on Windows, **File** → **Settings**) (on macOS, **Bitwarden** → **Preferences**).
-2. Check the **Enable Browser Integration** checkbox.
+Once enabled, a new button will be presented on the Unlock screen:
- Optionally, enable the **Require verification for browser integration** option to require [account fingerprint]({% link _articles/features/fingerprint-phrase.md %}) verification when activating the integration between Browser Extension and Desktop App.
-3. In the Browser Extension, open the **Settings** tab.
-4. Check the **Unlock with biometrics** checkbox to activate the integration. You will be prompted by your Desktop App to input your biometric authentication method to complete the setup.
+{% image /biometrics/be-bio-unlock.png Unlock with Biometrics %}
- If you've opted to **Require verification for browser integration**, a `Desktop sync verification` dialog box will appear in your Browser Extension and a `Verify browser connection` dialog box will appear in your Desktop Application. Validate that the displayed [account fingerprint]({% link _articles/features/fingerprint-phrase.md %}) matches in both locations. If they match, select the **Approve** button and input your Biometric authentication method.
+{% endcapture %}
+{{ browser_extension | markdownify}}
+
+
- {% callout success %}In either case, you'll need to redo this "activation" step each time the Desktop App or Browser Extension is restarted.{% endcallout %}
+## Understanding Unlock vs. Log In
-Once Biometric Unlock is enabled, a new button will be presented on the Unlock screen. Selecting the **Unlock biometrics** button will initiate unlock via the Desktop App.
+In order to understand why unlocking and logging in aren't the same, it's important to remember that Bitwarden [never stores unencrypted data]({% link _articles/security/vault-data.md %}) on its servers. **When your Vault is neither unlocked nor logged in**, your Vault data only exists on the server in its [encrypted form]({% link _articles/security/what-encryption-is-used.md %}).
-{% callout warning %}
-If you attempt to use Biometric Unlock when the Desktop App is closed, you will be prompted to open the Desktop App. If you've opted to **Require verification for browser integration**, you'll also be prompted to recomplete fingerprint verification.
-{% endcallout %}
+**Logging in** to Bitwarden **decrypts** your Vault data to your device. In practice, that means two things:
+
+1. Logging in will always require your Master Password, because your Master Password is the source of the key needed to decrypt your Vault data. Additionally, because decryption is an operation that needs to be protected, this stage is where [any enabled Two-step Login methods]({% link _articles/two-step-login/setup-two-step-login.md %}) would be required.
+2. Logging in will always require you to be connected to the internet (or, if you're self-hosting, connected to the server), because you need access to the encrypted Vault in order to decrypt it.
+
+**Unlocking** can only be done when you're already logged in. In other words, only when your Vault data is already decrypted to your device. Because your Vault is already decrypted:
+
+1. You don't need the decryption key derived from your Master Password, so you're free to use other access methods, like [PIN codes]({% link _articles/account/unlock-with-pin.md %}) and [biometrics]({% link _articles/account/biometrics.md %}).
+2. You don't need to be connected to the internet (or, if you're self-hosting, connected to the server).
diff --git a/_articles/account/export-your-data.md b/_articles/account/export-your-data.md
index 934efc27..78fcd9cb 100644
--- a/_articles/account/export-your-data.md
+++ b/_articles/account/export-your-data.md
@@ -8,11 +8,11 @@ tags: [export, accounts, csv]
order: 06
---
-Bitwarden allows you to export your personal Vault data from any client application, or an Organization Vault from the Web Vault or CLI. Exports can be downloaded as plaintext `.json` or `.csv` files, or as a `.json` [Encrypted Export]({% link _articles/importing/encrypted-export.md %}).
+You can export your personal Vault data from any client application, or export an Organization Vault from the Web Vault or CLI. Exports can be downloaded as plaintext `.json` or `.csv` files, or as a `.json` [encrypted export]({% link _articles/importing/encrypted-export.md %}).
-Bitwarden recommends using `.json` for a more complete option for standard backup procedures as `.csv` exports will not export Cards or Identities. For information on the format of Bitwarden `.csv` and `.json` exports, see [Condition a Bitwarden .csv or .json]({% link _articles/importing/condition-bitwarden-import.md %}).
+We recommend using `.json` for a more complete export, as `.csv` files won't currently export Cards or Identities. For complete information on the format of Bitwarden `.csv` and `.json` files, see [Condition a Bitwarden .csv or .json]({% link _articles/importing/condition-bitwarden-import.md %}).
-Vault Exports **will not include** File Attachments or Items in the Trash.
+Vault Exports **will not include** [file attachments]({% link _articles/features/attachments.md %}) or Items in the Trash.
{% callout warning %}
Unless you're using an [Encrypted Export]({% link _articles/importing/encrypted-export.md %}), do not store or send the exported file over insecure channels, like email, and delete the file immediately after use.
@@ -20,74 +20,153 @@ Unless you're using an [Encrypted Export]({% link _articles/importing/encrypted-
## Export a Personal Vault
-Export your Personal Vault data from any client application:
+Export your personal Vault data from any client application:
-### From the Web Vault
+
+
+{% capture web_vault %}
+
+#### Export from the Web Vault
+
+To export your personal Vault data from the Web Vault:
1. Select **Tools** from the top navigation bar.
-3. Select **Export Vault** from the left-hand Tools menu.
-4. On the Export Vault page:
- - Select a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
- - Enter your **Master Password**.
-5. Select the **Export Vault** button to download your Vault Export. You will be prompted to specify a location for download.
+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)`).
+4. Enter your **Master Password** and select the **Export Vault** button.
-### From the Mobile App
+{% endcapture %}
+{{ web_vault | markdownify}}
+
+
+{% capture browser_extension %}
-1. Tap the **Settings** tab.
-2. Scroll down to the **Tools** section, and tap **Export Vault**.
-3. On the Export Vault page:
- - Select a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
- - Enter your **Master Password**.
-4. Select the **Export Vault** button to download your Vault Export. You will be prompted to specify a location for download.
+#### Export from a Browser Extension
-### From the Browser Extension
+To export your personal Vault data from a Browser Extension:
-1. Open the **Settings** tab.
-2. Scroll down to the **Tools** section, and select **Export Vault**.
-4. On the Export Vault page:
- - Select a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
- - Enter your **Master Password**.
-5. Select the **Export Vault** button to download your Vault Export. You will be prompted to specify a location for download.
+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)`).
+4. Enter your **Master Password** and select **Submit**.
-### From the Desktop App
+{% endcapture %}
+{{ browser_extension | markdownify}}
+
+
+{% capture desktop_info %}
-1. Navigate to **File** → **Export Vault**.
-2. In the Export Vault window:
- - Select a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
- - Enter your **Master Password**.
-3. Select the **Submit** button to download your Vault Export. You will be prompted to specify a location for download.
+#### Export from Desktop
-### From the CLI
+To export your personal Vault data from a Desktop app:
-Use the `bw export` command to export your Vault data. By default, `bw export` will create a `.csv` export in the current working directory.
+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)`).
+3. Enter your **Master Password** and select the {% icon fa-download %} **Download** button.
-You may pass the following options with the `bw export` command:
-- `--output ` to specify a saving location of your choice.
-- `--format ` to specify the file format as `csv` (*default*), `json`, or `encrypted_json`.
+{% endcapture %}
+{{ desktop_info | markdownify}}
+
+
+{% capture mobile_info %}
+
+#### Export from Mobile
+
+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)`).
+4. Enter your **Master Password** and tap the **Export Vault** button.
+
+{% endcapture %}
+{{ mobile_info | markdownify}}
+
+
+{% capture cli_info %}
+
+#### Export from the CLI
+
+To export your personal Vault from the CLI, use the `export` command. By default, `export` will export your Vault as a `.csv` and save the file to the working directory, however this behavior can be altered using options:
+
+```
+bw export my-master-password --output /users/me/documents/ --format json
+```
+
+For more detail, see our [CLI documentation]({% link _articles/miscellaneous/cli.md %}).
+
+{% endcapture %}
+{{ cli_info | markdownify}}
+
+
## Export an Organization Vault
-Admins and Owners may export their Organization Vault from the Web Vault or CLI:
+Organization [Admins and Owners]({% link _articles/organizations/user-types-access-control.md %}) can export their Organization Vault (i.e. all items [shared in Collections]({% link _articles/organizations/share-to-a-collection.md %})) from the Web Vault or CLI:
-### From the Web Vault
+
+
+{% capture org_web_vault %}
-1. Open your Organization and select the **Tools** tab.
+#### Export Org from the Web Vault
+
+To export your Organization Vault data from the Web Vault:
+
+1. Open your Organization and select the **Tools** tab:
{% image organizations/org-export.png Export Organization Vault %}
2. Select **Export Vault** from the left-hand Tools menu.
-4. On the Export Vault page:
- - Select a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
- - Enter your **Master Password**.
-5. Select the **Export Vault** button to download your Vault Export. You will be prompted to specify a location for download.
+4. On the Vault Export page, choose a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`).
+4. Enter your **Master Password** and select the **Export Vault** button.
-### From the CLI
+{% endcapture %}
+{{ org_web_vault | markdownify}}
+
+
+{% capture org_cli_info %}
-From the Bitwarden CLI application, use the `bw export` command with the `--organizationid ` option to export your Organization Vault.
+#### Export Org from the CLI
-{% callout info %}
-Retrieve your `` value using the command: `bw list organizations`.
+To export your Organization Vault from the CLI, use the `export` command with the `--organizationid` option.
+
+By default, `export` will export your Vault as a `.csv` and save the file to the working directory, however this behavior can be altered using options:
+
+```
+bw export my-master-password --organizationid 7063feab-4b10-472e-b64c-785e2b870b92 --output /users/me/documents/ --format json
+```
+
+{% callout success %}
+If you don't know your `organizationid` value off-hand, you can access it at the command-line using `bw list organizations`.
{% endcallout %}
-By default, `bw export` will create a `.csv` export in the current working directory, however you may pass the following options with the command:
-- `--output ` to specify a saving location of your choice.
-- `--format ` to specify the file format as `csv` (*default*), `json`, or `encrypted_json`.
+For more detail, see our [CLI documentation]({% link _articles/miscellaneous/cli.md %}).
+
+{% endcapture %}
+{{ org_cli_info | markdownify}}
+
+
diff --git a/_articles/account/forgot-master-password.md b/_articles/account/forgot-master-password.md
index b3c247ba..f56571da 100644
--- a/_articles/account/forgot-master-password.md
+++ b/_articles/account/forgot-master-password.md
@@ -8,22 +8,22 @@ tags: [master password, account]
order: 02
---
-As described in the [Your Master Password]({% link _articles/account/master-password.md %}) 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 the team to recover the account or the data therein. You will need to delete your account and start a new one.
+As described in the [Your Master Password]({% link _articles/account/master-password.md %}) 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 the team to recover the account or the data therein. You will need to delete your account and start a new one.
{% callout success %}
+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.
{% endcallout %}
-Complete the following steps to delete your account:
-
-{% callout warning%}
-This action is permanent and cannot be undone.
-{% endcallout %}
+If you weren't able to gain access to your Vault, complete the following steps to delete your account:
1. Navigate to [vault.bitwarden.com/#/recover-delete](https://vault.bitwarden.com/#/recover-delete).
-2. Enter the **Email Address** associated with your account.
+2. Enter the **Email Address** associated with your account and select **Submit**.
3. In your email inbox, open the email and verify that you want to delete this Bitwarden account.
Once deleted, you're free to create a new Bitwarden account with that email address. If you delete a Bitwarden account that has a Premium subscription associated with it, [Contact Us](https://bitwarden.com/contact/){:target="\_blank"} and we'll reapply your existing subscription to the new account.
diff --git a/_articles/account/install-safari-app-extension.md b/_articles/account/install-safari-app-extension.md
index f668e30f..3ce8794a 100644
--- a/_articles/account/install-safari-app-extension.md
+++ b/_articles/account/install-safari-app-extension.md
@@ -1,27 +1,23 @@
---
layout: article
-title: Bitwarden Safari App Extension
+title: Safari Web Extension
categories: [miscellaneous]
featured: false
popular: false
tags: [browser, safari]
---
-## Get the Extension
+Bitwarden's Safari Web Extension is a port of the prior *App Extension* designed for use with [Safari 14](https://developer.apple.com/documentation/safariservices/safari_web_extensions/converting_a_safari_app_extension_to_a_safari_web_extension?language=objc){:target="\_blank"}. The Safari Web Extension is packaged with the Bitwarden Desktop App available on the App Store.
-Bitwarden's Safari App Extension is packaged with the Bitwarden Desktop App available on the App Store, as recommended by from Apple regarding Safari App Extensions.
-
-{% callout warning %}
-Due to changes by Apple, Safari now limits Safari App Extension use to only those obtained through Mac App Store downloads. As of Q1 2021, users will not be able to use a Bitwarden Safari App Extension obtained through a `.dmg` installation from [bitwarden.com/download](https://bitwarden.com/download){:target="\_blank"} or any other non-App Store source.
-
-To read community conversation on the topic, refer to the following Apple Developer Forum threads ([Thread #1](https://developer.apple.com/forums/thread/659029){:target="\_blank"}, [Thread #2](https://developer.apple.com/forums/thread/667859){:target="\_blank"}).
+{% callout info %}
+Due to changes by Apple, Safari limits Web Extension use to **only those obtained through Mac App Store downloads**. As of the [2021-03-11 Release]({% link _articles/getting-started/releasenotes.md %}), users will not be able to use a Bitwarden Safari Extension obtained through a `.dmg` installation from [bitwarden.com/download](https://bitwarden.com/download){:target="\_blank"} or any other non-App Store source.
{% endcallout %}
-For developer detail on Safari App Extensions, click [here](https://developer.apple.com/documentation/safariservices/safari_app_extensions).
+The Safari Web Extension has full feature parity to the prior App Extension. For developer detail on the difference between Safari Web Extensions and App Extensions, click [here](https://developer.apple.com/documentation/safariservices/safari_web_extensions/converting_a_safari_app_extension_to_a_safari_web_extension?language=objc).
## Enable the Extension
-Before enabling the Safari App Extension, run the Desktop Application at least once. In Safari:
+Before enabling the Safari Web Extension, run the Desktop Application at least once. In Safari:
1. Open the **Preferences** window.
2. Navigate to the **Extensions** page.
diff --git a/_articles/account/managing-items.md b/_articles/account/managing-items.md
index f42671a4..c9fa7082 100644
--- a/_articles/account/managing-items.md
+++ b/_articles/account/managing-items.md
@@ -8,15 +8,14 @@ tags: [account, items, import, delete, trash, clone]
order: 03
---
-Bitwarden can store 4 types of items in your Vault:
+Effectively managing the items in your Vault is key to making sure that you secure and have seamless access to your information, and can safely share information with friends, family, teams, and colleagues.
+Bitwarden can store 4 types of items in your Vault:
- [Logins](#logins)
- [Cards](#cards)
- [Identities](#identities)
- [Secure Notes](#secure-notes)
-Effectively managing the items in your Vault is key to making sure that you secure and have seamless access to your information, and can safely share information with friends, family, teams, and colleagues.
-
## Add a Vault Item
You can add items to your Vault from the Bitwarden [Web Vault](https://vault.bitwarden.com){:target="\_blank"} or any client application. Look for a {% icon fa-plus %} **Add** icon to add an item to your Vault. There are 4 types of items you can add to your Vault.
diff --git a/_articles/account/master-password.md b/_articles/account/master-password.md
index 44dfaf74..de44d6d5 100644
--- a/_articles/account/master-password.md
+++ b/_articles/account/master-password.md
@@ -10,7 +10,7 @@ redirect_from:
- /article/change-your-master-password/
---
-## About Your Master Password
+## About your Master Password
Your Master Password is the primary method for accessing your Vault. It's critically important that your Master Password is:
@@ -31,35 +31,40 @@ If you're worried about forgetting your Master Password, the team at Bitwarden h
{% endcallout %}
-## Changing Your Master Password
+## Change your Master Password
-You can change your Master Password at any time from the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}, **provided you know you current Master Password** (if you don't, see [I Forgot My Master Password](#i-forgot-my-master-password)).
+Provided you **know your current Master Password**, change your Master Password at any time from the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}:
-1. Log in to your [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.
-2. Select the **Settings** tab from the top navigation.
-3. On the **My Account** page, scroll down and locate the **Change Master Password** section.
-4. Enter your **Current Master Password**.
-5. Enter and Confirm your **New Master Password**.
-6. Select the **Change Master Password** button.
-
-Completing these steps will log you out of your current session, requiring you to log back in with you new Master Password. Currently logged-in client applications (Mobile Apps, Browser Extensions, etc.) may remain active for up to an hour, however they will eventually also require you to log back in with your new Master Password.
-
-{% callout warning %}
-Opting to **rotate account's encryption key** is a potentially dangerous operation. Read the article on [Account Encryption Keys]({% link _articles/account/account-encryption-key.md %}) before doing so to fully understand the ramifications and required follow-up procedures.
+{% callout success %}
+If you don't know your Master Password, see [I Forgot my Master Password]({% link _articles/account/forgot-master-password.md %}).
{% endcallout %}
-## I Forgot My Master Password
+1. In your Web Vault, Select the **Settings** tab from the top navigation.
+2. On the **My Account** page, scroll down to the **Change Master Password** section.
+3. Enter your **Current Master Password**.
+4. Enter and Confirm your **New Master Password**.
-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.
+ {% callout warning %}Don't check the **rotate account's encryption key** box unless you fully understand the ramifications and required follow-up procedures. Learn more [here]({% link _articles/account/account-encryption-key.md %}).{% endcallout %}
+5. Select the **Change Master Password** button.
+
+Changing your Master Password will log you out of your current Web Vault session, requiring you to log back in with your new Master Password.
+
+Other logged-in client applications (Mobile Apps, Browser Extensions, etc.) may remain active for up to an hour, however they will eventually also require you to log back in with your new Master Password.
+
+## I forgot my Master Password
+
+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.
{% 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.
{% endcallout %}
-Complete the following steps to delete your account:
+To delete your account:
1. Navigate to [vault.bitwarden.com/#/recover-delete](https://vault.bitwarden.com/#/recover-delete).
-2. Enter the **Email Address** associated with your account.
+2. Enter the **Email Address** associated with your account and select **Submit**.
3. In your email inbox, open the email and verify that you want to delete this Bitwarden account.
Once deleted, you're free to create a new Bitwarden account with that email address. If you delete a Bitwarden account that has a Premium subscription associated with it, [Contact Us](https://bitwarden.com/contact/){:target="\_blank"} and we'll reapply your existing subscription to the new account.
diff --git a/_articles/account/unlock-with-pin.md b/_articles/account/unlock-with-pin.md
index a323b513..fe877525 100644
--- a/_articles/account/unlock-with-pin.md
+++ b/_articles/account/unlock-with-pin.md
@@ -8,50 +8,90 @@ tags: [unlock, pin]
order: 10
---
-Bitwarden can be configured to accept a Personal Identification Number (PIN) as a method to unlock your Vault. PINs can **only be used to unlock** your Vault, you will still be required to log in to your Vault with your Master Password and any enabled [Two-step Login Method]({% link _articles/two-step-login/setup-two-step-login.md %}).
+Bitwarden can be configured to accept a Personal Identification Number (PIN) as a method to unlock your Vault.
+
+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]({% link _articles/two-step-login/setup-two-step-login.md %}) 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).
## Enable Unlock with PIN
-Unlock with PIN can be enabled for Bitwarden Browser Extensions, Mobile Apps, and Desktop Apps:
+Unlock with PIN can be enabled for Bitwarden Browser Extensions, Desktop, and Mobile:
-### Enable for Browser Extensions
-Complete the following steps to enable Unlock with PIN in your Browser Extension:
+
+
+{% capture browser_extension %}
+
+#### Enable for Browser Extension
+
+To enable Unlock with PIN for your Browser Extension:
1. Open the {% icon fa-cogs %} **Settings** tab.
-2. In the Security section, check the **Unlock with PIN** checkbox.
-3. Enter the desired PIN code in the input box. PIN codes can be any combination of characters (a-z, 0-9, $, #, etc.).
+2. Scroll down to the Security section and check the **Unlock with PIN** checkbox.
+3. Enter the desired PIN code in the input box. Your PIN can be any combination of characters (a-z, 0-9, $, #, etc.).
- {% callout success %}**Optional:** The pre-checked option **Lock with master password on browser restart** will require you to enter your Master Password instead of a PIN when your browser restarts. If you want to be able to unlock with a PIN when your browser restarts, uncheck this option.{% endcallout %}
+ {% callout success %}The pre-checked option **Lock with master password on browser restart** will require you to enter your Master Password instead of the PIN when your browser restarts. If you want the ability to unlock with a PIN even when the browser restarts, uncheck the option.{% endcallout %}
-Regardless of whether you use the **Lock with master password on browser restart** option, your PIN settings will remain until you **log out** of Bitwarden.
+Your Unlock with PIN settings will persist **until you log out**. When you log out of your Browser Extension, you'll need to re-enable Unlock with PIN.
+{% endcapture %}
+{{ browser_extension | markdownify}}
+
+
+{% capture desktop_info %}
-Once enabled, you'll be prompted to **Verify PIN** to unlock the Browser Extension.
+#### Enable for Desktop
-### Enable for Desktop Apps
-
-Complete the following steps to enable Unlock with PIN in your Browser Extension:
+To enable Unlock with PIN for your Desktop app:
1. Open your **Settings** (on Windows, **File** → **Settings**) (on macOS, **Bitwarden** → **Preferences**).
-2. In the Security section, check the **Unlock with PIN** checkbox.
-3. Enter the desired PIN code in the input box. PIN codes can be any combination of characters (a-z, 0-9, $, #, etc.).
+2. Scroll down to the Security section and check the **Unlock with PIN** checkbox.
+3. Enter the desired PIN code in the input box. Your PIN can be any combination of characters (a-z, 0-9, $, #, etc.).
- {% callout success %}**Optional:** The pre-checked option **Lock with master password on restart** will require you to enter your Master Password instead of a PIN when your app restarts. If you want to be able to unlock with a PIN when your app restarts, uncheck this option.{% endcallout %}
+ {% callout success %}The pre-checked option **Lock with master password on restart** will require you to enter your Master Password instea of the PIN when the app restarts. If you want the ability to unlock with a PIN when the app restarts, uncheck this option.{% endcallout %}
-Regardless of whether you use the **Lock with master password on restart** option, your PIN settings will remain until you **log out** of Bitwarden.
+Your Unlock with PIN settings will persist **until you log out**. When you log out of your Desktop App, you'll need to re-enable Unlock with PIN.
+{% endcapture %}
+{{ desktop_info | markdownify}}
+
+
+{% capture mobile_info %}
-Once enabled, you'll be prompted to **Verify PIN** to unlock the Desktop App.
+#### Enable for Mobile
-### Enable for Mobile Apps
-
-Complete the following steps to enable Unlock with PIN in your Browser Extension:
+To enable Unlock with PIN for your Mobile app:
1. Open the {% icon fa-cogs %} **Settings** tab.
-2. In the Security section, tap the **Unlock with PIN code** option.
-3. Enter the desired PIN code in the input box and tap **Submit**. PIN codes can be any combination of characters (a-z, 0-9, $, #, etc.).
+2. Scroll down to the Security section and tap the **Unlock with PIN Code** option.
+3. Enter the the desired PIN code in the input box. Your PIN can be any combination of characters (a-z, 0-9, $, #, etc.).
- {% callout success %}A dialog box will appear asking `Do you want to require unlocking with your master password when the application is restarted?` Tap **Yes** to require you to enter your Master Password instead of a PIN after your apps restarts. Tap **No** to be able to unlock with a PIN after your app restarts.{% endcallout %}
+ {% callout success %}A dialog box will appear asking whether you want to require unlocking with your master password when the application is restarted. Tap **Yes** to require your Master Password instead of PIN when the app restarts. Tap **No** for the ability to unlock with the PIN when the app restarts.{% endcallout %}
-Regardless of whether you use the **Lock with master password on app restart** option, your PIN settings will remain until you **log out** of Bitwarden.
+Your Unlock with PIN settings will persist **until you log out**. When you log out of your Mobile App, you'll need to re-enable Unlock with PIN.
+{% endcapture %}
+{{ mobile_info | markdownify}}
+
+
-Once enabled, you'll be prompted to **Verify PIN** to unlock the Mobile App.
+## Understanding Unlock vs. Log In
+
+In order to understand why unlocking and logging in aren't the same, it's important to remember that Bitwarden [never stores unencrypted data]({% link _articles/security/vault-data.md %}) on its servers. **When your Vault is neither unlocked nor logged in**, your Vault data only exists on the server in its [encrypted form]({% link _articles/security/what-encryption-is-used.md %}).
+
+**Logging in** to Bitwarden **decrypts** your Vault data to your device. In practice, that means two things:
+
+1. Logging in will always require your Master Password, because your Master Password is the source of the key needed to decrypt your Vault data. Additionally, because decryption is an operation that needs to be protected, this stage is where [any enabled Two-step Login methods]({% link _articles/two-step-login/setup-two-step-login.md %}) would be required.
+2. Logging in will always require you to be connected to the internet (or, if you're self-hosting, connected to the server), because you need access to the encrypted Vault in order to decrypt it.
+
+**Unlocking** can only be done when you're already logged in. In other words, only when your Vault data is already decrypted to your device. Because your Vault is already decrypted:
+
+1. You don't need the decryption key derived from your Master Password, so you're free to use other access methods, like [PIN codes]({% link _articles/account/unlock-with-pin.md %}) and [biometrics]({% link _articles/account/biometrics.md %}).
+2. You don't need to be connected to the internet (or, if you're self-hosting, connected to the server).
diff --git a/_articles/directory-connector/directory-sync-desktop.md b/_articles/directory-connector/directory-sync-desktop.md
index 5d532722..6be5c150 100644
--- a/_articles/directory-connector/directory-sync-desktop.md
+++ b/_articles/directory-connector/directory-sync-desktop.md
@@ -26,7 +26,7 @@ Directory Connector configuration will vary based on the directory type in use.
- [Sync with OneLogin]({% link _articles/directory-connector/onelogin-directory.md %})
{% callout info %}
-If you're using a self-hosted version of Bitwarden, you must change the Server URL used by the Directory Connector application:
+**If you're using a self-hosted version of Bitwarden**, you must change the Server URL used by the Directory Connector application:
1. Log out of Directory Connector.
2. On the Login screen, select the **Settings** button.
diff --git a/_articles/faqs/import-faqs.md b/_articles/faqs/import-faqs.md
index 82f50db2..a1883694 100644
--- a/_articles/faqs/import-faqs.md
+++ b/_articles/faqs/import-faqs.md
@@ -37,7 +37,7 @@ Once exported from iCloud, Mac Keychain, or Safari, see [Import Data to your Vau
**A:** File Attachments must be manually migrated to your Bitwarden Vault, as they are currently not included in bulk import operations.
-Please note that storage of File Attachments is available only for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
+Please note that storage of File Attachments is available only for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
### Q: Why did importing create duplicate Vault items?
@@ -47,3 +47,64 @@ Please note that storage of File Attachments is available only for Premium users
- Purging your Vault before an import operation.
Personal Vaults can be purged from the **Settings** → **My Account** page. Organization Vaults can be purged from the **Organization Settings** → **My Organization** page.
+
+### Q: What file formats does Bitwarden support for import?
+
+ **A:** The following formats are supported out-of-the-box:
+
+{% callout info %}
+If your format is not listed below, manually [condition a Bitwarden .csv or .json]({% link _articles/importing/condition-bitwarden-import.md %}).
+{% endcallout %}
+
+ - [1Password (1pif)]({% link _articles/importing/import-from-1password.md %})
+ - [1Password 6 & 7 Windows (.sv)]({% link _articles/importing/import-from-1password.md %})
+ - [1Password 6 & 7 Mac (csv)]({% link _articles/importing/import-from-1password.md %})
+ - Ascendo DataVault (csv)
+ - Avast Passwords (csv)
+ - Avira (json)
+ - BlackBerry Password Keeper (csv)
+ - Blur (csv)
+ - [Brave (csv)]({% link _articles/importing/import-from-chrome.md %})
+ - [Chrome (csv)]({% link _articles/importing/import-from-chrome.md %})
+ - Clipperz (html)
+ - Codebook (csv)
+ - Dashlane (json)
+ - Encryptr (csv)
+ - Enpass (csv)
+ - Enpass (json)
+ - [Firefox (csv)]({% link _articles/importing/import-from-firefox.md %})
+ - F-Secure KEY (fsk)
+ - GNOME Passwords and Keys/Seahorse (json)
+ - Kaspersky Password Manager (txt)
+ - KeePass 2 (xml)
+ - KeePassX (csv)
+ - Keeper (csv)
+ - [LastPass (csv)]({% link _articles/importing/import-from-lastpass.md %})
+ - LogMeOnce (csv)
+ - Meldium (csv)
+ - mSecure (csv)
+ - Myki (csv)
+ - [Microsoft Edge (Chromium) (csv)]({% link _articles/importing/import-from-chrome.md %})
+ - [Opera (csv)]({% link _articles/importing/import-from-chrome.md %})
+ - Padlock (csv)
+ - Passbolt (csv)
+ - PassKeep (csv)
+ - Passman (json)
+ - Passpack (csv)
+ - Password Agent (csv)
+ - Password Boss (json)
+ - Password Dragon (xml)
+ - Password Safe (xml)
+ - PasswordWallet (txt)
+ - RememBear (csv)
+ - RoboForm (csv)
+ - SafeInCloud (xml)
+ - SaferPass (csv)
+ - SecureSafe (csv)
+ - SplashID (csv)
+ - Sticky Password (xml)
+ - True Key (csv)
+ - Universal Password Manager (csv)
+ - [Vivaldi (csv)]({% link _articles/importing/import-from-chrome.md %})
+ - Yoti (csv)
+ - Zoho Vault (csv)
diff --git a/_articles/faqs/send-faqs.md b/_articles/faqs/send-faqs.md
new file mode 100644
index 00000000..d8703ab1
--- /dev/null
+++ b/_articles/faqs/send-faqs.md
@@ -0,0 +1,39 @@
+---
+layout: article
+title: Send FAQs
+categories: [send]
+featured: true
+popular: false
+tags: []
+order: 08
+---
+
+### Q: Why can't I create a file Send?
+
+**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).
+
+### 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:
+
+{% image /send/send-ff-popout.png The popout icon %}
+
+### Q: Why are Sends missing from my Send view?
+
+**A:** By design, Sends are ephemeral. Each created Send has a **maximum lifespan of 30 days**, configurable when you [create a Send]({% link _articles/send/create-send.md %}) or at any time by editing it. When a Send's [Deletion Date]({{site.baseurl}}/article/send-lifespan/#deletion-date) is reached, it will be purged from Bitwarden systems and inaccessible to both the Sender and any recipients.
+
+### Q: What do the icons next to my Sends indicate?
+
+**A:** Icons in the Send view are intended to help you understand the configured [lifespan]({% link _articles/send/send-lifespan.md %}) and [privacy]({% link _articles/send/send-privacy.md %}) options:
+
+|Icon|Meaning|
+|----|-------|
+|{% icon fa-key %}|This Send is [protected by a password]({{site.baseurl}}/article/send-privacy/#send-passwords).|
+|{% icon fa-warning %}|This Send has been [manually disabled]({{site.baseurl}}/article/send-lifespan/#manually-disable-or-delete).|
+|{% icon fa-clock-o %}|This Send has reached it's specified [Expiration Date]({{site.baseurl}}/article/send-lifespan/#expiration-date).|
+|{% icon fa-ban %}|This Send has reached it's specified [Maximum Access Count]({{site.baseurl}}/article/send-lifespan/#maximum-access-count).|
+|{% icon fa-trash %}|This Send has reached it's specified [Deletion Date]({{site.baseurl}}/article/send-lifespan/#deletion-date) and is **Pending Deletion**.|
+
+### Q: Can I prevent members of my Organization from using Send?
+
+**A:** Enterprise Organizations can prevent their members from creating or editing Sends using the [Disable Send Policy]({{site.baseurl}}/article/policies/#disable-send).
diff --git a/_articles/features/attachments.md b/_articles/features/attachments.md
index d138bf28..4eed2e8e 100644
--- a/_articles/features/attachments.md
+++ b/_articles/features/attachments.md
@@ -8,7 +8,7 @@ tags: [attachments, storage, files]
order: 13
---
-Files can be attached to Vault items from any Bitwarden client application. An individual file attachment must be 100MB or smaller. By default, 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 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.
{% callout info %}
File Attachments are available for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
@@ -16,34 +16,107 @@ File Attachments are available for Premium users, including members of Paid Orga
## Attach a File
-Complete the following steps to attach a file to a Vault item:
+To attach a file to a Vault item from a Bitwarden application:
-### From the Web Vault
+
+
+{% capture be_sync %}
+### Attach from Web Vault
+
+Complete the following steps to attach a file to a Vault item from the Web Vault:
+
+1. Hover-over the Vault item you'd like to attach a file to, and select the {% icon fa-cog %} **Gear** icon.
+2. Select {% icon fa-paperclip %} **Attachments** from the dropdown.
3. In the Attachments dialog box, **Browse...** for your file.
4. Select the **Save** button to finish attaching a file.
-Once an item has files attached, selecting **Attachments** from the {% icon fa-cog %} **Gear** dropdown will also display a list of files attached to that Vault item.
+Once a Vault item has a file attached to it, selecting {% icon fa-paperclip %} **Attachments** from the {% icon fa-cog %} **Gear** dropdown will also display a list of attached files.
-### From Browser Extensions and Desktop Apps
+{% endcapture %}
+{{ be_sync | markdownify }}
+
+
+{% capture be_sync %}
+### Attach from a Browser Extension
+
+Complete the following steps to attach a file to a Vault item from a Bitwarden Browser Extension:
1. Open the item you'd like to attach a file to, and select the **Edit** button.
-2. Select **Attachments**.
+2. Select {% icon fa-paperclip %} **Attachments**.
3. On the Attachments page/dialog, **Browse...** for your file.
4. Select the **Save** button to finish attaching a file.
-Once an item has files attached, selecting **Attachments** from the **Edit** menu will also display a list of files attached to that Vault item.
+Once a Vault item has a file attached to it, selecting {% icon fa-paperclip %} **Attachments** from will also display a list of attached files.
-### From Mobile Apps
+{% endcapture %}
+{{ be_sync | markdownify }}
+
+
+{% capture mob_sync%}
+### Attach from Mobile
+
+Complete the following steps to attach a file to a Vault item from a Bitwarden Mobile App:
1. Open the item you'd like to attach a file to, and select the {% icon fa-ellipsis-v%} **Menu** button.
-2. Select **Attachments**.
+2. Select {% icon fa-paperclip %} **Attachments**.
3. On the Attachments page, select the **Choose File** button and browse for your file.
4. Select the **Save** button to finish attaching a file.
-Once an item has files attached, selecting **Attachments** from the {% icon fa-ellipsis-v%} **Menu** will also display a list of files attached to that Vault item.
+Once a Vault item has a file attached to it, selecting {% icon fa-paperclip %} **Attachments** from the {% icon fa-ellipsis-v%} **Menu** dropdown will also display a list of attached files.
+
+{% endcapture %}
+{{ mob_sync | markdownify }}
+
+
+{% capture desk_sync%}
+### Attach from Desktop
+
+Complete the following steps to attach a file to a Vault item from a Bitwarden Desktop App:
+
+1. Open the item you'd like to attach a file to, and select the **Edit** button.
+2. Select {% icon fa-paperclip %} **Attachments**.
+3. On the Attachments page/dialog, **Browse...** for your file.
+4. Select the **Save** button to finish attaching a file.
+
+Once a Vault item has a file attached to it, selecting {% icon fa-paperclip %} **Attachments** from will also display a list of attached files.
+
+{% endcapture %}
+{{ desk_sync | markdownify }}
+
+
+{% capture cli_sync%}
+### Attach from the CLI
+
+Use `bw create attachment` to attach a file to an existing Vault item, for exaple:
+
+```
+bw create attachment --file /path/to/myfile.ext --itemid
+```
+
+For more information, refer to our [CLI documentation]({% link _articles/miscellaneous/cli.md %}).
+
+{% endcapture %}
+{{ cli_sync | markdownify }}
+
+
## View an Attachment
diff --git a/_articles/getting-started/create-bitwarden-account.md b/_articles/getting-started/create-bitwarden-account.md
index 638290a0..2faa1a70 100644
--- a/_articles/getting-started/create-bitwarden-account.md
+++ b/_articles/getting-started/create-bitwarden-account.md
@@ -15,19 +15,19 @@ We're thrilled to be a part of your secure password management journey. To creat
## Create Account Screen
-Once you've clicked the link, the following screen will appear:
+Once you've clicked the link, the following screen will appear. Fill out all fields (*Master Password Hint* is optional) and click **Submit** when you're finished.
{% image /getting-started/create-account-screen-overlay.png Create Account screen%}
-Fill out all fields (*Master Password Hint* is optional) and click **Submit** when you're finished.
-
## Verify Your Email
Once you've created your account, prompt Bitwarden to send you a verification email by logging in to your [Web Vault](https://vault.bitwarden.com/) and selecting the **Verify Email** button located at near the top right.
## Congratulations!
-For help getting going with Bitwarden, we recommend:
-- [Getting Started with the Browser Extension]({% link _articles/getting-started/getting-started-browserext.md %})
-- [Getting Started with the Mobile Apps]({% link _articles/getting-started/getting-started-mobile.md %})
-- [Bitwarden 101 Video Series - Getting Started](https://bitwarden.com/help/article/getting-started-videos/)
+We recommend using any one of these resources to learn the ropes:
+- [Get Started with the Web Vault]({% link _articles/getting-started/getting-started-webvault.md %})
+- [Get Started with Browser Extensions]({% link _articles/getting-started/getting-started-browserext.md %})
+- [Get Started with the Mobile Apps]({% link _articles/getting-started/getting-started-mobile.md %})
+- [Get Started with Desktop Apps]({% link _articles/getting-started/getting-started-desktop.md %})
+- [Bitwarden 101 Video Series on Getting Started](https://bitwarden.com/help/article/getting-started-videos/)
diff --git a/_articles/getting-started/getting-started-webvault.md b/_articles/getting-started/getting-started-webvault.md
index 9d0b8423..8a5c83d4 100644
--- a/_articles/getting-started/getting-started-webvault.md
+++ b/_articles/getting-started/getting-started-webvault.md
@@ -21,7 +21,7 @@ When your first log in to your Web Vault, you'll land on the **My Vault** view.
In the above screenshot, your **My Vault** view is showing {% icon fa-th %} **All Items**. The **Filters** column on the left-hand side of the Vault can help you use **Favorites** and **Folders** to organize your Vault so that you can quickly find whatever you're looking for.
-Let's start by setting up a new Folder and adding a new Login Vault item to it:
+Let's start by setting up a new Folder and adding a new Login item to it:
#### Create a Folder
@@ -54,7 +54,7 @@ To add a new Login item:
Now that a new Login item is saved in your Vault, you can beef up its security by replacing the existing password with a stronger one:
-1. In your Bitwarden Vault open, click on the item you want to secure to view its information.
+1. In your Bitwarden Vault, click on the item you want to secure to view its information.
2. In a new tab or window, open the corresponding website and login to your account.
{% callout success %}If you entered something in the **URI 1** field, click the {% icon fa-share %} **Launch** icon to open it directly from your Vault!{% endcallout %}
@@ -66,7 +66,7 @@ Now that a new Login item is saved in your Vault, you can beef up its security b
You might have the old password memorized, but it's a good idea to get in the habit of copying and pasting your password since this is primarily how you'll be logging in to websites once your password is replaced with a stronger one.
5. Tab back over to your Bitwarden Vault and click the {% icon fa-refresh %} **Generate** icon next to the **Password** field. You'll be asked whether you want to overwrite the current password, so click **Yes** to proceed.
- This will replace your **Password** value with a randomly generated strong password. Moving from a password like `Fido1234` to `X@Ln@x9J@&u@5n##B` can stop would-be hacker in their tracks.
+ This will replace your **Password** value with a randomly generated strong password. Moving from a password like `Fido1234` to `X@Ln@x9J@&u@5n##B` can stop a would-be hacker in their tracks.
6. Copy your new password with the same {% icon fa-copy %} **Copy** icon you used earlier, and hit the **Save** button.
{% callout success %}Don't worry about overwriting your existing password! If something goes wrong, Bitwarden maintains a **Password History** for every Login item:
+
+{% capture web_vault %}
-For help downloading an Encrypted Export from any other client application, see [Export Vault Data]({% link _articles/account/export-your-data.md %}).
+#### Export from the Web Vault
+
+To create an encrypted export of 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 `.json (Encrypted)` for the **File Format**.
+4. Enter your **Master Password** and select the **Export Vault** button.
+
+{% endcapture %}
+{{ web_vault | markdownify}}
+
+
+{% capture browser_extension %}
+
+#### Export from a Browser Extension
+
+To create an encrypted export of 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 `.json (Encrypted)` for the **File Format**.
+4. Enter your **Master Password** and select **Submit**.
+
+{% endcapture %}
+{{ browser_extension | markdownify}}
+
+
+{% capture desktop_info %}
+
+#### Export from Desktop
+
+To create an encrypted export of 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 `.json (Encrypted)` for the **File Format**.
+3. Enter your **Master Password** and select the {% icon fa-download %} **Download** button.
+
+{% endcapture %}
+{{ desktop_info | markdownify}}
+
+
+{% capture mobile_info %}
+
+#### Export from Mobile
+
+To create an encrypted export of 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 `.json (Encrypted)` for the **File Format**.
+4. Enter your **Master Password** and tap the **Export Vault** button.
+
+{% endcapture %}
+{{ mobile_info | markdownify}}
+
+
+{% capture cli_info %}
+
+#### Export from the CLI
+
+To create an encrypted export of your personal Vault data from the CLI, use the `export` command with the specified option `--format json_encrypted`, for example:
+
+```
+bw export my-master-password --output /users/me/documents/ --format json_encrypted
+```
+
+For more detail, see our [CLI documentation]({% link _articles/miscellaneous/cli.md %}).
+
+{% endcapture %}
+{{ cli_info | markdownify}}
+
+
## Import an Encrypted Export
-Importing an Encrypted Export following the same procedure as importing a plaintext `.csv` or `.json` file:
+Importing an Encrypted Export follows the [normal import procedure]({% link _articles/importing/import-data.md %}), which can **only be done from the** [**Web Vault**](https://vault.bitwarden.com){:target="\_blank"}:
-1. In the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}, select **Tools** from the top navigation bar.
+1. In the Web Vault, select **Tools** from the top navigation bar.
2. Select **Import Data** from the left-hand Tools menu.
-3. Select **Bitwarden (json)** as the format of your file to import.
+3. From the format dropdown, choose **Bitwarden (json)**.
- {% callout success %}There is no import option specifically for Encrypted Exports. A handler will determine that the `.json` file is encrypted and decrypt using your account encryption key.{% endcallout %}
-5. Select the **Browse** button and add your file.
+ {% callout success %}There is no import option specifically for Encrypted Exports. A handler will determine that the `.json` file is encrypted and attempt to decrypt the file using your [account's encryption key]({% link _articles/account/account-encryption-key.md %}).{% endcallout %}
+5. Select the **Choose File** button and add the file to import.
+
+ {% callout warning %}Import to Bitwarden can't check whether items in the file to import are duplicative of items in your Vault. This means that **importing multiple files will create duplicative** Vault items if an item is already in the Vault and in the file to import.{% endcallout %}
6. Select the **Import Data** button to complete your import.
-
-{% callout warning %}
-Importing data multiple times will create duplicates.
-{% endcallout %}
diff --git a/_articles/importing/import-data.md b/_articles/importing/import-data.md
index 45157b3d..24c933e1 100644
--- a/_articles/importing/import-data.md
+++ b/_articles/importing/import-data.md
@@ -8,120 +8,52 @@ tags: [import]
order: 01
---
-Bitwarden provides a data import tool for easy migration from any password management solution to your personal Vault or Organization Vault (see [Import Data to an Organization]({% link _articles/organizations/import-to-org.md %})).
+Bitwarden provides a data import tool for easy migration from any password management solution to your personal Vault or Organization Vault. You can also use the data import tool to import from one Bitwarden Vault to another, or to import a Bitwarden [Encrypted Export]({% link _articles/importing/encrypted-export.md %}).
-You can also use the data import tool to import from one Bitwarden Vault to another, or to import a backup [Encrypted Export]({% link _articles/importing/encrypted-export.md %}).
-
-Bitwarden supports a large array of formats for import, including those used by the most popular password management solutions:
+For a full list of supported import formats, see [What file formats does Bitwarden support for import?]({{site.baseurl}}/article/send-faqs/#q-what-file-formats-does-bitwarden-support-for-import), or use one of these articles for importing from the most popular solutions:
- [Import from LastPass]({% link _articles/importing/import-from-lastpass.md %})
- [Import from 1Password]({% link _articles/importing/import-from-1password.md %})
- [Import from Firefox]({% link _articles/importing/import-from-firefox.md %})
- [Import from Google Chrome]({% link _articles/importing/import-from-chrome.md %})
-For a full list of supported formats, see [Supported Formats](#supported-formats).
-
## Import to your Personal Vault
-To import your data into a personal Vault:
+Importing data to Bitwarden **can only be done from the** [**Web Vault**](https://vault.bitwarden.com){:target="\_blank"}.
-1. Log in to the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}. Not already signed up? [Select a Bitwarden plan to get started.](https://bitwarden.com/pricing/business/)
-2. Select **Tools** from the top navigation bar.
-3. Select **Import Data** from the left Tools menu.
-4. Select the format of your file to import from the dropdown menu.
+{% callout success %}
+**Not already signed up?** Choose from one of [Bitwarden's plans](https://bitwarden.com/pricing/business/){:target="\_blank"} and get started today:
- {% callout success%}If you're importing an [Encrypted Export]({% link _articles/importing/encrypted-export.md %}), select `.json` as you would if it were plaintext. A handler will determine that the file is encrypted and decrypt using your [account encryption key](https://bitwarden.com/help/article//change-your-master-password/#rotating-your-accounts-encryption-key).{% endcallout %}
-5. Select the **Browse** button and add your file.
-6. Select the **Import Data** button to complete your import.
-
-{% callout warning %}
-Importing data multiple times will create duplicates.
+