diff --git a/_articles/directory-connector/directory-sync-cli.md b/_articles/directory-connector/directory-sync-cli.md
index eaa9c27d..ab042994 100644
--- a/_articles/directory-connector/directory-sync-cli.md
+++ b/_articles/directory-connector/directory-sync-cli.md
@@ -37,7 +37,7 @@ To get started using the Bitwarden Directory Connector CLI:
Available **Sync Options** depend on the directory type in use, so refer to one of the following articles for a list of options available to you:
- [Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)
- - [Sync with Azure Active Directory]({% link _articles/directory-connector/azure-active-directory.md %})
+ - [Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)
- [Sync with G Suite (Google)]({% link _articles/directory-connector/gsuite-directory.md %})
- [Sync with Okta]({% link _articles/directory-connector/okta-directory.md %})
- [Sync with OneLogin]({% link _articles/directory-connector/onelogin-directory.md %})
diff --git a/_articles/directory-connector/directory-sync-desktop.md b/_articles/directory-connector/directory-sync-desktop.md
index fccc6fe7..20724dba 100644
--- a/_articles/directory-connector/directory-sync-desktop.md
+++ b/_articles/directory-connector/directory-sync-desktop.md
@@ -34,7 +34,7 @@ To get started using the Directory Connector Desktop App:
4. On the {% icon fa-cogs %} **Settings** tab, connect to your directory and configure [sync options]({{site.baseurl}}/user-group-filters/). This procedure will vary based on the directory in use, so refer to one of the following articles for instruction:
- [Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)
- - [Sync with Azure Active Directory]({% link _articles/directory-connector/azure-active-directory.md %})
+ - [Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)
- [Sync with G Suite (Google)]({% link _articles/directory-connector/gsuite-directory.md %})
- [Sync with Okta]({% link _articles/directory-connector/okta-directory.md %})
- [Sync with OneLogin]({% link _articles/directory-connector/onelogin-directory.md %})
diff --git a/_articles/directory-connector/directory-sync.md b/_articles/directory-connector/directory-sync.md
index 2c5e1a4a..43a251ec 100644
--- a/_articles/directory-connector/directory-sync.md
+++ b/_articles/directory-connector/directory-sync.md
@@ -25,7 +25,7 @@ A Directory Connector sync operation can be run on-demand or automatically on a
Directory Connector supports sync from the following sources:
- [Active Directory]({{site.baseurl}}/ldap-directory/)[Active Directory]({{site.baseurl}}/ldap-directory/)[Active Directory]({{site.baseurl}}/ldap-directory/)[Active Directory]({{site.baseurl}}/ldap-directory/)[Active Directory]({{site.baseurl}}/ldap-directory/)[Active Directory]({{site.baseurl}}/ldap-directory/)
-- [Any LDAP-based directory]({% link _articles/directory-connector/ldap-directory.md %})
+- [Any LDAP-based directory]({{site.baseurl}}/ldap-directory/)[Any LDAP-based directory]({{site.baseurl}}/ldap-directory/)[Any LDAP-based directory]({{site.baseurl}}/ldap-directory/)[Any LDAP-based directory]({{site.baseurl}}/ldap-directory/)[Any LDAP-based directory]({{site.baseurl}}/ldap-directory/)
- [Azure Active Directory]({% link _articles/directory-connector/azure-active-directory.md %})
- [G Suite]({% link _articles/directory-connector/gsuite-directory.md %})
- [Okta]({% link _articles/directory-connector/okta-directory.md %})
diff --git a/_articles/directory-connector/user-group-filters.md b/_articles/directory-connector/user-group-filters.md
index 38f6d28c..cc9f01c4 100644
--- a/_articles/directory-connector/user-group-filters.md
+++ b/_articles/directory-connector/user-group-filters.md
@@ -14,7 +14,7 @@ When configuring the Directory Connector application, you can use a variety of S
Available Sync Options and Filter syntaxes are different for each directory server type. Refer to the **Configure Sync Options** and **Specify Sync Filters** sections of one of the following articles for help:
- [Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)[Sync with Active Directory or LDAP]({{site.baseurl}}/ldap-directory/)
-- [Sync with Azure Active Directory]({% link _articles/directory-connector/azure-active-directory.md %})
+- [Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)[Sync with Azure Active Directory]({{site.baseurl}}/azure-active-directory/)
- [Sync with G Suite (Google)]({% link _articles/directory-connector/gsuite-directory.md %})
- [Sync with Okta]({% link _articles/directory-connector/okta-directory.md %})
- [Sync with OneLogin]({% link _articles/directory-connector/onelogin-directory.md %})
diff --git a/_articles/faqs/import-faqs.md b/_articles/faqs/import-faqs.md
index 8d314100..273887ab 100644
--- a/_articles/faqs/import-faqs.md
+++ b/_articles/faqs/import-faqs.md
@@ -57,8 +57,8 @@ If your format is not listed below, manually [condition a Bitwarden .csv or .jso
{% endcallout %}
- [1Password (1pif)]({{site.baseurl}}/import-from-1password/)[1Password (1pif)]({{site.baseurl}}/import-from-1password/)[1Password (1pif)]({{site.baseurl}}/import-from-1password/)
- - [1Password 6 & 7 Windows (.sv)]({% link _articles/importing/import-from-1password.md %})
- - [1Password 6 & 7 Mac (csv)]({% link _articles/importing/import-from-1password.md %})
+ - [1Password 6 & 7 Windows (.sv)]({{site.baseurl}}/import-from-1password/)
+ - [1Password 6 & 7 Mac (csv)]({{site.baseurl}}/import-from-1password/)
- Ascendo DataVault (csv)
- Avast Passwords (csv)
- Avast Passwords (json)
diff --git a/_articles/faqs/security-faqs.md b/_articles/faqs/security-faqs.md
index 58ac6494..1d84587e 100644
--- a/_articles/faqs/security-faqs.md
+++ b/_articles/faqs/security-faqs.md
@@ -21,7 +21,7 @@ This article contains Frequently Asked Questions (FAQs) regarding **Security**.
1. Bitwarden is **open source** software. All of our source code is hosted on [GitHub](https://github.com/bitwarden){:target="_blank"} and is free for anyone to review. Thousands of software developers follow Bitwarden's source code projects (and you should too!).
2. Bitwarden [is **audited**]({{site.baseurl}}/is-bitwarden-audited/) **by reputable third-party security firms** as well as independent security researchers.[is **audited**]({{site.baseurl}}/is-bitwarden-audited/)
-3. Bitwarden **does not store your passwords**. Bitwarden stores encrypted versions of your passwords [that only you can unlock]({% link _articles/security/what-encryption-is-used.md %}). Your sensitive information is encrypted locally on your personal device before ever being sent to our cloud servers.
+3. Bitwarden **does not store your passwords**. Bitwarden stores encrypted versions of your passwords [that only you can unlock]({{site.baseurl}}/what-encryption-is-used/). Your sensitive information is encrypted locally on your personal device before ever being sent to our cloud servers.
4. **Bitwarden has a reputation.** Bitwarden is used by millions of individuals and businesses. If we did anything questionable or risky, we'd be out of business!
Still don't trust us? You don't have to. Open source is beautiful. You can easily host the entire Bitwarden stack yourself. You control your data. Learn more [here]({{site.baseurl}}/install-on-premise/).
diff --git a/_articles/features/auto-fill-ios.md b/_articles/features/auto-fill-ios.md
index f2890487..94ad0614 100644
--- a/_articles/features/auto-fill-ios.md
+++ b/_articles/features/auto-fill-ios.md
@@ -71,6 +71,6 @@ To enable Browser App Extension auto-fill on iOS:
{% image features/auto-fill-ios/extension.png Bitwarden in the Share menu %}
{% callout info %}If you have [Unlock with Biometrics]({{site.baseurl}}/biometrics/) enabled, the first time you tap this option you will be prompted to verify your Master Password.{% endcallout %}[Unlock with Biometrics]({{site.baseurl}}/biometrics/)
-8. A Bitwarden screen will slide up on your device and will list [matching Login items]({% link _articles/features/uri-match-detection.md %}) for the website. Tap the item to auto-fill.
+8. A Bitwarden screen will slide up on your device and will list [matching Login items]({{site.baseurl}}/uri-match-detection/) for the website. Tap the item to auto-fill.
{% callout success %}If there are no Login items listed, it's probably because there isn't an item in your Vault with a [matching URI]({{site.baseurl}}/uri-match-detection/).{% endcallout %}
diff --git a/_articles/getting-started/getting-started-webvault.md b/_articles/getting-started/getting-started-webvault.md
index 981a04c9..7b2385a8 100644
--- a/_articles/getting-started/getting-started-webvault.md
+++ b/_articles/getting-started/getting-started-webvault.md
@@ -112,7 +112,7 @@ Congratulations on mastering the basics of Bitwarden! We want everyone to be saf
For personal users, we offer a premium subscription for **$10 / year** that unlocks advanced Vault capabilities including:
- Advanced Two-step Login options, like [Duo]({{site.baseurl}}/setup-two-step-login-duo/) and [YubiKey Security Keys]({{site.baseurl}}/setup-two-step-login-yubikey/)[Duo]({{site.baseurl}}/setup-two-step-login-duo/)[Duo]({{site.baseurl}}/setup-two-step-login-duo/)[Duo]({{site.baseurl}}/setup-two-step-login-duo/)[Duo]({{site.baseurl}}/setup-two-step-login-duo/)
-- Storage space for [Encrypted File Attachments]({% link _articles/features/attachments.md %})
+- Storage space for [Encrypted File Attachments]({{site.baseurl}}/attachments/)[Encrypted File Attachments]({{site.baseurl}}/attachments/)[Encrypted File Attachments]({{site.baseurl}}/attachments/)[Encrypted File Attachments]({{site.baseurl}}/attachments/)
- A built-in [Temporary One-time Password (TOTP) Authenticator]({% link _articles/features/authenticator-keys.md %})
- [Emergency Access]({% link _articles/security/emergency-access.md %}) to your Vault by trusted emergency contacts
- [Vault Health Reports]({% link _articles/features/reports.md %}) that report on password and security hygiene
diff --git a/_articles/getting-started/releasenotes.md b/_articles/getting-started/releasenotes.md
index 4504c9eb..3bfae511 100644
--- a/_articles/getting-started/releasenotes.md
+++ b/_articles/getting-started/releasenotes.md
@@ -85,8 +85,8 @@ Prior to 5/15/2021, we recommend digging through your Trash for anything you mig
Bitwarden is proud to announce the release of Bitwarden Send, and end-to-end encrypted solution for ephemeral sharing. This release includes:
- **Bitwarden Send**: Bitwarden Send is end-to-end encrypted solution for ephemeral sharing. There's lot of material about Send on our website and Help Center, but you can start [here](https://bitwarden.com/products/send){:target="\_blank"} or [here]({{site.baseurl}}/about-send/).[here]({{site.baseurl}}/about-send/)[here]({{site.baseurl}}/about-send/)
-- **FIDO U2F Support for Edge**: Two-step Login via FIDO U2F is now available for the Web Vault and Browser Extensions in Microsoft Edge (see [here]({% link _articles/two-step-login/setup-two-step-login-fido.md %}) for details).
-- **Domain Exclusion in Browser Extensions**: Bitwarden Browser Extensions can now be configured with domains to explicitly not offer to remember passwords for (see [here]({% link _articles/miscellaneous/exclude-domains.md %}) for details).
+- **FIDO U2F Support for Edge**: Two-step Login via FIDO U2F is now available for the Web Vault and Browser Extensions in Microsoft Edge (see [here]({{site.baseurl}}/setup-two-step-login-fido/) for details).
+- **Domain Exclusion in Browser Extensions**: Bitwarden Browser Extensions can now be configured with domains to explicitly not offer to remember passwords for (see [here]({{site.baseurl}}/exclude-domains/) for details).
- **Improved Import Error Messages**: We've had lots of folks migrating to Bitwarden recently, so we cleaned up an import error message to help you reconcile issues faster (see [here]({{site.baseurl}}/import-data/#length-related-import-errors) for details).
- **Safari Web Extension Port**: Our Safari App Extension has officially been ported to a Web Extension for use with Safari 14+. Due to changes to Safari, Web Extension use is now limited to only those obtained through Mac App Store downloads (see [here]({{site.baseurl}}/install-safari-app-extension/) for details).
@@ -108,7 +108,7 @@ The Bitwarden team is investigating these and will provide updates as things pro
## 2021-01-19
For the first major release of 2021, the Bitwarden team combined multiple major enhancements to address the critical needs of all users, including:
- **Emergency Access**: Bitwarden's new Emergency Access feature enables users to designate and manage trusted emergency contacts, who may request access to their Vault in a Zero Knowledge/Zero Trust environment (see [here]({{site.baseurl}}/emergency-access/) for details).[here]({{site.baseurl}}/emergency-access/)
-- **Encrypted Exports**: Personal users and Organizations can now export Vault data in an encrypted `.json` file (see [here]({% link _articles/importing/encrypted-export.md %}) for details).
+- **Encrypted Exports**: Personal users and Organizations can now export Vault data in an encrypted `.json` file (see [here]({{site.baseurl}}/encrypted-export/) for details).
- **New Role**: A Custom role is now available to allow for granular control over user permissions (see [here](https://bitwarden.com/help/user-types-access-control/#custom-role) for details).
- **New Enterprise Policy**: The Personal Ownership policy is now available for use by Enterprise Organization (see [here](https://bitwarden.com/help/policies/#personal-ownership) for details).
- **Biometric Unlock for Browser Extensions**: Using an integration with a native Desktop application, you can now use Biometric input to unlock Chromium-based Browser Extensions (see [here](https://bitwarden.com/help/biometrics/#browser-extensions) for details).
diff --git a/_articles/importing/import-data.md b/_articles/importing/import-data.md
index 09e03726..b0b867f0 100644
--- a/_articles/importing/import-data.md
+++ b/_articles/importing/import-data.md
@@ -13,10 +13,10 @@ Bitwarden provides a data import tool for easy migration from any password manag
For a full list of supported import formats, see [What file formats does Bitwarden support for import?]({{site.baseurl}}/import-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]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)
-- [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 %})
-- [Import from Password Safe]({% link _articles/importing/import-from-passwordsafe.md %})
+- [Import from 1Password]({{site.baseurl}}/import-from-1password/)
+- [Import from Firefox]({{site.baseurl}}/import-from-firefox/)
+- [Import from Google Chrome]({{site.baseurl}}/import-from-chrome/)
+- [Import from Password Safe]({{site.baseurl}}/import-from-passwordsafe/)
{% callout success %}
**Not already signed up?** Choose from one of [Bitwarden's plans](https://bitwarden.com/pricing/business/){:target="\_blank"} and get started today:
diff --git a/_articles/organizations/import-to-org.md b/_articles/organizations/import-to-org.md
index 3f5b325b..bc2386f2 100644
--- a/_articles/organizations/import-to-org.md
+++ b/_articles/organizations/import-to-org.md
@@ -13,9 +13,9 @@ Bitwarden provides a data import tool for easy migration from any password manag
For a full list of supported import formats, see [What file formats does Bitwarden support for import?]({{site.baseurl}}/import-faqs/#q-what-file-formats-does-bitwarden-support-for-import), or refer to one of these articles for guidance on the most popular solutions:
- [Import from LastPass]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)[Import from LastPass]({{site.baseurl}}/import-from-lastpass/)
-- [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 %})
+- [Import from 1Password]({{site.baseurl}}/import-from-1password/)
+- [Import from Firefox]({{site.baseurl}}/import-from-firefox/)
+- [Import from Google Chrome]({{site.baseurl}}/import-from-chrome/)
{% callout info %}
**The above listed articles** describe importing to a Personal Bitwarden Vault. While the guidance for exporting from each solution will be appropriate, it's important to know that importing to an Organization is a slightly different procedure and is [documented below](#import-to-your-organization).
diff --git a/_articles/plans-and-pricing/about-bitwarden-plans.md b/_articles/plans-and-pricing/about-bitwarden-plans.md
index 3fef6fdf..4425375d 100644
--- a/_articles/plans-and-pricing/about-bitwarden-plans.md
+++ b/_articles/plans-and-pricing/about-bitwarden-plans.md
@@ -53,7 +53,7 @@ In the following table, "premium features" (included for **Premium Individual**
|[Encrypted Export]({{site.baseurl}}/encrypted-export/)||||
|[Bitwarden Send]({{site.baseurl}}/about-send/)|Text Sharing|Text + File Sharing|Text + File Sharing|
|*[Two-step login]({{site.baseurl}}/setup-two-step-login/)|via authenticator apps or email|via authenticator apps, email, Yubikey, FIDO2, and Duo|via authenticator apps, email, Yubikey, FIDO2, and Duo (does not include [Duo for Organizations]({{site.baseurl}}/setup-two-step-login-duo/))|[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)
-|*[Encrypted file attachments]({% link _articles/features/attachments.md %})|-|1 GB|1 GB per user + 1 GB shared|
+|*[Encrypted file attachments]({{site.baseurl}}/attachments/)|-|1 GB|1 GB per user + 1 GB shared|[Encrypted file attachments]({{site.baseurl}}/attachments/)[Encrypted file attachments]({{site.baseurl}}/attachments/)[Encrypted file attachments]({{site.baseurl}}/attachments/)
|*[Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) (TOTP)|-|||
|*[Vault Health Reports]({% link _articles/features/reports.md %})|-|||
|*[Emergency Access]({% link _articles/security/emergency-access.md %})|-|||
@@ -98,21 +98,21 @@ In the following table, "premium features" (included for **Teams Organizations**
|[Encrypted Export]({{site.baseurl}}/encrypted-export/)||||
|[Bitwarden Send]({{site.baseurl}}/about-send/)|Text Sharing|Text + File Sharing|Text + File Sharing|
|*[Two-step login]({{site.baseurl}}/setup-two-step-login/)|via authenticator apps or email|via authenticator apps, email, Yubikey, FIDO2, and Duo|via authenticator apps, email, Yubikey, FIDO2, and Duo|[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)[Two-step login]({{site.baseurl}}/setup-two-step-login/)
-|[Duo for Organizations]({% link _articles/two-step-login/setup-two-step-login-duo.md %})|-|||
+|[Duo for Organizations]({{site.baseurl}}/setup-two-step-login-duo/)|-|||[Duo for Organizations]({{site.baseurl}}/setup-two-step-login-duo/)[Duo for Organizations]({{site.baseurl}}/setup-two-step-login-duo/)[Duo for Organizations]({{site.baseurl}}/setup-two-step-login-duo/)[Duo for Organizations]({{site.baseurl}}/setup-two-step-login-duo/)
|*[Encrypted file attachments]({% link _articles/features/attachments.md %})|-|1 GB per user + 1 GB shared|1 GB per user + 1 GB shared|
|*[Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) (TOTP)|-|||
|*[Personal Emergency Access]({% link _articles/security/emergency-access.md %})|-|||
|*[Vault Health Reports]({% link _articles/features/reports.md %})|-|||
|*Priority Support|-|||
|[Event Logs]({{site.baseurl}}/event-logs/)|-|||[Event Logs]({{site.baseurl}}/event-logs/)[Event Logs]({{site.baseurl}}/event-logs/)[Event Logs]({{site.baseurl}}/event-logs/)[Event Logs]({{site.baseurl}}/event-logs/)[Event Logs]({{site.baseurl}}/event-logs/)
-|[User Groups]({% link _articles/organizations/about-groups.md %})|-|||
+|[User Groups]({{site.baseurl}}/about-groups/)|-|||[User Groups]({{site.baseurl}}/about-groups/)[User Groups]({{site.baseurl}}/about-groups/)[User Groups]({{site.baseurl}}/about-groups/)[User Groups]({{site.baseurl}}/about-groups/)
|[API access]({% link _articles/organizations/public-api.md %})|-|||
|[Directory Connector]({% link _articles/directory-connector/directory-sync.md %})|-|||
|[Login with SSO]({% link _articles/login-with-sso/about-sso.md %})|-|-||
|[Enterprise Policies]({% link _articles/organizations/policies.md %})|-|-||
|[Admin Password Reset]({{site.baseurl}}/admin-reset/)|-|-||
|[Custom Management Role]({{site.baseurl}}/user-types-access-control/)|-|-||[Custom Management Role]({{site.baseurl}}/user-types-access-control/)
-|[Self-host option]({% link _articles/hosting/install-on-premise.md %})|-|-||
+|[Self-host option]({{site.baseurl}}/install-on-premise/)|-|-||
|Cost to you|Free|$3 Per User Per Month, billed annually
or
$4 Per User Per Month, billed monthly|$5 Per User Per Month, billed annually
or
$6 Per User Per Month, billed monthly|
### Next Steps
diff --git a/_articles/send/about-send.md b/_articles/send/about-send.md
index 49213931..e56a0057 100644
--- a/_articles/send/about-send.md
+++ b/_articles/send/about-send.md
@@ -29,6 +29,6 @@ Sends are created, edited, managed, and deleted from the **Send** view in any Bi
Using Bitwarden Send is a simple two-step process:
1. [Create your Send]({{site.baseurl}}/create-send/), setting whichever [lifespan options]({{site.baseurl}}/send-lifespan/) and [privacy options]({{site.baseurl}}/send-privacy/) are required to fit your sharing needs.[Create your Send]({{site.baseurl}}/create-send/)
-2. Share the Send link with the [intended recipients]({% link _articles/send/receive-send.md %}), using whatever communication channel you prefer.
+2. Share the Send link with the [intended recipients]({{site.baseurl}}/receive-send/), using whatever communication channel you prefer.
As the Sender, we recommend that you keep track of your Send's [configured lifespan]({{site.baseurl}}/send-lifespan/). To make that as easy as possible, Sends in your Send view will display [a set of status icons]({{site.baseurl}}/send-faqs/#q-what-do-the-icons-next-to-my-sends-indicate) whenever a lifespan event (for example, expiration) has occurred.
diff --git a/_articles/two-step-login/bitwarden-field-guide-two-step-login.md b/_articles/two-step-login/bitwarden-field-guide-two-step-login.md
index c6796670..6ef64e7e 100644
--- a/_articles/two-step-login/bitwarden-field-guide-two-step-login.md
+++ b/_articles/two-step-login/bitwarden-field-guide-two-step-login.md
@@ -122,6 +122,6 @@ And now that you're a Two-step Login Expert, we recommend that you:
- [Setup Two-step Login]({{site.baseurl}}/setup-two-step-login/)
- [Get Premium for access to advanced Two-step Login methods](https://vault.bitwarden.com/#/?premium=purchase)
- [Setup the Bitwarden Authenticator]({{site.baseurl}}/authenticator-keys/)[Setup the Bitwarden Authenticator]({{site.baseurl}}/authenticator-keys/)
-- [Customize your Vault Timeout behavior]({% link _articles/account/vault-timeout.md %})
+- [Customize your Vault Timeout behavior]({{site.baseurl}}/vault-timeout/)
Here’s to many happy logins!
diff --git a/_articles/two-step-login/setup-two-step-login.md b/_articles/two-step-login/setup-two-step-login.md
index d24b6d60..e9e17681 100644
--- a/_articles/two-step-login/setup-two-step-login.md
+++ b/_articles/two-step-login/setup-two-step-login.md
@@ -23,7 +23,7 @@ Bitwarden offers several Two-step Login methods for free, including:
|Method|Setup Instructions|
|------|------------------|
|via an Authenticator app (for example, [Authy](https://authy.com/){:target="_blank"} or [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en){:target="_blank"})|Click [**here**]({{site.baseurl}}/setup-two-step-login-authenticator/).|[**here**]({{site.baseurl}}/setup-two-step-login-authenticator/)
-|via Email|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-email.md %}).|
+|via Email|Click [**here**]({{site.baseurl}}/setup-two-step-login-email/).|
### Premium Methods
@@ -32,7 +32,7 @@ For Premium users (including members of Paid Organizations), Bitwarden offers se
|Method|Setup Instructions|
|------|------------------|
|via Duo Security with Duo Push, SMS, phone call, and security keys|Click [**here**]({{site.baseurl}}/setup-two-step-login-duo/).|[**here**]({{site.baseurl}}/setup-two-step-login-duo/)[**here**]({{site.baseurl}}/setup-two-step-login-duo/)
-|via YubiKey (any 4/5 series device or YubiKey NEO/NFC)|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-yubikey.md %}).|
+|via YubiKey (any 4/5 series device or YubiKey NEO/NFC)|Click [**here**]({{site.baseurl}}/setup-two-step-login-yubikey/).|[**here**]({{site.baseurl}}/setup-two-step-login-yubikey/)
|via FIDO2 WebAuthn (any FIDO2 WebAuthn Certified authenticator)|Click [**here**]({% link _articles/two-step-login/setup-two-step-login-fido.md %}).|
## Two-step Login for Teams and Enterprise