From 317dc3e85395b55ffded6e608eb1b82a788364d9 Mon Sep 17 00:00:00 2001
Message-Id: <317dc3e85395b55ffded6e608eb1b82a788364d9.1716383955.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 21 Nov 2009 10:27:29 +0000
Subject: [PATCH] Update deprecation warnings
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 CHANGES.html    | 3 ++-
 README.upgrades | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 2f78aa3..90101b0 100644
--- 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 b030b5c..1cb6aba 100644
--- 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
 
-- 
[mdw]