enh(guides): Use the same terminology as the actual UI

Author: marcelklehr

guides/strategies.md

@@ -2,13 +2,17 @@ Floccus supports unidirectional, one-way sync as well two-directional “merge
 
 ## Merge
 
+> Set floccus' Sync strategy to 'Always merge local changes with changes from other browsers'.
+
 In merge mode, changes from your local browser are merged with changes from other browsers.
 
-## Permanent one-way
+## One-way sync
+
+> Set floccus' Sync strategy to 'Always undo local changes and download changes from other browsers' or 'Always upload local changes and undo changes from other browsers'.
 
-Sometimes you want to have one device as a main device and other devices only as listeners. For this scenario you can set the main device to upload & override and all others to download & override to override their changes with the changes from the main device.
+Sometimes you want to have one device as a main device and other devices only as listeners. For this scenario you can set the main device to 'Always upload local changes and undo changes from other browsers' and all others to 'Always undo local changes and download changes from other browsers' to override their changes with the changes from the main device.
 
 ## Temporary one-way
 
-Occasionally you only want to temporarily override changes from other devices. For this you can use a one-time upload & override.
-In order to undo local changes you can do a one-time download & override to revert all your local changes with the latest server state.
+Occasionally you only want to temporarily override changes from other devices. For this you can use 'Push up once' in the floccus dropdown.
+In order to undo local changes you can do use 'Pull down once' in the floccus dropdown to revert all your local changes with the latest server state.

guides/tabs-without-merge.md

@@ -3,10 +3,12 @@ Instead of syncing a local bookmarks folder, Floccus can optionally sync your op
 1. Create a new profile with the sync method of your choice
 2. In the profile settings, select Tabs instead of a local folder to sync
 
+By default, floccus' sync strategy is set to "Always merge local changes with changes of other browsers". This feature is still slightly experimental as it sometimes causes tabs to duplicate. Changing the strategy may alleviate these issues, as shown below.
+
 ## Auto-push
 
-You can enable Auto-sync but set sync strategy to "upload & override". This will automatically push your currently open tabs to the server. Whenever you need the tabs on a different browser, or after a crash, you can click download & override once to get the tabs back.
+You can enable Auto-sync but set sync strategy to "Always upload local changes and undo changes from other browser". This will automatically push your currently open tabs to the server. Whenever you need the tabs on a different browser, or after a crash, you can click "Pull down once" to get the tabs back.
 
 ## Manual up- and download
 
-Auto-upload can sometimes cause surprises when you have it enabled on multiple devices or when an empty session is pushed after a browser crash, overriding the previously stored session. This is why you can also turn off auto-sync and up- and download your tabs manually, i.e. when you want to switch to a different device upload your open tabs once on device A and download once on device B – et voila, all your tabs are now on the new device.
+Auto-push can sometimes cause surprises when you have it enabled on multiple devices or when an empty session is pushed after a browser crash, overriding the previously stored session. This is why you can also turn off auto-sync and push and pull your tabs manually, i.e. when you want to switch to a different device upload your open tabs once on device A and download once on device B – et voila, all your tabs are now on the new device.

guides/tabs.md

@@ -52,7 +52,6 @@ import syncGDrive from '~/guides/sync-googledrive.md'
 import syncGit from '~/guides/sync-git.md'
 import strategies from '~/guides/strategies.md'
 import tabs from '~/guides/tabs.md'
-import tabsWithoutMerge from '~/guides/tabs-without-merge.md'
 
 export default {
   name: 'GuidesPage',
@@ -109,11 +108,6 @@ export default {
           content: tabs,
           show: false,
         },
-        {
-          title: 'Sync tab sessions without merging them',
-          content: tabsWithoutMerge,
-          show: false,
-        },
       ],
     }
   },