svn commit: r397204 - head

[Antoine Brodin]

Author: antoine
Date: Thu Sep 17 20:56:49 2015
New Revision: 397204
URL: https://svnweb.freebsd.org/changeset/ports/397204

Log:
  - Fix a typo [1]
  - Add a possible workaround for an issue that may happen during pkg upgrade
    after the jpeg -> jpeg-turbo switch
  
  Reported by:	cperciva [1]

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Sep 17 20:15:23 2015	(r397203)
+++ head/UPDATING	Thu Sep 17 20:56:49 2015	(r397204)
@@ -12,9 +12,11 @@ you update your ports collection, before
   Default implementation of jpeg has been switched from graphics/jpeg to
   graphics/jpeg-turbo.  To perform the upgrade, use instructions below.
 
-  If using binary packages: 'pkg upgrade' will do the right thing.
+  If using binary packages: 'pkg upgrade' will do the right thing.  If it
+  doesn't and complains about 'Cannot solve problem using SAT solver', run
+  'pkg install jpeg-turbo' before 'pkg upgrade'.
 
-  If using portmgaster:
+  If using portmaster:
   # portmaster -o graphics/jpeg-turbo graphics/jpeg
 
   If using portupgrade: