Differences

This shows you the differences between two versions of the page.

--- sync [2019/12/05 15:47] – [Alternative Syncing Solutions] dstillman
+++ sync [2020/07/10 16:48] – [Data Syncing] dstillman
@@ Line 5: / Line 5: @@
 ===== Data Syncing =====
-Data syncing merges library items, notes, links, tags, etc.---everything except attachment files---between your local computer and the Zotero servers, allowing you to work with your data from any computer with Zotero installed. It also allows you to view your library online on zotero.org. Data syncing is free, has no storage limit, and can be used without file syncing.
+Data syncing merges library items, notes, links, tags, etc.---everything except attachment files---between your local computer and the Zotero servers, allowing you to work with your data from any computer with Zotero installed. It also allows you to view your library online on zotero.org. Data syncing is free and unlimited, and it can be used without file syncing.
-The first step to syncing your Zotero library is to [[/user/register/|create a Zotero account]] (which is also used for the Zotero Forums). Then, open Zotero's Sync [[preferences|preferences tab]] and enter your login information in the Zotero Sync Server section. By default, Zotero will sync your data with the server whenever changes are made. To disable automatic syncing, uncheck the "Sync automatically" checkbox in this section.
+The first step to syncing your Zotero library is to [[/user/register/|create a Zotero account]] (which is also used for the Zotero Forums). Then, open the Sync pane of the [[preferences|Zotero preferences]] and enter your login information in the Data Syncing section. By default, Zotero will sync your local data with the Zotero servers whenever changes are made. To disable automatic syncing, uncheck the "Sync automatically" checkbox in this section.
 {{http://www.zotero.org/static/images/support/quick_start/small/sync.png?nolink&w=160 }}
-In addition to automatic syncing, you can sync manually at any time by clicking the "Sync with Zotero Server" button on the right-hand side of the Zotero toolbar.
+In addition to automatic syncing, you can sync manually at any time by clicking the "Sync with zotero.org" button on the right-hand side of the Zotero toolbar.
-By default, Zotero will merge your local Zotero library with your library on zotero.org---any changes you make in one place will be applied to the other and on all other synced computers. If an item has changed in multiple places between syncs, you'll receive a conflict resolution dialog asking which version you'd like to keep. In the rare case that you want to completely overwrite your server library with the contents of your local library or vice versa, you can use the [[kb:Sync Reset Options]].
+By default, Zotero will merge your local Zotero library with your library on zotero.org — any changes you make in one place will be applied to the other and on all other synced computers. If an item has changed in multiple places in conflicting ways between syncs, you'll receive a conflict resolution dialog asking which version you'd like to keep. In the rare case that you want to completely overwrite your online library with the contents of your local library (such as if you restore from a local backup after accidentally deleting data and then syncing), you can use the [[kb:Sync Reset Options]].
 ===== File Syncing =====