1 files changed, 20 insertions, 21 deletions

diff --git a/UPDATING b/UPDATING
index 12ce4cdb7897..f91eed81db17 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,7 +12,7 @@ you update your ports collection, before attempting any port upgrades.
   EGroupware 1.8 was deprecated and removed from sourceforge.net.
   To upgrade to the new version (14.3), make a backup of all files and
   database, remove all files from ${PREFIX}/www/eg:
-  
+
     # pkg remove egroupware
     # rm -rf ${PREFIX}/www/eg
 
@@ -75,18 +75,18 @@ you update your ports collection, before attempting any port upgrades.
 20151015:
   AFFECTS: users of devel/subversion, its bindings and www/mod_dav_svn
   AUTHOR: lev@FreeBSD.org
-  
+
   The subversion upgdate to 1.9 branch introduces new "old" subversion
   port devel/subversion18.
-  
+
   If you don't want to update your subversion installation, run
-  
-  	pkg set -n subversion:subversion18
-  	
+
+        pkg set -n subversion:subversion18
+
   and add
-  
+
         WITH_SUBVERSION_VER=18
-        
+
   to your /etc/make.conf
 
 20151013:
@@ -104,7 +104,7 @@ you update your ports collection, before attempting any port upgrades.
   block rule like the following:
 
   ipfw add deny all from 'table(22)' to any
-  
+
   The release announcement can be found here:
     http://sourceforge.net/p/sshguard/mailman/message/34534861/
 
@@ -113,10 +113,10 @@ you update your ports collection, before attempting any port upgrades.
   AUTHOR: sbruno@FreeBSD.org
 
   The Jemalloc update at svn r286871 introduced some TLS enhancements
-  for MIPS targets that require a bit of workaround.  Users who want 
+  for MIPS targets that require a bit of workaround.  Users who want
   to build MIPS packages should update their host systems past r286871
   prior to upgrading their qemu-user-static/qemu-sbruno ports.
-  
+
   Discussion about this can be found here:
     https://lists.freebsd.org/pipermail/freebsd-mips/2015-October/004018.html
 
@@ -290,11 +290,11 @@ you update your ports collection, before attempting any port upgrades.
   AFFECTS: users of sysutils/s6
   AUTHOR: Colin Booth <colin@heliocat.net>
 
-  s6-notifywhenup has been removed as of v2.2.0.0. Any run scripts 
-  using readyness notification must be updated to use a notification 
+  s6-notifywhenup has been removed as of v2.2.0.0. Any run scripts
+  using readyness notification must be updated to use a notification
   fd instead.
 
-  s6-svc options have changed for sending syncronous up/down timeouts. 
+  s6-svc options have changed for sending syncronous up/down timeouts.
   Any management or wrapper scripts using those options will need to
   be updated.
 
@@ -330,7 +330,7 @@ you update your ports collection, before attempting any port upgrades.
   be both used with Icinga 1.x and the Icinga 2 port (net-mgmt/icinga2).
   A new meta-port net-mgmt/icinga was added which depends on both new
   ports, so updating the Icinga port should be transparent.
-  
+
 20150812:
   AFFECTS: users of sysutils/moosefs-master and other moosefs packages
   AUTHOR: feld@FreeBSD.org
@@ -497,7 +497,7 @@ you update your ports collection, before attempting any port upgrades.
   to www/varnish4. The upgrade guide can be found here:
 
   https://www.varnish-cache.org/docs/trunk/whats-new/upgrade-4.0.html
-  
+
   www/varnish-libvmod-header and www/varnish-nagios have been updated to
   versions that work with Varnish 4.x. You should not lose access to
   this software.
@@ -536,7 +536,7 @@ you update your ports collection, before attempting any port upgrades.
   AUTHOR: brnrd@FreeBSD.org 
 
   After upgrading libressl, manually update all packages that depend on
-  this library since its version has changed. Normally, you can obtain the 
+  this library since its version has changed. Normally, you can obtain the
   list of dependent software by running the following command:
 
   pkg query -e '%n = libressl' %ro
@@ -678,8 +678,8 @@ you update your ports collection, before attempting any port upgrades.
   - SQLITE
   - MYSQL
   - PGSQL
-  - REDIS 
- 
+  - REDIS
+
   They are disabled/removed in upstream since 5.4.4p1, but did not get removed
   from port.
 
@@ -698,7 +698,6 @@ you update your ports collection, before attempting any port upgrades.
   AFFECTS: Users of emulators/wine-devel
   AUTHOR: gerald@FreeBSD.org
 
-
   The COMPHOLIO option in emulators/wine-devel has been renamed to
   STAGING to align with the upstream evolution of that project.
 
@@ -1027,7 +1026,7 @@ AUTHOR: ohauer@FreeBSD.org
   #
   # Keep MySQL 5.5 as default version
   #
-  DEFAULT_VERSIONS+=mysql= 5.5 
+  DEFAULT_VERSIONS+=mysql= 5.5
 
   If you wish to update to the new default version, you need to first stop any
   running server instance. Then, you will need to follow these steps, depending