Rename Emailer -> Email.

[dcpomatic.git] / DEVELOP.md

diff --git a/DEVELOP.md b/DEVELOP.md
index 7058938ddc018cd0f69e82bcaace8550d3aeb747..be8ed61e6891d2e30dbdd351cb3bd00d0f0be5bd 100644 (file)
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -11,7 +11,7 @@ As we have no `film' folder to log to during disk writes, the logs end up:
 ### macOS
 
 * Disk writer backend: `/var/log/dcpomatic_disk_writer_{out,err}.log`
-* Disk writer frontend: `/Users/$USER/Library/Preferences/2/com.dcpomatic/2.16/disk.log`
+* Disk writer frontend: `/Users/$USER/Library/Preferences/com.dcpomatic/2/2.16/disk.log`
 
 ### Windows
 
@@ -29,7 +29,7 @@ As we have no `film' folder to log to during disk writes, the logs end up:
 The main dcpomatic repo has the following branches:
 
 * `main` - the main development branch; contains 2.16.x versions
-* `v2.17.x` - development branch for v2.17.x versions; periodically rebased onto `main`
+* `v2.17.x` - development branch for v2.17.x versions; `main` is merged into this branch.
 
 The `test/data` submodule has the following branches: