Pre release edits (#317)

* "Unlock with Biometrics" pre-release cleanup

* Export pre-release cleanup

* edits

* add image

* biometrics images

_articles/account/biometrics.md

@@ -1,102 +1,60 @@
 ---
 layout: article
-title: Unlocking with biometrics
+title: Unlock with Biometrics
 categories: [account-management]
 featured: false
 popular: false
 tags: [unlock, face id, touch id, hello, windows, mac, ios, android]
 ---
 
-## Unlocking
+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 %}).
 
-After logging into your Bitwarden account using your Master Password and any two-step login (if enabled) - you can leverage your device’s biometrics capabilities to unlock your vault faster.
+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.
 
-These biometric features are part of the built-in security in your device and/or operating system.
+## Mobile Applications
 
-Bitwarden is leveraging native APIs to perform this validation, and as such does not receive any biometrics information from the device.
+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"}.
 
-## Windows
+### Enable Biometric Unlock in Mobile
 
-### Supported unlocking options:
-- Hello (includes below options)
-  - PIN
-  - Facial Recognition
-  - [Other Windows Hello supported hardware](https://docs.microsoft.com/en-us/windows-hardware/design/device-experiences/windows-hello-biometric-requirements)
+Complete the following steps to enable Biometric Unlock in your Mobile App:
 
-→ [Enabling up Windows Hello](https://support.microsoft.com/en-us/help/4028017/windows-learn-about-windows-hello-and-set-it-up)
+{% callout info %}
+Your Biometric method of choice must be enabled on your device or operating system **before** it can be enabled in Bitwarden.
+{% endcallout %}
 
-### Supported clients
+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:
 
-- Desktop
+{% image /biometrics/ios_faceid.jpeg Enable Face ID in iOS%}
 
-## macOS
+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.
 
-### Supported unlocking options
+## Desktop Applications
 
-- Touch ID
+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"}.
 
-→ [Enabling Touch ID on macOS](https://support.apple.com/en-us/HT207054)
+### Enable Biometric Unlock in Desktop
 
-### Supported clients
+Complete the following steps to enable Biometric Unlock in your Desktop App:
 
-- Desktop
+{% callout info %}
+Your Biometric method of choice must be enabled on your device or operating system **before** it can be enabled in Bitwarden.
+{% endcallout %}
 
-## Android
+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:
 
-### Supported unlocking options
-
-- Fingerprint unlock
-- Face Unlock
-
-→ [Enabling fingerprint unlock](https://support.google.com/nexus/answer/6285273?hl=en)
-
-→ [Enabling face unlock](https://support.google.com/pixelphone/answer/9517039?hl=en)
-
-### Supported clients
-
-- Bitwarden on Google Play
-- Bitwarden on FDroid
-
-## iOS
-
-### Supported unlocking options
-- Touch ID
-- Face ID
-
-→ [Enabling Touch ID on iOS](https://support.apple.com/en-us/HT201371)
-
-→ [Enabling Face ID on iOS](https://support.apple.com/en-us/HT208109)
-
-### Supported clients
-
-- Bitwarden on the App Store
-
-## Enabling Biometrics in Bitwarden
-
-### Mobile Apps
-
-To enable this in Bitwarden, simply navigate to settings and under the Security section, click enable Face ID, Touch ID, Face Unlock or Fingerprint unlock. The option presented will be based on your device and what biometric security features are available.
-
-{% image /biometrics/ios.png Configuring Face ID and Touch ID in iOS%}
-
-### Desktop Apps
-
-Enabling the desktop client is performed in much the same way. Navigate to the settings tab and you’ll see the option to enable Windows Hello or Touch ID for unlocking your vault.
-
-When biometrics are configured and your vault is locked, you will have a new button presented in the desktop application, either “Unlock with Windows Hello”, or “Unlock with Touch ID”. Clicking this button will initiate the unlocking sequence. Alternatively, you can still opt to unlock with your Master Password if you would like.
-
-{% image /biometrics/macos.png Configuring Touch ID in macOS %}
-
-{% image /biometrics/touchid-unlock.png Prompt to unlock with Touch ID in macOS %}
-
-{% image /biometrics/windows.png Configuring Hello in Windows %}
+   {% image /biometrics/windows.png Configuring Hello in Windows %}
 
 {% 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 %}
 
-{% image /biometrics/hello-unlock.png Prompt to unlock with Windows Hello %}
+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.
 
-### Browser Extensions
-
-Biometrics are not currently supported on our Browser extensions. However, we understand that it is incredibly important and this functionality is on our near-term roadmap.
+{% image /biometrics/hello-unlock.png Unlock with Windows Hello %}

_articles/account/export-your-data.md

@@ -1,59 +1,90 @@
 ---
 layout: article
-title: Export your vault data
+title: Export Vault Data
 categories: [account-management]
 featured: false
 popular: false
 tags: [export, accounts, csv]
 ---
 
-Bitwarden allows you to export your vault data at any time.
+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 `.json` or `.csv` files, however Bitwarden recommends using `.json` for a more complete option for standard backup procedures as `.csv` exports will lack some non-critical information.
+
+Vault Exports currently do not include file attachments.
 
 {% callout warning %}
-Exports contain your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.
+Vault Exports contain your data in an **unencrypted** format. Do not store or send the exported file over insecure channels, like email. You should delete Vault Exports immediately after you are done using them.
 {% endcallout %}
 
+## Export a Personal Vault
+
+Export your Personal Vault data from any client application:
+
+### 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` or `.csv`).
+   - 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.
+
+### From the Mobile App
+
+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` or `.csv`).
+   - 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.
+
+### From the 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` or `.csv`).
+   - 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.
+
+### From the Desktop App
+
+1. Navigate to **File** → **Export Vault**.
+2. In the Export Vault window:
+   - Select a **File Format** (`.json` or `.csv`).
+   - Enter your **Master Password**.
+3. Select the **Submit** button to download your Vault Export. You will be prompted to specify a location for download.
+
+### From the CLI
+
+Use the `bw export` command to export your Vault data. By default, `bw export` will create a `.csv` export in the current working directory.
+
+You may pass the following options with the `bw export` command:
+- `--output <filePath>` to specify a saving location of your choice.
+- `--format <format>` to specify the file format as `csv` (*default*) or `json`.
+
+## Export an Organization Vault
+
+Admins and Owners may export their Organization Vault from the Web Vault or CLI:
+
+### 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` or `.csv`).
+   - 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.
+
+### From the CLI
+
+From the Bitwarden CLI application, use the `bw export` command with the `--organizationid <orgId>` option to export your Organization Vault.
+
 {% callout info %}
-The `.json` file format offers a more complete export of your data and should be used for standard backup procedures. Some non-critical information is not included with the export when using the `.csv` file format.
-
-An exported `.json` file can be opened, read, and modified in a simple text editor like Notepad.
-
-An exported `.csv` file can be opened, read, and modified in spreadsheet programs such as Microsoft Excel (preferred) or a simple text editor like Notepad.
-
-At this time, exports do not include file attachment data.
+Retrieve your `<orgId>` value using the command: `bw list organizations`.
 {% endcallout %}
 
-## From the web vault
-
-1. Log in to the web vault at <https://vault.bitwarden.com>
-1. Click **Tools** in the top navigation bar
-1. Click **Export Vault** under the **Tools** side navigation
-1. Choose your exported file format, type in your master password, and click **Export Vault**. Your browser will either automatically download the exported file or prompt you to save it.
-
-{% callout info %}
-Exporting your vault will not include items that belong to an organization. Organization admins can export their organization's vault from the web vault under the organization's admin area in the **Tools** section. Then click **Export Vault** under the **Tools** side navigation.
-{% endcallout %}
-
-## From the mobile app
-
-1. Open the mobile app
-1. Navigate to **Settings**
-1. Scroll down and tap **Export Vault** under **Tools**
-1. Choose your exported file format, type in your master password, and tap **Export Vault**. Your app will either automatically download the exported file or prompt you to save it.
-
-## From the browser extension
-
-1. Open the browser extension
-1. Click on the **Settings** tab at the bottom
-1. Scroll down to the **Tools** header
-1. Click **Export Vault**
-1. Choose your exported file format, type in your master password, and click **Submit**. Your browser will either automatically download the exported file or prompt you to save it.
-
-## From the desktop app
-
-1. Open the desktop application and navigate to **File** &rarr; **Export Vault**
-1. Choose your exported file format, type in your master password, and click the Submit button. You will be prompted to download the exported file.
-
-## From the CLI
-
-In the CLI application, you can use the `bw export` command to export your data to a `.csv` or `.json` file in the current working directory. You can also pass the `--output` option to specify a saving location of your choice. Using the `--format` option will allow you to specify the file format as `csv` or `json`. The file format defaults to `csv`, if not specified.
+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 <filePath>` to specify a saving location of your choice.
+- `--format <format>` to specify the file format as `csv` (*default*) or `json`.