Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Teams Section Update #710

Merged
merged 54 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
b8a0442
:sparkles: Planning scaffolding
sigrunixia Feb 22, 2024
9be9336
:memo: Expanded Update language
sigrunixia Apr 1, 2024
0f26a2f
:fire: Moved system installer language
sigrunixia Apr 1, 2024
95888b5
Added alias and clarified FAQ
sigrunixia Apr 1, 2024
88b1436
Adjusted file structure
sigrunixia Apr 1, 2024
4455f5d
Created introduction page to teams
sigrunixia Apr 1, 2024
26fb365
Created introduction to licenses and payment
sigrunixia Apr 1, 2024
f1e76cd
Moved and expanded Commercial license.md
sigrunixia Apr 1, 2024
c52b2bb
Pluralized Commercial licenses.md
sigrunixia Apr 1, 2024
b488c67
Added purchasing and invoice section
sigrunixia Apr 1, 2024
c6b8b99
Linked to invoice section
sigrunixia Apr 1, 2024
f200b5e
FAQ uniformity pass
sigrunixia Apr 1, 2024
e0b23b2
Sync Standard pass
sigrunixia Apr 1, 2024
3c61c22
Added Sync Standard Downgrade Caveat
sigrunixia Apr 1, 2024
f54cb57
Update wording
sigrunixia Apr 1, 2024
bd74ded
Add auto installer and some FAQS
sigrunixia Apr 1, 2024
641d646
Start of Obsidian Sync embed inclusions
sigrunixia Apr 1, 2024
93f01ba
Added PayPal disclaimer
sigrunixia Apr 1, 2024
59dc430
Fix Sales Tax disclaimer
sigrunixia Apr 1, 2024
bc173ff
Add how to receive credit.
sigrunixia Apr 1, 2024
e9e2b9c
Whole words good
sigrunixia Apr 1, 2024
463762f
Add business name question
sigrunixia Apr 1, 2024
a50cdd6
Add publish.scss for future styling help
sigrunixia May 3, 2024
a860cab
Add Minor cssclasses change
sigrunixia May 3, 2024
5713803
Merge gifting into Obsidian Credit.md
sigrunixia May 3, 2024
512df93
Update other files for grammar
sigrunixia May 3, 2024
5c84fb3
Quick backup
sigrunixia May 3, 2024
7ee4d66
Add space due to rare Publish rendering issue
sigrunixia May 3, 2024
bc65ff6
Clarification
sigrunixia May 3, 2024
61bce02
Focusing on Sync now
sigrunixia May 3, 2024
207751f
Removed duplicate page
sigrunixia May 3, 2024
f60cc42
Adds missing icons
sigrunixia May 3, 2024
f6c646f
Adds missing icons
sigrunixia May 3, 2024
70f15c4
Adds Trainbuffer
sigrunixia May 3, 2024
d1fc368
Wording seems better
sigrunixia May 3, 2024
17a4a45
Clarification on when this step happens.
sigrunixia May 3, 2024
dd32b32
Corrects old URL
sigrunixia May 3, 2024
7c1da91
reverted oops edit
sigrunixia May 3, 2024
e9ef6c8
Added FAQ item
sigrunixia May 3, 2024
f4c511e
Added alias to Commercial Licenes when needed
sigrunixia May 3, 2024
66ea405
Fixed missing words for assessments
sigrunixia May 3, 2024
b25e71c
Fixed link for security audits
sigrunixia May 3, 2024
102e0c2
Adds line about access levels and moves callout
sigrunixia May 3, 2024
13ac059
Grammar Passing
sigrunixia May 3, 2024
a331569
Grammar Passing again
sigrunixia May 3, 2024
44827ef
Grammar Passing again.. again?
sigrunixia May 3, 2024
f117034
Added Sync servers to this page
sigrunixia May 6, 2024
1475fa1
Release notes
liamcain May 9, 2024
efae295
Sync: Clarify language
kepano May 13, 2024
c646bf2
Sync: clarity
kepano May 14, 2024
3b597cd
Sync: Add upgrade instructions
kepano May 15, 2024
50827f3
Fixed remote vault question
sigrunixia May 15, 2024
a2e307d
Revert "Release notes"
sigrunixia May 15, 2024
f8e17bd
Adjusted header positions for flow and clarity
sigrunixia May 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ Thumbs.db
.obsidian

.idea/
.css.map
2 changes: 1 addition & 1 deletion en/Contributing to Obsidian/Financial contributions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ One of the best ways to support the team is through one or more of our paid prod

- If you need to sync notes across your devices, consider a subscription for [[Introduction to Obsidian Sync|Obsidian Sync]].
- If you want to publish your notes to the world, consider a subscription for [[Introduction to Obsidian Publish|Obsidian Publish]].
- If you use Obsidian for work, we ask you to purchase a [[Commercial license]].
- If you use Obsidian for work, we ask you to purchase a [[Commercial licenses|Commercial license]].

We understand that you might not be interested in any of our paid products right now, though we'd love to know how we can change that! If you still want to support Obsidian and you only use Obsidian for personal purposes, consider getting a [[Catalyst license]].
11 changes: 6 additions & 5 deletions en/Extending Obsidian/Plugin security.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
The Obsidian team takes security seriously. This page explains the risks involved when installing community plugins, and what the Obsidian team does to address them.

> [!tip]
> If you're working with sensitive data and wish to install a community plugin, we recommend that you perform an independent security audit before using it.

## Restricted mode

By default, Obsidian runs in Restricted Mode to prevent third-party code execution. Only disable Restricted mode if you trust the authors of the plugins that you install.
Expand All @@ -23,18 +20,22 @@ Installed plugins remain in your vault even if you turn on Restricted mode, but

## Plugin capabilities

Due to technical reasons, Obsidian is unable to reliably restrict plugins to specific permissions or access levels. As a result, consider the following examples of what community plugins can do:
Due to technical limitations, Obsidian cannot reliably restrict plugins to specific permissions or access levels. This means that plugins will inherit Obsidian's access levels. As a result, consider the following examples of what community plugins can do:

- Community plugins can access files on your computer.
- Community plugins can connect to internet.
- Community plugins can install additional programs.

> [!tip]
> If you're working with sensitive data and wish to install a community plugin, we recommend that you perform an independent security audit on the plugin before using it.

## Plugin review process

Community plugins undergo an initial review when they're submitted to the plugin store. All plugins must adhere to [Obsidian Developer Policies](https://docs.obsidian.md/Developer+policies).

The Obsidian team is small and unable to manually review every new release of community plugins. Instead, we rely on the help of the community to identify and report issues with plugins.

- If you find any security flaws with a community plugin, create an issue on the plugin repository on GitHub.
- If you discover any minor security vulnerabilities in a community plugin, refer to the plugin author's `security.md` or `readme.md` for how to report those. For Critical category flaws, please report the issue to [[Help and support#Contact Obsidian support|Obsidian support]] as well.
- If you suspect that a community plugin is malicious, report it to [[Help and support#Contact Obsidian support|Obsidian support]], or by sending a DM to our moderators.


20 changes: 10 additions & 10 deletions en/Getting started/Back up your Obsidian files.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ aliases:

If you haven't backed up your computer yet, start now! Obsidian's [[File recovery]] plugin is a good beginning, but it's limited to notes, and the snapshots themselves should be backed up.

**Why Back Up?**
**Why back up your data?**

Your notes are stored locally on your device by default, not in the cloud. This ensures that [the data is yours](https://obsidian.md/about) and gives you control over it. However, local storage is susceptible to real-world problems like corruption and data loss. Backups protect against these issues and further ensure that you control your own data.

## Understand: Syncing is not a backup
## Syncing is not a backup

Services like [[Introduction to Obsidian Sync|Obsidian Sync]], iCloud, OneDrive, and Dropbox sync your notes across devices. They may offer [[Version history|note restoration]], but they are **not** designed to [back up your vault](https://www.backblaze.com/blog/cloud-backup-vs-cloud-sync/).

Expand Down Expand Up @@ -41,17 +41,17 @@ In terms of security, you should always pay close attention to access and securi

## Use external drives

**Hard drives and SSD Drives**
**Hard drives and SSD drives**
External hard drive backups are still valuable in an increasing cloud-based world, and are mainly used for data storage and computer backups. The biggest disadvantage of an external drive is that the drive can break down or get lost. The biggest advantage is that the storage space only needs to be purchased once. Using an external hard drive is often combined with a [[#Use computer backups|computer backup]].

**USB Sticks**
USB sticks are a simple and effective method for quick backups.
**USB flash drives**
Flash drives (also called thumb drives, memory sticks, or pen drives) are a simple and effective method for quick backups.

1. Insert the USB stick into your computer or laptop.
2. Ensure the device is recognized and mounted in your file system. If necessary, format the USB stick to be compatible with your filesystem.
3. Copy your vault folder from its current location onto the USB stick.
4. Safely unmount the USB stick.
5. Remove the USB stick from your device.
1. Insert the flash drive into your computer or laptop.
2. Ensure the device is recognized and mounted in your file system. If necessary, format the flash drive to be compatible with your filesystem.
3. Copy your vault folder from its current location onto the flash drive.
4. Safely unmount the flash drive.
5. Remove the flash drive from your device.

> [!tip] If your external drive contains sensitive information, it is recommended to keep the external drive secure, such as in a secured room.

Expand Down
3 changes: 0 additions & 3 deletions en/Getting started/Download and install Obsidian.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ This page lists all supported ways to download and install Obsidian.
3. Open the installation file and follow the instructions.
4. Open Obsidian the same way you would open any other application.

> [!tip] System installer available
> For those who require a system installer for Windows, you can find the `-allusers.exe` download on the [Releases](https://github.com/obsidianmd/obsidian-releases/releases) page.

## Install Obsidian on macOS

1. Open your browser and go to [Download Obsidian](https://obsidian.md/download).
Expand Down
6 changes: 3 additions & 3 deletions en/Getting started/Sync your notes across devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ The easiest way to sync your notes between your devices is to use [[Introduction

Note that using multiple syncing services at the same time (e.g., Obsidian Sync _and_ Dropbox) may cause data loss, corruption, and other issues. [[Back up your Obsidian files|Find out more about using Obsidian Sync with other services here.]]

> [!important] Dealing with on-demand cloud storage
> Some cloud storage services, such as OneDrive, allow you to only download files when you use them and later remove them locally to free up space. Since the files are no longer available locally, Obsidian Sync believes they've been deleted and removes them from your remote vault.
> [!warning] On-demand cloud storage
> Some cloud storage services, such as OneDrive and Dropbox, allow you to only download files when you use them and later remove them locally to free up space. Since the files are no longer available locally, Obsidian Sync believes they've been deleted and removes them from your remote vault.
>
> To use Obsidian Sync together with Files On-Demand and similar features, make sure to configure the service to always keep the files on the device.
^sync-files-on-demand

If you don't want to use Obsidian Sync, this page lists alternative methods for syncing your vaults with multiple devices.

## Sync notes across multiple desktops
## Sync notes across multiple desktop devices

If you don't use Obsidian on your mobile devices, you can use any third-party service that syncs a local folder to a cloud storage.

Expand Down
4 changes: 2 additions & 2 deletions en/Getting started/Update Obsidian.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ aliases:
- Installer version update
---

Obsidian checks for new updates regularly. When a new update is available, Obsidian applies it when you restart the application.
Obsidian regularly checks for new updates. If automatic updates are enabled, the application will apply any available updates when you restart it.

## Check for an update and the current version

Expand All @@ -14,7 +14,7 @@ You can find the current Obsidian version and installer version in the upper-lef

![[application-installer-current-version.png#interface]]

To apply any available updates, click **Relaunch**.
To check for updates, select **Check for updates**. If there are new updates, this button will change to **Relaunch**. select **Relaunch** to apply any available updates.

## Disable automatic updates

Expand Down
2 changes: 1 addition & 1 deletion en/Help and support.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If you want to report a bug, head over to [Bug reports](https://forum.obsidian.m

### Contact Obsidian support

Obsidian offers email support only for inquiries about [[Commercial license|commercial licenses]], your account, payment, and add-on services ([[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]]). If you need help with any of those topics, [email the Obsidian team](mailto:[email protected]).
Obsidian offers email support only for inquiries about [[Commercial licenses|commercial licenses]], your account, payment, and add-on services ([[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]]). If you need help with any of those topics, [email the Obsidian team](mailto:[email protected]).

### Collect debug information

Expand Down
2 changes: 1 addition & 1 deletion en/Licenses and payment/Catalyst license.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Catalyst license gives you exclusive benefits including:
- Exclusive [[#Get your forum badge|forum badges]] and [[#Get your Discord badge|Discord badges]].

> [!Note] Commercial use
> If you use Obsidian for work in a company with two or more employees, you must purchase a [[Commercial license]].
> If you use Obsidian for work in a company with two or more employees, you must purchase a [[Commercial licenses|Commercial license]].

## Catalyst tiers

Expand Down
16 changes: 10 additions & 6 deletions en/Licenses and payment/Education and non-profit discount.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
aliases:
- Student and non-profit discount
- Licenses & Payment/Education and non-profit discount
- Student and non-profit discount
- Licenses & Payment/Education and non-profit discount
- Discounts
cssclasses:
- soft-embed
---

Obsidian currently offers two types of discounts: education and non-profit. They both give you 40% off our add-on services, including [[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]].
Expand All @@ -24,7 +27,7 @@ Once you have an active discount, you can see how it will expire under **Payment

A week before your discount expires, you will get an email reminder to renew it. You can follow the same steps in "[[#How to apply]]" to renew the discount, if you still qualify for it.

## FAQ
## Frequently asked questions

**Who is eligible?**
If you are a student or faculty member of an education organization like a university or a high school, you generally qualify for education discount. If you run or work at a non-profit organization, you generally qualify for non-profit discount.
Expand All @@ -40,7 +43,8 @@ If you’re already an early bird, there’s generally no point in applying for
**What if my educational or non-profit organization doesn't provide an email address?**
In that case, you can send other forms of verification such as student ID card, transcript, or employee ID card to the [[Help and support#Contact Obsidian support|Obsidian support]]. Be sure to include your Obsidian account email address too. Our team will review your application and get back to you. Thank you for your patience!

**I qualify for a discount, but I already paid. Can I get a refund?**
We understand that some people have purchased Sync or Publish without discounts either because discounts were not offered back then, or that you didn't know about the discount.
### Refunds

Unfortunately, we don't offer refunds in cases like this. Sorry! Thank you for understanding. The good news is that future renewals will automatically have the discount applied, as long as you have a valid discount.
![[Refund policy#^discount-then-refund]]

![[Refund policy#^purchase-then-discount-then-refund]]
16 changes: 0 additions & 16 deletions en/Licenses and payment/Gifting.md

This file was deleted.

61 changes: 61 additions & 0 deletions en/Licenses and payment/Introduction to licenses and payment.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
cssclasses:
- list-cards
- list-cards-mobile-full
---
Obsidian currently offers five items available for purchase to augment your Obsidian experience.

- [[Introduction to Obsidian Sync|Obsidian Sync]]
- Sync notes across devices
- [[Introduction to Obsidian Publish|Obsidian Publish]]
- Publish notes to the web
- [[Commercial licenses]]
- Use Obsidian in your workplace
- [[Obsidian Credit]]
- Purchase and Gift Obsidian services
- [[Catalyst license]]
- Support development and gain early access to releases


[[Education and non-profit discount|Discounts]] are available for Obsidian Sync and Publish for educational and non-profit organizations, as well as bulk discounts for [[Commercial licenses|commercial licenses]].

You can view our return policy for these purchases in our [[Refund policy|refund policy]].

## Purchasing services

1. Log in or create [your Obsidian account](https://obsidian.md/account).
2. Navigate to the section corresponding to the item you wish to purchase:
1. **Obsidian Credit** can be found in the **Billing** section.
2. **Commercial Licenses** can be found in the **Commercial License** section.
3. **Obsidian Sync** can be found in the **Sync** section.
4. **Obsidian Publish** can be found in the **Publish** section.
5. **Catalyst Licenses** can be found in the **Catalyst License** section.
3. Click the purple **Buy** button to proceed with your purchase.

We accept the following payment methods: Stripe, PayPal, WeChat, and AliPay.

> [!info] PayPal and fees
> PayPal purchases will be processed in Canadian Dollars (CAD). You may incur a foreign transaction fee from your card issuer, and PayPal may charge a currency conversion fee.

After completing your payment, you will receive a receipt from the service through which you made the purchase.

## Generate an invoice

Obsidian generates an invoice for all purchases within your account. To retrieve your invoice:

1. Log in to [your Obsidian account](https://obsidian.md/account).
2. Navigate to the **Billing** section.
3. Next to **Invoices and Refunds**, select **View**.
1. If multiple invoices are available, select the invoice you want to review and click **View** or **Download**.

### Editing an invoice

If you need to edit information on the invoice, such as the billing address or VAT number, follow these steps:

1. Log in to [your Obsidian account](https://obsidian.md/account).
2. Navigate to the **Billing** section.
3. Next to **Invoices and Refunds**, select **View**.
1. If multiple invoices are available, select the invoice you want to review and click **View**.
4. In the **Bill To:** section, the text box will be editable.
5. Make your edits, and then you can download your updated invoice.

42 changes: 37 additions & 5 deletions en/Licenses and payment/Obsidian Credit.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
---
aliases:
- Licenses & Payment/Obsidian Credit
- Licenses & Payment/Obsidian Credit
- Gifting
- Licenses & Payment/Gifting
- Licenses and Payment/Gifting
---

Obsidian Credit is a type of prepaid credit. It can be bought in advance and applied towards purchases of all things Obsidian has to offer.
Obsidian Credit is a type of prepaid credit that can be bought in advance and applied toward purchases of all things Obsidian has to offer.

Obsidian Credit will be applied before any payment is due, and it will also be applied at auto-renewals.
Obsidian Credit will be applied before any payment is due, including auto-renewals.

Obsidian Credit can be [[#Gifting|gifted]] to other Obsidian users.

Obsidian Credit is not eligible for a refund per our [[Refund policy]].

## Add credit

Expand All @@ -15,6 +22,31 @@ Obsidian Credit will be applied before any payment is due, and it will also be a
4. Proceed to pay for the credit with any of the supported payment methods.

> [!Note] Sales tax
> Any applicable sales tax will be charged when you actually buy something, not when you buy Obsidian Credit.
> Any applicable sales tax will be charged when you make a purchase of a product, such as Obsidian Sync, not when you buy Obsidian Credit.
>
> If you plan to cover auto-renewals with your credit, please take this into account.
> If you plan to cover auto-renewals with your credit, please keep this factor in mind.

## Gifting

Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial licenses|Commercial license]] so they can use Obsidian for work.

## Give Obsidian Credit

In Obsidian, you don't gift a particular product, but rather Obsidian Credit that can be used towards anything. It's like an Obsidian gift card.

1. If you don't already have [[Obsidian Credit]], you must first [[Obsidian Credit#Add credit|purchase credit]].
2. [On your account dashboard](https://obsidian.md/account), under **Payment & billing → Obsidian Credit**, click **Gift**.
3. Follow the instructions to either get a redeem link to send yourself, or have us send an anonymized email to the recipient.
4. Click **Send gift** to complete the gifting. You will be sent an email confirmation.
5. After you send out a gift, you can view it under **Payment & billing → Gift history**. You can see the status of each gift, and cancel the ones that haven't been redeemed yet.

## Receiving Obsidian Credit

If you have received a redemption link or an anonymized email, follow these steps to redeem your Obsidian Credit:

1. Log in or create [your Obsidian account](https://obsidian.md/account).
2. Open the redemption link or click the link in your email.
3. Confirm that you want to receive the credits.
4. The credits will be deposited within your account, ready to be used.

The purchaser will be notified that you have redeemed the Obsidian Credits.
Loading