From 37b9864cf8840b8c5e0dfadf98ee2004d004c4d4 Mon Sep 17 00:00:00 2001 From: Erica Xu Date: Wed, 30 Mar 2022 13:29:39 -0400 Subject: [PATCH] Merge license docs. --- .../Financial contributions.md | 2 +- ...ed.md => Obsidian Unlimited (donation).md} | 0 en/Licenses & Payment/Catalyst license.md | 62 ++++++++++--------- en/Licenses & Payment/Commercial license.md | 22 ++++++- en/Licenses & Payment/Obsidian Unlimited.md | 9 --- en/Licenses & Payment/Refund policy.md | 24 +++---- en/Licenses/Catalyst license.md | 55 ---------------- en/Licenses/Commercial license.md | 18 ------ en/Obsidian Sync/Limitations.md | 4 ++ .../Troubleshoot Obsidian Sync.md | 14 ++++- en/Refund policy.md | 12 ---- 11 files changed, 84 insertions(+), 138 deletions(-) rename en/Contributing to Obsidian/{Obsidian Unlimited.md => Obsidian Unlimited (donation).md} (100%) delete mode 100644 en/Licenses & Payment/Obsidian Unlimited.md delete mode 100644 en/Licenses/Catalyst license.md delete mode 100644 en/Licenses/Commercial license.md delete mode 100644 en/Refund policy.md diff --git a/en/Contributing to Obsidian/Financial contributions.md b/en/Contributing to Obsidian/Financial contributions.md index 737c33864..cc0abdcc5 100644 --- a/en/Contributing to Obsidian/Financial contributions.md +++ b/en/Contributing to Obsidian/Financial contributions.md @@ -12,4 +12,4 @@ We understand that you might not be interested in any of our paid products right - If you only use Obsidian for personal purposes, consider getting a [[Catalyst license]]. -- If you already have a Catalyst license and you still want to donate to Obsidian, you can also contribute to [[Obsidian Unlimited]]. +- If you already have a Catalyst license and you still want to donate to Obsidian, you can also contribute to [[Obsidian Unlimited (donation)]]. diff --git a/en/Contributing to Obsidian/Obsidian Unlimited.md b/en/Contributing to Obsidian/Obsidian Unlimited (donation).md similarity index 100% rename from en/Contributing to Obsidian/Obsidian Unlimited.md rename to en/Contributing to Obsidian/Obsidian Unlimited (donation).md diff --git a/en/Licenses & Payment/Catalyst license.md b/en/Licenses & Payment/Catalyst license.md index 0d1c97d17..2359fcd0c 100644 --- a/en/Licenses & Payment/Catalyst license.md +++ b/en/Licenses & Payment/Catalyst license.md @@ -1,47 +1,53 @@ -Obsidian is free for personal use. A Catalyst license is an optional license that provides the following benefits: +While Obsidian is free of charge for personal use, you can support the Obsidian development by purchasing a _Catalyst_ license. -1. It gives you early access to the latest, cutting edge versions of the app; -2. Provides you cool badges on our community Discord server and forum; and -3. It helps support the development of Obsidian (thank you πŸ’œ!) +While the Catalyst license doesn't grant you any additional features inside the app itself, you'll receive exclusive benefits, such as: -There are three tiers of the Catalyst license: Insider ($25), Supporter ($50), and VIP ($100) - each of which gives you [[Insider builds|access to insider builds]]. +- Early access to [[#Enable Insider builds|Insider builds]]. +- Access to exclusive [[#Join our Insider channels|Insider channels]]. +- Cool and unique [[#Get your forum badge|forum badges]] and [[#Get your Discord badge|Discord badges]]. -Please note that Catalyst is optional and ==does not give you any additional app features==. +> [!Note] Commercial use +> If you use Obsidian for work, you may need to obtain a [[Commercial license]]. -To upgrade to Catalyst, please visit [our pricing page](https://obsidian.md/pricing). +## Catalyst tiers -If you use Obsidian for work-related activities, you may need a [[Commercial license|commercial license]]. +The Catalyst license consists of three tiers: *Insider*, *Supporter*, and *VIP*. -## FAQ +| Benefits | Insider | Supporter | VIP | +|-----------------------------------------|:-------:|:---------:|:--------:| +| Early access to Insider builds | βœ“ | βœ“ | βœ“ | +| Access to exclusive development channel | βœ“ | βœ“ | βœ“ | +| Insider community badge | βœ“ | | | +| Supporter community badge | | βœ“ | | +| VIP community badge | | | βœ“ | +| **Pricing** | **$25** | **$50** | **$100** | -### How do I get my shiny badges after I upgrade? +_Prices are in USD._ -Congratulations! After upgrading, you will find two buttons in the "Catalyst" section in your Account page. +## Access Catalyst benefits -#### Discord badge +Once you've purchased a Catalyst license, you can access a range of benefits. Learn how to enable them here. -==Please make sure to join [our Discord server](https://discord.gg/veuWUTm) first.== +### Get your forum badge -In [your account page](https://obsidian.md/account), click on "Get Discord badge", which will authenticate with Discord and add the badge for you automatically. +**Note:** To connect your Obsidian account and your forum account, you need to use the same email address for both accounts. -#### Forum badge +1. If you haven't already, join our [forum](https://forum.obsidian.md/). +2. Browse to your [Obsidian account page](https://obsidian.md/account). +3. Under **Your license** -> **Obsidian Catalyst**, click **Get forum badge**. -==Please make sure you've registered an account at [our forum](https://forum.obsidian.md) with the same email address.== +### Get your Discord badge -In [your account page](https://obsidian.md/account), click on "Get forum badge" , which will add the badge to your forum account. +1. If you haven't already, join our [Discord server](https://discord.gg/veuWUTm). +2. Browse to your [Obsidian account page](https://obsidian.md/account). +3. Under **Your license** -> **Obsidian Catalyst**, click **Get Discord badge**. -If your forum email doesn't match your account email, the badge can't be added. In that case, please change your email in the forum to be consistent with your account email. +### Join our Insider channels -Please note that your forum badge is not a "badge" in the forum system, but a shiny gold tag right next to your name in all of your posts. +Insiders can chat with the Obsidian team and other Insiders in our exclusive Discord channels. -### What do I get when I pay for Catalyst? +You automatically join the Insider channels after you [[#Get your Discord badge]]. -You get access to our [[Insider builds]]. On top of that, if you get Supporter or VIP tier, you can access an exclusive Discord channel to hang out with the developers. +### Enable Insider builds -When we do closed beta for a big new feature (such as mobile apps or a Typora-like WYSIWYM mode), we will roll out the beta to VIPs, Supporters, Insiders, and then everyone else, fixing issues along the way. - -### What payment methods do you accept? - -Our website accepts credit cards and some debit cards. This method is the quickest and easiest. - -If you need to pay via PayPal or Wechat, it's also possible. Please find the instructions by logging in on our website and select the "Catalyst" option. \ No newline at end of file +Please see [[Insider builds]]. \ No newline at end of file diff --git a/en/Licenses & Payment/Commercial license.md b/en/Licenses & Payment/Commercial license.md index 131260757..bcc201faa 100644 --- a/en/Licenses & Payment/Commercial license.md +++ b/en/Licenses & Payment/Commercial license.md @@ -1,8 +1,24 @@ -### About Obsidian commercial license +If you're using Obsidian for commercial use in a company of two (2) or more employees, you need to purchase a Commercial license. -Obsidian is free for personal use. For commercial (business) use in a company of two (2) or more employees, a commercial license is required. Business use includes any work-related activities such as capturing meeting notes, maintaining team project notes, configuring an organizational wiki, and similar note taking, document management, or knowledge management functionality. +Commercial use includes, but is not limited to, work-related activities such as: + +- Meeting notes +- Project notes for teams +- Organizational wikis + +You don't need a Commercial license if you work in any of the following settings: + +- Schools and recognized educational institutions +- Non-commercial research +- Non-profit organizations +- Freelancing or companies with a single person + +You can evaluate Obsidian for commercial use for 14 days. You do not need to pay when you’re evaluating. + +To purchase a commercial license, visit the [pricing page](https://obsidian.md/pricing). + +For bulk discounts, contact support@obsidian.md. -To purchase a commercial license, please visit [our pricing page](https://obsidian.md/pricing). ### Frequently asked questions diff --git a/en/Licenses & Payment/Obsidian Unlimited.md b/en/Licenses & Payment/Obsidian Unlimited.md deleted file mode 100644 index fd208061b..000000000 --- a/en/Licenses & Payment/Obsidian Unlimited.md +++ /dev/null @@ -1,9 +0,0 @@ -Obsidian Unlimited is a way to contribute a custom amount to Obsidian develop as you wish. You can also contribute multiple times at any time. - -You can find this option at the bottom of the page in [your Obsidian account page](https://obsidian.md/account) after logging in. - -Special thanks to the VIPs who proposed this "feature" to support Obsidian even more. - -==Contributing to Obsidian Unlimited does not let you give any additional features or benefits.== For this reason, we recommend upgrading to [[Catalyst license]] first, if you're looking to access [[Insider builds]] or get cool badges in our community. - -Note: we've set the minimal amount to $5 (so that processing fees would make sense). \ No newline at end of file diff --git a/en/Licenses & Payment/Refund policy.md b/en/Licenses & Payment/Refund policy.md index 8bc975820..0f89c27da 100644 --- a/en/Licenses & Payment/Refund policy.md +++ b/en/Licenses & Payment/Refund policy.md @@ -1,17 +1,19 @@ -## Obsidian Catalyst and Unlimited +We offer full refunds within 7 days of purchase with no questions asked for the following services and licenses: -[[Catalyst license]] purchases and Obsidian Unlimited donations are to support Obsidian's development. ==They are not refundable.== +- [[Introduction to Obsidian Publish|Obsidian Publish]] +- [[Introduction to Obsidian Sync|Obsidian Sync]] +- [[Commercial license]] -Although they might give you exclusive early access to insider builds or feature betas, we do not sell them as a product. -We cannot provide refunds for Catalyst purchases. Thanks for your understanding! +> [!Warning] No refunds for Catalyst and donations +> [[Catalyst license|Catalyst licenses]] and [[Obsidian Unlimited (donation)]] are **not** refundable. While they give you a number of benefits, they're intended to support the Obsidian development and aren't sold as products. -If there is any issue with a transaction, please reach out to support@obsidian.md or on Discord. +> [!Note] Talk to a human +> If you have any trouble with a transaction, or you need a refund past 7 days after purchase due to exceptional circumstances, contact support@obsidian.md. -## All other services +## Request a refund -For all other services and licenses, including [[Commercial license]], [[Introduction to Obsidian Publish|Obsidian Publish]], and [[Introduction to Obsidian Sync|Obsidian Sync]], you can request a full refund within 7 days of purchase with no questions asked. - -We do not provide pro-rated refunds once the refund window has passed. - -To request a refund, log into your account [on our Account page](https://obsidian.md/account), and use the **Invoices & Refunds** option. If a payment is refundable, a link to request refund will appear. You can simply click the link to get your refund. +1. Log into your account [on our Account page](https://obsidian.md/account). +2. Under **Payment & billing** > **Invoices & refunds**, click **View**. +3. Next to the payments you want a refund for, if you’re qualified for a refund, you’ll see a link to **Get refund**. Click on the click. +4. Your service will be removed and any auto-renewals will be cancelled as well. If you confirm to proceed, click **Request refund** \ No newline at end of file diff --git a/en/Licenses/Catalyst license.md b/en/Licenses/Catalyst license.md deleted file mode 100644 index 45ef02388..000000000 --- a/en/Licenses/Catalyst license.md +++ /dev/null @@ -1,55 +0,0 @@ -While Obsidian is free of charge for personal use, you can support the Obsidian development by purchasing a _Catalyst_ license. - -While the Catalyst license doesn't grant you any additional features inside the app itself, you'll receive exclusive benefits, such as: - -- Early access to [[#Enable Insider builds|Insider builds]]. -- Access to exclusive [[#Join our Insider channels|Insider channels]]. -- Cool and unique [[#Get your forum badge|forum badges]] and [[#Get your Discord badge|Discord badges]]. - -**Note:** If you use Obsidian for work, you may need to obtain a [[Commercial license]]. - -## Catalyst tiers - -The Catalyst license consists of three tiers: *Insider*, *Supporter*, and *VIP*. - -| Benefits | Insider | Supporter | VIP | -|-----------------------------------------|:-------:|:---------:|:--------:| -| Early access to Insider builds | βœ“ | βœ“ | βœ“ | -| Access to exclusive development channel | βœ“ | βœ“ | βœ“ | -| Insider community badge | βœ“ | | | -| Supporter community badge | | βœ“ | | -| VIP community badge | | | βœ“ | -| **Pricing** | **$25** | **$50** | **$100** | - -_Prices are in USD._ - -## Access Catalyst benefits - -Once you've purchased a Catalyst license, you can access a range of benefits. Learn how to enable them here. - -### Get your forum badge - -**Note:** To connect your Obsidian account and your forum account, you need to use the same email address for both accounts. - -1. If you haven't already, join our [forum](https://forum.obsidian.md/). -2. Browse to your [Obsidian account page](https://obsidian.md/account). -3. Under **Your license** -> **Obsidian Catalyst**, click **Get forum badge**. - -### Get your Discord badge - -1. If you haven't already, join our [Discord server](https://discord.gg/veuWUTm). -2. Browse to your [Obsidian account page](https://obsidian.md/account). -3. Under **Your license** -> **Obsidian Catalyst**, click **Get Discord badge**. - -### Join our Insider channels - -Insiders can chat with the Obsidian team and other Insiders in our exclusive Discord channels. - -You automatically join the Insider channels after you [[#Get your Discord badge]]. - -### Enable Insider builds - -Insider builds are beta versions of Obsidian - -1. Open **Settings:** -> **About**. -2. Enable **Receive insider builds**. diff --git a/en/Licenses/Commercial license.md b/en/Licenses/Commercial license.md deleted file mode 100644 index 1d3742026..000000000 --- a/en/Licenses/Commercial license.md +++ /dev/null @@ -1,18 +0,0 @@ -If you're using Obsidian for commercial use in a company of two (2) or more employees, you need to purchase a Commercial license. - -Commercial use includes, but is not limited to, work-related activities such as: - -- Meeting notes -- Project notes for teams -- Organizational wikis - -You don't need a Commercial license if you work in any of the following settings: - -- Schools and recognized educational institutions -- Non-commercial research -- Non-profit organizations -- Freelancing or companies with a single person - -You can evaluate Obsidian for commercial use for 14 days. To purchase a commercial license, visit the [pricing page](https://obsidian.md/pricing). - -For bulk discounts, contact support@obsidian.md. diff --git a/en/Obsidian Sync/Limitations.md b/en/Obsidian Sync/Limitations.md index 721b1f9ad..697fcc7df 100644 --- a/en/Obsidian Sync/Limitations.md +++ b/en/Obsidian Sync/Limitations.md @@ -22,6 +22,10 @@ We keep data in your remote vaults, including version history, for one month aft As long as you renew within one month, there should be no impact on your usage. +## Is my data being synchronized in the background? + +No, files are only synchronized when Obsidian is running. + ## What operating systems does Obsidian Sync support? Obsidian Sync supports every platform that Obsidian can run on. Currently that means Windows, macOS, Linux, Android and iOS. diff --git a/en/Obsidian Sync/Troubleshoot Obsidian Sync.md b/en/Obsidian Sync/Troubleshoot Obsidian Sync.md index 8386a9731..2130821ed 100644 --- a/en/Obsidian Sync/Troubleshoot Obsidian Sync.md +++ b/en/Obsidian Sync/Troubleshoot Obsidian Sync.md @@ -1,4 +1,16 @@ -This page lists common errors that you might encounter, and what they mean. +This page lists common issues that you might encounter, and how to address them. + +## Changes from + +A conflict happens when you make changes to the same file on two or more devices between syncs. For example, when + +Conflicts usually happen more frequently if you work offline, since there are more changes and a longer period of time between syncs and thus more potential conflicts. + +When Sync downloads a new version of a file, and finds that there are conflicts with the local version, the changes are merged with Google's diff-match-patch algorithm. + +> [!tip] +> To find when conflicts have happened, you can search for "Merging conflicted file" in **Settings** β†’ **Sync** β†’ **Sync activity** β†’ **View**. + ## What does the `vault limit exceeded` error mean? diff --git a/en/Refund policy.md b/en/Refund policy.md deleted file mode 100644 index 276eacf11..000000000 --- a/en/Refund policy.md +++ /dev/null @@ -1,12 +0,0 @@ -We offer full refunds within 3 days of purchase with no questions asked for the following services and licenses: - -- [[Introduction to Obsidian Publish|Obsidian Publish]] -- [[Introduction to Obsidian Sync|Obsidian Sync]] -- [[Commercial license]] - -[[Catalyst license|Catalyst licenses]] and [[Obsidian Unlimited]] donations are **not** refundable. While they give you a number of benefits, they're intended to support the Obsidian development and aren't sold as products. - -**Notes:** - -- If you have any trouble with a transaction, contact support@obsidian.md. -- If you need a refund after 3 days of purchase due to exceptional circumstances, contact support@obsidian.md.