doc: Make minor improvements to guides

guides/propagate.md

@@ -61,32 +61,12 @@ Make sure to share it with your phone:
 
 Then, open Syncthing on your phone and accept the newly shared directory.
 You can configure it to sync to any folder on your phone;
-I prefer `/Pictures/library` (see warning below):
+I prefer `/Pictures/library`:
 
 <img src="../i/propagate_android.png" width="240">
 
 _Use the Android notifications menu to accept the new folder invitation._
 
-> ☝️ **Wait! But I already synced `/Pictures` to my inbox in the first guide.
-> Won’t it create some kind of circular dependency
-> if I sync my library back into it?**
->
-> Yes. To prevent this, go into your `/Pictures` folder’s configuration dialog;
-> under **Ignore Patterns**, add an entry for `/library`.
-> **Do this on BOTH desktop and Android**:
->
-> <img src="../i/propagate_ignore-library-desktop.png" width="480">
->
-> _Editing_ Ignore Patterns _on desktop._
->
-> <img src="../i/propagate_ignore-library-android.png" width="480">
->
-> _Editing_ Ignore Patterns _on Android._
->
-> See Syncthing’s [official documentation on ignore patterns][] for more.
->
-> [official documentation on Ignore Patterns]: https://docs.syncthing.net/users/ignoring.html
-
 Congratulations! You made it to the end.
 Your DIY cloud photo system is live;
 go take some photos and have fun with it! ❦

guides/upload-camera.md

@@ -14,7 +14,7 @@ an easy thing for a busy person to do every time they take some photos.
 
 We can’t automate _all_ of these steps away, but with this guide,
 you can at least eliminate the mouse/keyboard interaction:
-_remove the SD card, plug it in, let it run, put it back._
+_plug the camera into USB, let it run, and done!_
 
 (There are, of course, other ways to do something similar—either
 using photo management software or with a Wi-Fi/Bluetooth-enabled camera—but
@@ -181,7 +181,7 @@ $ vim ~/.local/share/systemd/user/dcim-transfer.service
     After=dev-disk-by\x2dlabel-RICOH_GR.device
 
     [Service]
-    ExecStart=/bin/sh -c 'mount /media/ricoh_gr && find /media/ricoh_gr/DCIM -type f -exec mv -t /path/to/xferase/inbox "{}" + && find /media/ricoh_gr/DCIM/ -type d | tac | xargs rmdir --ignore-fail-on-non-empty "{}" + && umount /media/ricoh_gr'
+    ExecStart=/bin/sh -c 'mount /media/ricoh_gr && find /media/ricoh_gr/DCIM -type f -exec mv --no-clobber --target-directory=/path/to/xferase/inbox "{}" + && find /media/ricoh_gr/DCIM/ -type d | tac | xargs rmdir --ignore-fail-on-non-empty "{}" + && umount /media/ricoh_gr'
     Restart=no
 
     [Install]

guides/upload-phone.md

@@ -85,7 +85,19 @@ Configure it to sync to a subdirectory of your Xferase inbox:
 
 <img src="../i/upload-phone_dcim-desktop.png" width="480">
 
-Repeat this process for your Android’s `/Pictures` directory,
-and for any other directories you’d like to auto-import photos from.
+Repeat this process for any other directories on your phone
+that you’d like to auto-import from
+(_e.g.,_ `/Pictures/Telegram`, `/Pictures/Instagram`, etc.).
+
+> ⚠️ **Warning: Don’t sync the whole `/Pictures` directory**
+>
+> Otherwise, you may end up with a recursively-syncing,
+> circular-dependency scenario in [the final step][].
+>
+> (There are ways to get around this using [ignore patterns][] in Syncthing,
+> but that’s beyond the scope of this guide.)
+>
+> [the final step]: propagate.md#step-2-add--accept-folders
+> [ignore patterns]: https://docs.syncthing.net/users/ignoring.html
 
 That’s all there is to it! 🥂