Update deprecation warnings

diff --git a/CHANGES.html b/CHANGES.html
index 2f78aa393ec8365631a340bc97bca83a692d2578..90101b0cc384ae4b8b019444117c147fe111db79 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -82,7 +82,8 @@ span.command {
 
       <p>If <a href="http://www.mega-nerd.com/SRC/">libsamplerate</a> is
       available at build time then that will be used instead of invoking
-      <a href="http://sox.sourceforge.net/">SoX</a>.</p>
+      <a href="http://sox.sourceforge.net/">SoX</a>.  SoX support will be
+      removed in a future version.</p>
 
     </div>
       

diff --git a/README.upgrades b/README.upgrades
index b030b5cb9ba678527a955ab8edaee902c536d9fc..1cb6aba3777bf3fc93c51ae0c5dfbf247894b9ff 100644 (file)
--- a/README.upgrades
+++ b/README.upgrades
@@ -48,7 +48,13 @@ The player --wait-for-device option is deprecated and will be removed in a
 future version.
 
 The 'lock' option no longer does anything.  You must delete it from any
-configuration files that contain it.
+configuration files that contain it.  The full set of deprecated options is:
+  allow
+  gap
+  lock
+  prefsync
+  restrict
+  trust
 
 * 3.0 -> 4.x