Differences

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

--- preferences:sync [2011/01/25 15:45] – rmzelle
+++ preferences:sync [2017/11/12 19:53] – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
+<html><p id="zotero-5-update-warning" style="color: red; font-weight: bold">We’re
+in the process of updating the documentation for
+<a href="https://www.zotero.org/blog/zotero-5-0">Zotero 5.0</a>. Some documentation
+may be outdated in the meantime. Thanks for your understanding.</p></html>
 ~~NOTOC~~
@@ Line 5: / Line 11: @@
 =====Settings=====
-{{ :pref_panes:preferences-sync-settings-zfs-2.0.9.png?350nocache&nolink}}
+{{ :preferences:preferences-sync-settings-z3.0.png?direct&400|}}
 ====Zotero Sync Server====
@@ Line 23: / Line 29: @@
 =====Reset=====
-{{ :pref_panes:preferences-sync-reset-2.0.9.png?350nocache&nolink}}
+{{ :preferences:preferences-sync-reset-z3.0.png?direct&400|}}
 ====Zotero Sync Server====
 See [[kb:sync_reset_options|sync reset options]] for a full discussion of the different reset options.
-**Full sync with Zotero Server** - Merge local Zotero data with data from the sync server, ignoring sync history.
 **Restore from Zotero Server** - Erase all local Zotero data and restore from the sync server.