diff --git a/NEWS b/NEWS
index ee60373dd30..55b3c5ae9cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,49 +1,80 @@
 QGIS News
 Change history for the QGIS Project
-Friday July 14, 2017
+Sunday August 13, 2017
 
 
 ------------------------------------------------------------------------
 
 
-  1. What's new in Version 2.16 'Nødebo'?
-  2. What's new in Version 2.14 'Essen'?
-  3. What's new in Version 2.12 'Lyon'?
-  4. What's new in Version 2.10 'Pisa'?
-  5. What's new in Version 2.8 'Wien'?
-  6. What's new in Version 2.6.0 'Brighton'?
-  7. What's new in Version 2.4.0 'Chugiak'?
-  8. Whats new in Version 2.2.0 'Valmiera'?
-  9. Whats new in Version 2.0.1 'Dufour'?
-  10. Whats new in Version 2.0.0 'Dufour'?
-  11. Whats new in Version 1.8.0 'Lisboa'?
-  12. Whats new in Version 1.7.2 'Wroclaw'?
-  13. Whats new in Version 1.7.1 'Wroclaw'?
-  14. Whats new in Version 1.7.0 'Wroclaw'?
-  15. Whats new in Version 1.6.0 'Capiapo'?
-  16. Whats new in Version 1.5.0?
-  17. Whats new in Version 1.4.0 'Enceladus'?
-  18. Whats new in Version 1.3.0 'Mimas'?
-  19. Version 1.2.0 'Daphnis'
-  20. Version 1.0.0 'Kore'
-  21. Version 0.11.0 'Metis'
-  22. Version 0.10.0 'Io'
-  23. Version 0.9.2rc1 'Ganymede'
-  24. Version 0.9.1 'Ganymede'
-  25. Version 0.9 'Ganymede'
-  26. Version 0.8 'Joesephine' .... development version
-  27. Version 0.6 'Simon'
-  28. 0.5
+  1. What's new in Version 2.18 'Las Palmas'?
+  2. What's new in Version 2.16 'Nødebo'?
+  3. What's new in Version 2.14 'Essen'?
+  4. What's new in Version 2.12 'Lyon'?
+  5. What's new in Version 2.10 'Pisa'?
+  6. What's new in Version 2.8 'Wien'?
+  7. What's new in Version 2.6.0 'Brighton'?
+  8. What's new in Version 2.4.0 'Chugiak'?
+  9. Whats new in Version 2.2.0 'Valmiera'?
+  10. Whats new in Version 2.0.1 'Dufour'?
+  11. Whats new in Version 2.0.0 'Dufour'?
+  12. Whats new in Version 1.8.0 'Lisboa'?
+  13. Whats new in Version 1.7.2 'Wroclaw'?
+  14. Whats new in Version 1.7.1 'Wroclaw'?
+  15. Whats new in Version 1.7.0 'Wroclaw'?
+  16. Whats new in Version 1.6.0 'Capiapo'?
+  17. Whats new in Version 1.5.0?
+  18. Whats new in Version 1.4.0 'Enceladus'?
+  19. Whats new in Version 1.3.0 'Mimas'?
+  20. Version 1.2.0 'Daphnis'
+  21. Version 1.0.0 'Kore'
+  22. Version 0.11.0 'Metis'
+  23. Version 0.10.0 'Io'
+  24. Version 0.9.2rc1 'Ganymede'
+  25. Version 0.9.1 'Ganymede'
+  26. Version 0.9 'Ganymede'
+  27. Version 0.8 'Joesephine' .... development version
+  28. Version 0.6 'Simon'
+  29. 0.5
 
 
 ------------------------------------------------------------------------
 
 
-Last Updated: Friday July 14, 2017
-Last Change : Friday July 14, 2017
+Last Updated: Sunday August 13, 2017
+Last Change : Sunday August 13, 2017
 
 
-  1. What's new in Version 2.16 'Nødebo'?
+  1. What's new in Version 2.18 'Las Palmas'?
+  ===========================================
+
+This release has following new features:
+
+- Symbology: Color picker is now embedded in layer style panel
+- Labelling: Substitution list support for labeling
+- Labelling: Improved line label placement algorithm
+- Labelling: Label polygons using curved labels along perimeter
+- Data Management: Add flag to only copy selected features
+- Forms and Widgets: Allow controlling labels for individual edit widgets
+- Forms and Widgets: Conditional visibility for tabs and group boxes
+- Forms and Widgets: Client side default field values
+- Map Composer: True North Arrows
+- Processing: Point on surface algorithm  added
+- Processing: New algorithm for geometry boundary
+- Processing: New algorithm for calculating feature bounding box
+- Processing: Processing dissolve algorithm accepts multiple fields
+- Processing: Optimised processing clip algorithm
+- Processing: New algorithm for merging connected lines
+- General: Automatic links in identify results
+- General: Mouse wheel over color dialog sliders
+- General: Add custom color schemes to color button drop down menu
+- Data Providers: Preview for WMTS + added XYZ tile layers
+- QGIS Server: Possibility to segmentize feature info geometry in server
+- Plugins: DB Manager: Add the ability to update SQL Layer
+- Programmability: New expression functions
+- Programmability: Expose GEOS linear referencing function to QgsGeometry
+
+
+  2. What's new in Version 2.16 'Nødebo'?
   =======================================
 
 This release has following new features:
@@ -140,7 +171,7 @@ This release has following new features:
 - Programmability: Plugins can add pages to vector layer properties
 
 
-  2. What's new in Version 2.14 'Essen'?
+  3. What's new in Version 2.14 'Essen'?
   ======================================
 
 This release has following new features:
@@ -216,7 +247,7 @@ This release has following new features:
 - User Interface : Show/hide all legend items via the the context menu
 
 
-  3. What's new in Version 2.12 'Lyon'?
+  4. What's new in Version 2.12 'Lyon'?
   =====================================
 
 This release has following new features:
@@ -270,7 +301,7 @@ This release has following new features:
 - Symbology : Add pixels as option for all symbology size unit choices
 
 
-  4. What's new in Version 2.10 'Pisa'?
+  5. What's new in Version 2.10 'Pisa'?
   =====================================
 
 This is a minor release increment with the following new features:
@@ -318,7 +349,7 @@ This is a minor release increment with the following new features:
 - User interface improvements.
 
 
-  5. What's new in Version 2.8 'Wien'?
+  6. What's new in Version 2.8 'Wien'?
   ====================================
 
 This is a minor release increment with the following feature:
@@ -351,7 +382,7 @@ This is a minor release increment with the following feature:
   DescribeLayer, python plugins.
 
 
-  6. What's new in Version 2.6.0 'Brighton'?
+  7. What's new in Version 2.6.0 'Brighton'?
   ==========================================
 
 This is a minor release increment with the following new features:
@@ -397,7 +428,7 @@ This is a minor release increment with the following new features:
 - Context menu for identify tool
 
 
-  7. What's new in Version 2.4.0 'Chugiak'?
+  8. What's new in Version 2.4.0 'Chugiak'?
   =========================================
 
 This is the minor release sports a number of great new features:
@@ -417,7 +448,7 @@ This is the minor release sports a number of great new features:
 - New Inverted Polygon renderer
 
 
-  8. Whats new in Version 2.2.0 'Valmiera'?
+  9. Whats new in Version 2.2.0 'Valmiera'?
   =========================================
 
 This is the minor release sports a number of great new features:
@@ -458,15 +489,15 @@ This is the minor release sports a number of great new features:
 - 'Processing' can be used headless in scripts.
 
 
-  9. Whats new in Version 2.0.1 'Dufour'?
-  =======================================
+  10. Whats new in Version 2.0.1 'Dufour'?
+  ========================================
 
 This is a small bugfix release to address the missing copyright / credits for
 our new splash screen and to update supporting documentation. The spanish 
 translation was also updated.
 
 
-  10. Whats new in Version 2.0.0 'Dufour'?
+  11. Whats new in Version 2.0.0 'Dufour'?
   ========================================
 
 This is a new major release. Building on the foundation of
@@ -552,7 +583,7 @@ key new features.
       you to explore the software and discover them all!
 
 
-  11. Whats new in Version 1.8.0 'Lisboa'?
+  12. Whats new in Version 1.8.0 'Lisboa'?
   ========================================
 
 This is a new feature release. Building on the foundation of
@@ -607,7 +638,7 @@ added gdal_fillnodata to GDALTools plugin
 - Support for nesting projects within other projects
 
 
-  12. Whats new in Version 1.7.2 'Wroclaw'?
+  13. Whats new in Version 1.7.2 'Wroclaw'?
   =========================================
 
 This is a bugfix release over version 1.7.1. The following changes
@@ -654,7 +685,7 @@ were made.
 - Fix broken Assign projection functionality in GDALTools and improve handling output file extension
 
 
-  13. Whats new in Version 1.7.1 'Wroclaw'?
+  14. Whats new in Version 1.7.1 'Wroclaw'?
   =========================================
 
 This is a bugfix release over version 1.7.0. The following changes 
@@ -664,7 +695,7 @@ were made.
 http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Update version on cmakelists and splash to 1.7.1
 - Move setting projection to after we have features
-- symbology-ng: sort the category items when classifying them #4206
+- symbology: sort the category items when classifying them #4206
 - Fix feature_count consideration in wms feature info
 - Check topological editing yes/no when opening snapping dialog
 - Updated required version for bison and cmake
@@ -717,7 +748,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi
 
 
-  14. Whats new in Version 1.7.0 'Wroclaw'?
+  15. Whats new in Version 1.7.0 'Wroclaw'?
   =========================================
 
 This release is named after the town of Wroclaw in Poland. The Department of
@@ -734,12 +765,12 @@ enhancements. Once again it is impossible to document everything here that has
 changed so we will just provide a bullet list of key new features here.
 
 
-  14.1. Symbology labels and diagrams
+  15.1. Symbology labels and diagrams
   ===================================
 
 - New symbology now used by default!
 - Diagram system that uses the same smart placement system as labeling-ng
-- Export and import of styles (symbology-ng).
+- Export and import of styles (symbology).
 - Labels for rules in rule-based renderers.
 - Ability to set label distance in map units.
 - Rotation for svg fills.
@@ -752,7 +783,7 @@ changed so we will just provide a bullet list of key new features here.
 - Move/rotate/change label edit tools to interactively change data defined label properties.
 
 
-  14.2. New Tools
+  15.2. New Tools
   ===============
 
 - Added GUI for gdaldem.
@@ -761,7 +792,7 @@ changed so we will just provide a bullet list of key new features here.
 - Added voronoi polygon tool to Vector menu.
 
 
-  14.3. User interface updates
+  15.3. User interface updates
   ============================
 
 - Allow managing missing layers in a list.
@@ -772,7 +803,7 @@ changed so we will just provide a bullet list of key new features here.
 - General clean-ups and usability improvements.
 
 
-  14.4. CRS Handling
+  15.4. CRS Handling
   ==================
 
 - Show active crs in status bar.
@@ -782,7 +813,7 @@ changed so we will just provide a bullet list of key new features here.
 - Default to last selection when prompting for CRS.
 
 
-  14.5. Rasters
+  15.5. Rasters
   =============
 
 - Added AND and OR operator for raster calculator
@@ -791,7 +822,7 @@ changed so we will just provide a bullet list of key new features here.
 - Added raster toolbar with histogram stretch functions.
 
 
-  14.6. Providers and Data Handling
+  15.6. Providers and Data Handling
   =================================
 
 - New SQLAnywhere vector provider.
@@ -817,7 +848,7 @@ changed so we will just provide a bullet list of key new features here.
  - Allow OGR 'save as' without attributes (e.g., DGN/DXF).
 
 
-  14.7. Api and Developer Centric
+  15.7. Api and Developer Centric
   ===============================
 
 - Refactored attribute dialog calls to QgsFeatureAttribute.
@@ -829,7 +860,7 @@ changed so we will just provide a bullet list of key new features here.
   new QgsGeometry.validateGeometry function
 
 
-  14.8. QGIS Mapserver
+  15.8. QGIS Mapserver
   ====================
 
 - Ability to specify wms service capabilities in the properties 
@@ -837,7 +868,7 @@ changed so we will just provide a bullet list of key new features here.
 - Support for wms printing with GetPrint-Request.
 
 
-  14.9. Plugins
+  15.9. Plugins
   =============
 
 - Support for icons of plugins in the plugin manager dialog.
@@ -845,13 +876,13 @@ changed so we will just provide a bullet list of key new features here.
 - Removed ogr converter plugin - use 'save as' context menu rather.
 
 
-  14.10. Printing
+  15.10. Printing
   ===============
 
 - Undo/Redo support for the print composer
 
 
-  15. Whats new in Version 1.6.0 'Capiapo'?
+  16. Whats new in Version 1.6.0 'Capiapo'?
   =========================================
 
 Please note that this is a release in our 'cutting edge' release series. As
@@ -863,7 +894,7 @@ Once again it is impossible to document everything here that has changed so we w
 just provide a bullet list of key new features here.
 
 
-  15.1. General Improvements
+  16.1. General Improvements
   ==========================
 
 - Added gpsd support to live gps tracking.
@@ -897,7 +928,7 @@ caching providers (currently WMS and WFS) can synchronize with changes in
 the datasource.
 
 
-  15.2. Table of contents (TOC) improvements
+  16.2. Table of contents (TOC) improvements
   ==========================================
 
 - Added a new option to the raster legend menu that will stretch the current
@@ -907,14 +938,14 @@ as' option, you can now specify OGR creation options.
 - In the table of contents, it is now possible to select and remove several layers at once.
 
 
-  15.3. Labeling (New generation only)
+  16.3. Labeling (New generation only)
   ====================================
 
 - Data defined label position in labeling-ng.
 - Line wrapping, data defined font and buffer settings for labeling-ng.
 
 
-  15.4. Layer properties and symbology
+  16.4. Layer properties and symbology
   ====================================
 
 - Three new classification modes added to graduated symbol renderer (version
@@ -923,7 +954,7 @@ Breaks (based on pretty from the R statistical environment).
 [Read more...
 http://linfiniti.com/2010/09/new-class-breaks-for-graduated-symbols-in-qgis/]
 - Improved loading speed of the symbol properties dialog.
-- Data-defined rotation and size for categorized and graduated renderer (symbology-ng).
+- Data-defined rotation and size for categorized and graduated renderer (symbology).
 - Use size scale also for line symbols to modify line width.
 - Replaced raster histogram implementation with one based on Qwt. Added
 option to save histogram as image file. Show actual pixel values on x axis
@@ -935,7 +966,7 @@ the transparency table in the raster layer properties dialog.
 the style manager more easily.
 
 
-  15.5. Map Composer
+  16.5. Map Composer
   ==================
 
 - add capability to show and manipulate composer item width/ height in item
@@ -944,7 +975,7 @@ position dialog.
 - Sorting for composer attribute table (several columns and ascending / descending).
 
 
-  16. Whats new in Version 1.5.0?
+  17. Whats new in Version 1.5.0?
   ===============================
 
 Please note that this is a release in our 'cutting edge' release series. As
@@ -959,7 +990,7 @@ Once again it is impossible to document everything here that has changed so we w
 just provide a bullet list of key new features here.
 
 
-  16.1. Main GUI
+  17.1. Main GUI
   ==============
 
 - There is a new angle measuring tool that allows you to interactively
@@ -987,7 +1018,7 @@ pkgDataPath/composer_templates
 colors
 - Center map if user clicks into the map
 - New plugin for carrying out spatial selections
-- Data-defined size and rotation for single symbol renderer in symbology-ng
+- Data-defined size and rotation for single symbol renderer in symbology
 - IdentifyAsHtml to raster layer and use it in identify
 - Export legend groups and layers with legendinterface and use this
 information to display groups in the composer legend.
@@ -995,11 +1026,11 @@ information to display groups in the composer legend.
 - Query option added to layer menu to subset vector layers
 - Option to label only selected features (on the 'old' labeling tool)
 - Load/save queries created in the query builder.
-- Manual adding of categories in symbology-ng.
+- Manual adding of categories in symbology.
 - Georeferencer: possibility to configure if residuals should be showed in
 pixels or map units
 - Delimited text provider: allow empty values in numeric columns
-- Added rule-based renderer for symbology-ng
+- Added rule-based renderer for symbology
 - Ability to create spatial lite databases from within QGIS
 - Inclusion of GDAL Raster tools plugin into QGIS core
 - New python console (with history)
@@ -1014,7 +1045,7 @@ only visible features in composer table or all features
 closed and reappears when reactivated.
 
 
-  16.2. WMS and WMS-C Support
+  17.2. WMS and WMS-C Support
   ===========================
 
 - WMS-C support, new spatial authorities, wms selection improvements
@@ -1027,7 +1058,7 @@ IGNF definitions in srs.db
 - WMS-C scale slider gui added and more selection improvements
 
 
-  16.3. API Updates
+  17.3. API Updates
   =================
 
 - QgsDataProvider & QgsMapLayer: add dataChanged() signal, so that a
@@ -1044,7 +1075,7 @@ variables. More paths can be passed, separated by semicolon.
 - Support more GEOS operators
 
 
-  17. Whats new in Version 1.4.0 'Enceladus'?
+  18. Whats new in Version 1.4.0 'Enceladus'?
   ===========================================
 
 Please note that this is a release in our 'cutting edge' release series. As
@@ -1102,13 +1133,13 @@ For power users, you can now create customizable attribute forms using Qt
 Designer dialog UIs.
 
 
-  18. Whats new in Version 1.3.0 'Mimas'?
+  19. Whats new in Version 1.3.0 'Mimas'?
   =======================================
 
 This release includes over 30 bug fixes and several useful new features:
 
 
-  18.1. OSM plugin & provider updates
+  19.1. OSM plugin & provider updates
   =======================================
 
 - new OSM style files.
@@ -1120,7 +1151,7 @@ This release includes over 30 bug fixes and several useful new features:
 - other OSM related bugfixes.
 
 
-  18.2. Other notable features and improvements in this release
+  19.2. Other notable features and improvements in this release
   =============================================================
 
 - Marker size is now configurable when editing a layer.
@@ -1135,7 +1166,7 @@ This release includes over 30 bug fixes and several useful new features:
 - Zoom to a coordinate by entering it in the status bar coordinate display.
 
 
-  19. Version 1.2.0 'Daphnis'
+  20. Version 1.2.0 'Daphnis'
   ===========================
 
 Please note that this is a release in our 'cutting edge' release series. As 
@@ -1148,7 +1179,7 @@ over the QGIS 1.1.0 release. In addition we have added
 the following new features:
 
 
-  19.1. Editing
+  20.1. Editing
   =============
 
 Editing functionality in QGIS has had a major update in this release. This
@@ -1180,14 +1211,14 @@ this tool: the redraws are much faster and the map is not cluttered with
 markers. 
 
 
-  19.2. Keyboard shortcuts
+  20.2. Keyboard shortcuts
   ========================
 
 New feature: configure shortcuts for actions within main window of qgis!
 See menu Setting->Configure shortcuts
 
 
-  19.3. Map Composer
+  20.3. Map Composer
   ==================
 
 It is now possible to lock/unlock composer item positions by right mouse click.
@@ -1198,7 +1229,7 @@ It is now possible to keep the current layers in a composer map even if further
 layers are added to the main map. Export to PDF in composer is now possible.
 
 
-  19.4. Attribute tables
+  20.4. Attribute tables
   ======================
 
 It is now possible to search the attribute table within selected records only.
@@ -1214,7 +1245,7 @@ for layer attributes.  A new dialog allows loading a value map from a layer
 be respected in the attribute table.
 
 
-  19.5. Plugins
+  20.5. Plugins
   =============
 
 - The order of layers in the WMS dialog can now be changed.
@@ -1227,14 +1258,14 @@ be respected in the attribute table.
 - An new OpenStreetMap provider and plugin have been added to QGIS.
 
 
-  19.6. Projects Management
+  20.6. Projects Management
   =========================
 
 QGIS now includes support for  project relative position of file data sources
 and svgs. The saving of relative paths of file data sources is optional.
 
 
-  19.7. PostGIS & the PostgreSQL Provider
+  20.7. PostGIS & the PostgreSQL Provider
   =======================================
 
 You can now select the SSL mode when adding a new DB connection. Turning off
@@ -1243,7 +1274,7 @@ connection security is not required. Support has been added for more native
 types and for setting of column comments.
 
 
-  19.8. Symbology enhancements
+  20.8. Symbology enhancements
   ============================
 
 - allow refresh of symbols via popup menu on the renderer's symbol selection
@@ -1253,7 +1284,7 @@ types and for setting of column comments.
   independent of the mapscale)
 
 
-  19.9. Command line arguments
+  20.9. Command line arguments
   ============================
 
 Added command line argument support on windows.
@@ -1324,7 +1355,7 @@ implementation based on the SQLITE database.
 layers based on attribute data.
 
 
-  20. Version 1.0.0 'Kore'
+  21. Version 1.0.0 'Kore'
   ========================
 
 This release includes over 265 bug fixes and enhancements over the 
@@ -1353,7 +1384,7 @@ running will support a plugin that is being installed.
 - Ported all GDAL/OGR and GEOS usage to use C APIs only.
 
 
-  21. Version 0.11.0 'Metis'
+  22. Version 0.11.0 'Metis'
   ==========================
 
 This release includes over 60 bug fixes and enhancements over the 
@@ -1369,7 +1400,7 @@ QGIS 0.10.0 release. In addition we have made the following changes:
 - QML Style support for rasters and database layers
 
 
-  22. Version 0.10.0 'Io'
+  23. Version 0.10.0 'Io'
   =======================
 
 This release includes over 120 bug fixes and enhancements 
@@ -1390,7 +1421,7 @@ improvements 'under the hood'.
 - Support for migration of old projects to work in newer QGIS versions.
 
 
-  23. Version 0.9.2rc1 'Ganymede'
+  24. Version 0.9.2rc1 'Ganymede'
   ===============================
 
 - This release candidate includes over 40 bug fixes and enhancements 
@@ -1407,7 +1438,7 @@ in raster layers. Support for color ramps in raster layers.
 improvements 'under the hood'.
 
 
-  24. Version 0.9.1 'Ganymede'
+  25. Version 0.9.1 'Ganymede'
   ============================
 
 This is a bug fix release
@@ -1420,7 +1451,7 @@ This is a bug fix release
 - Python Plugin installer to install PyQGIS plugins from the repository
 
 
-  25. Version 0.9 'Ganymede'
+  26. Version 0.9 'Ganymede'
   ==========================
 
 - Python bindings - This is the major focus of this release
@@ -1435,7 +1466,7 @@ This is a bug fix release
 - Improvements to the GeoReferencer
 
 
-  26. Version 0.8 'Joesephine' .... development version
+  27. Version 0.8 'Joesephine' .... development version
   =====================================================
 
 - 2006-01-23 [timlinux] 0.7.9.10 Dropped use of qpicture and resampling for point markers in favour of
@@ -1459,7 +1490,7 @@ over time,
 grid_maker plugin
 
 
-  27. Version 0.6 'Simon'
+  28. Version 0.6 'Simon'
   =======================
 
 QGIS Change Log
@@ -1547,7 +1578,7 @@ under construction.
  save or save as (if not specified by the user). 
 
 
-  28. 0.5
+  29. 0.5
   =======
 
 - 2004-12-01 [gsherman] 0.5.0devel30 Added functions to qgsdataprovider.h to support updating the feature count
diff --git a/doc/news.html b/doc/news.html
index 77d3fe988f3..7b3a84255f7 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -5,7 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 <TITLE>QGIS News</TITLE>
 
-<!-- Included /home/fischer/src/qgis/doc/style.css -->
+<!-- Included /Users/mkuhn/dev/qgis/QGIS/doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,51 +77,85 @@ label{  background-color: #FFFFCC;
 <DIV CLASS="header" ID="header">
 <H1>QGIS News</H1>
 <H2>Change history for the QGIS Project</H2>
-<H3>Friday July 14, 2017</H3>
+<H3>Sunday August 13, 2017</H3>
 </DIV>
 
 <DIV CLASS="toc">
 
   <OL>
-  <LI><A HREF="#toc1">What's new in Version 2.16 'Nødebo'?</A>
-  <LI><A HREF="#toc2">What's new in Version 2.14 'Essen'?</A>
-  <LI><A HREF="#toc3">What's new in Version 2.12 'Lyon'?</A>
-  <LI><A HREF="#toc4">What's new in Version 2.10 'Pisa'?</A>
-  <LI><A HREF="#toc5">What's new in Version 2.8 'Wien'?</A>
-  <LI><A HREF="#toc6">What's new in Version 2.6.0 'Brighton'?</A>
-  <LI><A HREF="#toc7">What's new in Version 2.4.0 'Chugiak'?</A>
-  <LI><A HREF="#toc8">Whats new in Version 2.2.0 'Valmiera'?</A>
-  <LI><A HREF="#toc9">Whats new in Version 2.0.1 'Dufour'?</A>
-  <LI><A HREF="#toc10">Whats new in Version 2.0.0 'Dufour'?</A>
-  <LI><A HREF="#toc11">Whats new in Version 1.8.0 'Lisboa'?</A>
-  <LI><A HREF="#toc12">Whats new in Version 1.7.2 'Wroclaw'?</A>
-  <LI><A HREF="#toc13">Whats new in Version 1.7.1 'Wroclaw'?</A>
-  <LI><A HREF="#toc14">Whats new in Version 1.7.0 'Wroclaw'?</A>
-  <LI><A HREF="#toc15">Whats new in Version 1.6.0 'Capiapo'?</A>
-  <LI><A HREF="#toc16">Whats new in Version 1.5.0?</A>
-  <LI><A HREF="#toc17">Whats new in Version 1.4.0 'Enceladus'?</A>
-  <LI><A HREF="#toc18">Whats new in Version 1.3.0 'Mimas'?</A>
-  <LI><A HREF="#toc19">Version 1.2.0 'Daphnis'</A>
-  <LI><A HREF="#toc20">Version 1.0.0 'Kore'</A>
-  <LI><A HREF="#toc21">Version 0.11.0 'Metis'</A>
-  <LI><A HREF="#toc22">Version 0.10.0 'Io'</A>
-  <LI><A HREF="#toc23">Version 0.9.2rc1 'Ganymede'</A>
-  <LI><A HREF="#toc24">Version 0.9.1 'Ganymede'</A>
-  <LI><A HREF="#toc25">Version 0.9 'Ganymede'</A>
-  <LI><A HREF="#toc26">Version 0.8 'Joesephine' .... development version</A>
-  <LI><A HREF="#toc27">Version 0.6 'Simon'</A>
-  <LI><A HREF="#toc28">0.5</A>
+  <LI><A HREF="#toc1">What's new in Version 2.18 'Las Palmas'?</A>
+  <LI><A HREF="#toc2">What's new in Version 2.16 'Nødebo'?</A>
+  <LI><A HREF="#toc3">What's new in Version 2.14 'Essen'?</A>
+  <LI><A HREF="#toc4">What's new in Version 2.12 'Lyon'?</A>
+  <LI><A HREF="#toc5">What's new in Version 2.10 'Pisa'?</A>
+  <LI><A HREF="#toc6">What's new in Version 2.8 'Wien'?</A>
+  <LI><A HREF="#toc7">What's new in Version 2.6.0 'Brighton'?</A>
+  <LI><A HREF="#toc8">What's new in Version 2.4.0 'Chugiak'?</A>
+  <LI><A HREF="#toc9">Whats new in Version 2.2.0 'Valmiera'?</A>
+  <LI><A HREF="#toc10">Whats new in Version 2.0.1 'Dufour'?</A>
+  <LI><A HREF="#toc11">Whats new in Version 2.0.0 'Dufour'?</A>
+  <LI><A HREF="#toc12">Whats new in Version 1.8.0 'Lisboa'?</A>
+  <LI><A HREF="#toc13">Whats new in Version 1.7.2 'Wroclaw'?</A>
+  <LI><A HREF="#toc14">Whats new in Version 1.7.1 'Wroclaw'?</A>
+  <LI><A HREF="#toc15">Whats new in Version 1.7.0 'Wroclaw'?</A>
+  <LI><A HREF="#toc16">Whats new in Version 1.6.0 'Capiapo'?</A>
+  <LI><A HREF="#toc17">Whats new in Version 1.5.0?</A>
+  <LI><A HREF="#toc18">Whats new in Version 1.4.0 'Enceladus'?</A>
+  <LI><A HREF="#toc19">Whats new in Version 1.3.0 'Mimas'?</A>
+  <LI><A HREF="#toc20">Version 1.2.0 'Daphnis'</A>
+  <LI><A HREF="#toc21">Version 1.0.0 'Kore'</A>
+  <LI><A HREF="#toc22">Version 0.11.0 'Metis'</A>
+  <LI><A HREF="#toc23">Version 0.10.0 'Io'</A>
+  <LI><A HREF="#toc24">Version 0.9.2rc1 'Ganymede'</A>
+  <LI><A HREF="#toc25">Version 0.9.1 'Ganymede'</A>
+  <LI><A HREF="#toc26">Version 0.9 'Ganymede'</A>
+  <LI><A HREF="#toc27">Version 0.8 'Joesephine' .... development version</A>
+  <LI><A HREF="#toc28">Version 0.6 'Simon'</A>
+  <LI><A HREF="#toc29">0.5</A>
   </OL>
 
 </DIV>
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Friday July 14, 2017
-Last Change : Friday July 14, 2017
+Last Updated: Sunday August 13, 2017
+Last Change : Sunday August 13, 2017
 </P>
 
 <A NAME="toc1"></A>
-<H1>1. What's new in Version 2.16 'Nødebo'?</H1>
+<H1>1. What's new in Version 2.18 'Las Palmas'?</H1>
+
+<P>
+This release has following new features:
+</P>
+
+<UL>
+<LI>Symbology: Color picker is now embedded in layer style panel
+<LI>Labelling: Substitution list support for labeling
+<LI>Labelling: Improved line label placement algorithm
+<LI>Labelling: Label polygons using curved labels along perimeter
+<LI>Data Management: Add flag to only copy selected features
+<LI>Forms and Widgets: Allow controlling labels for individual edit widgets
+<LI>Forms and Widgets: Conditional visibility for tabs and group boxes
+<LI>Forms and Widgets: Client side default field values
+<LI>Map Composer: True North Arrows
+<LI>Processing: Point on surface algorithm  added
+<LI>Processing: New algorithm for geometry boundary
+<LI>Processing: New algorithm for calculating feature bounding box
+<LI>Processing: Processing dissolve algorithm accepts multiple fields
+<LI>Processing: Optimised processing clip algorithm
+<LI>Processing: New algorithm for merging connected lines
+<LI>General: Automatic links in identify results
+<LI>General: Mouse wheel over color dialog sliders
+<LI>General: Add custom color schemes to color button drop down menu
+<LI>Data Providers: Preview for WMTS + added XYZ tile layers
+<LI>QGIS Server: Possibility to segmentize feature info geometry in server
+<LI>Plugins: DB Manager: Add the ability to update SQL Layer
+<LI>Programmability: New expression functions
+<LI>Programmability: Expose GEOS linear referencing function to QgsGeometry
+</UL>
+
+<A NAME="toc2"></A>
+<H1>2. What's new in Version 2.16 'Nødebo'?</H1>
 
 <P>
 This release has following new features:
@@ -220,8 +254,8 @@ This release has following new features:
 <LI>Programmability: Plugins can add pages to vector layer properties
 </UL>
 
-<A NAME="toc2"></A>
-<H1>2. What's new in Version 2.14 'Essen'?</H1>
+<A NAME="toc3"></A>
+<H1>3. What's new in Version 2.14 'Essen'?</H1>
 
 <P>
 This release has following new features:
@@ -299,8 +333,8 @@ This release has following new features:
 <LI>User Interface : Show/hide all legend items via the the context menu
 </UL>
 
-<A NAME="toc3"></A>
-<H1>3. What's new in Version 2.12 'Lyon'?</H1>
+<A NAME="toc4"></A>
+<H1>4. What's new in Version 2.12 'Lyon'?</H1>
 
 <P>
 This release has following new features:
@@ -356,8 +390,8 @@ This release has following new features:
 <LI>Symbology : Add pixels as option for all symbology size unit choices
 </UL>
 
-<A NAME="toc4"></A>
-<H1>4. What's new in Version 2.10 'Pisa'?</H1>
+<A NAME="toc5"></A>
+<H1>5. What's new in Version 2.10 'Pisa'?</H1>
 
 <P>
 This is a minor release increment with the following new features:
@@ -407,8 +441,8 @@ This is a minor release increment with the following new features:
 <LI>User interface improvements.
 </UL>
 
-<A NAME="toc5"></A>
-<H1>5. What's new in Version 2.8 'Wien'?</H1>
+<A NAME="toc6"></A>
+<H1>6. What's new in Version 2.8 'Wien'?</H1>
 
 <P>
 This is a minor release increment with the following feature:
@@ -443,8 +477,8 @@ This is a minor release increment with the following feature:
   DescribeLayer, python plugins.
 </UL>
 
-<A NAME="toc6"></A>
-<H1>6. What's new in Version 2.6.0 'Brighton'?</H1>
+<A NAME="toc7"></A>
+<H1>7. What's new in Version 2.6.0 'Brighton'?</H1>
 
 <P>
 This is a minor release increment with the following new features:
@@ -492,8 +526,8 @@ This is a minor release increment with the following new features:
 <LI>Context menu for identify tool
 </UL>
 
-<A NAME="toc7"></A>
-<H1>7. What's new in Version 2.4.0 'Chugiak'?</H1>
+<A NAME="toc8"></A>
+<H1>8. What's new in Version 2.4.0 'Chugiak'?</H1>
 
 <P>
 This is the minor release sports a number of great new features:
@@ -515,8 +549,8 @@ This is the minor release sports a number of great new features:
 <LI>New Inverted Polygon renderer
 </UL>
 
-<A NAME="toc8"></A>
-<H1>8. Whats new in Version 2.2.0 'Valmiera'?</H1>
+<A NAME="toc9"></A>
+<H1>9. Whats new in Version 2.2.0 'Valmiera'?</H1>
 
 <P>
 This is the minor release sports a number of great new features:
@@ -559,8 +593,8 @@ This is the minor release sports a number of great new features:
 <LI>'Processing' can be used headless in scripts.
 </UL>
 
-<A NAME="toc9"></A>
-<H1>9. Whats new in Version 2.0.1 'Dufour'?</H1>
+<A NAME="toc10"></A>
+<H1>10. Whats new in Version 2.0.1 'Dufour'?</H1>
 
 <P>
 This is a small bugfix release to address the missing copyright / credits for
@@ -568,8 +602,8 @@ our new splash screen and to update supporting documentation. The spanish
 translation was also updated.
 </P>
 
-<A NAME="toc10"></A>
-<H1>10. Whats new in Version 2.0.0 'Dufour'?</H1>
+<A NAME="toc11"></A>
+<H1>11. Whats new in Version 2.0.0 'Dufour'?</H1>
 
 <P>
 This is a new major release. Building on the foundation of
@@ -657,8 +691,8 @@ key new features.
       you to explore the software and discover them all!
 </UL>
 
-<A NAME="toc11"></A>
-<H1>11. Whats new in Version 1.8.0 'Lisboa'?</H1>
+<A NAME="toc12"></A>
+<H1>12. Whats new in Version 1.8.0 'Lisboa'?</H1>
 
 <P>
 This is a new feature release. Building on the foundation of
@@ -715,8 +749,8 @@ added gdal_fillnodata to GDALTools plugin
 <LI>Support for nesting projects within other projects
 </UL>
 
-<A NAME="toc12"></A>
-<H1>12. Whats new in Version 1.7.2 'Wroclaw'?</H1>
+<A NAME="toc13"></A>
+<H1>13. Whats new in Version 1.7.2 'Wroclaw'?</H1>
 
 <P>
 This is a bugfix release over version 1.7.1. The following changes
@@ -765,8 +799,8 @@ were made.
 <LI>Fix broken Assign projection functionality in GDALTools and improve handling output file extension
 </UL>
 
-<A NAME="toc13"></A>
-<H1>13. Whats new in Version 1.7.1 'Wroclaw'?</H1>
+<A NAME="toc14"></A>
+<H1>14. Whats new in Version 1.7.1 'Wroclaw'?</H1>
 
 <P>
 This is a bugfix release over version 1.7.0. The following changes 
@@ -831,8 +865,8 @@ were made.
 <LI>Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi
 </UL>
 
-<A NAME="toc14"></A>
-<H1>14. Whats new in Version 1.7.0 'Wroclaw'?</H1>
+<A NAME="toc15"></A>
+<H1>15. Whats new in Version 1.7.0 'Wroclaw'?</H1>
 
 <P>
 This release is named after the town of Wroclaw in Poland. The Department of
@@ -850,7 +884,7 @@ enhancements. Once again it is impossible to document everything here that has
 changed so we will just provide a bullet list of key new features here.
 </P>
 
-<H2>14.1. Symbology labels and diagrams</H2>
+<H2>15.1. Symbology labels and diagrams</H2>
 
 <UL>
 <LI>New symbology now used by default!
@@ -868,7 +902,7 @@ changed so we will just provide a bullet list of key new features here.
 <LI>Move/rotate/change label edit tools to interactively change data defined label properties.
 </UL>
 
-<H2>14.2. New Tools</H2>
+<H2>15.2. New Tools</H2>
 
 <UL>
 <LI>Added GUI for gdaldem.
@@ -877,7 +911,7 @@ changed so we will just provide a bullet list of key new features here.
 <LI>Added voronoi polygon tool to Vector menu.
 </UL>
 
-<H2>14.3. User interface updates</H2>
+<H2>15.3. User interface updates</H2>
 
 <UL>
 <LI>Allow managing missing layers in a list.
@@ -888,7 +922,7 @@ changed so we will just provide a bullet list of key new features here.
 <LI>General clean-ups and usability improvements.
 </UL>
 
-<H2>14.4. CRS Handling</H2>
+<H2>15.4. CRS Handling</H2>
 
 <UL>
 <LI>Show active crs in status bar.
@@ -898,7 +932,7 @@ changed so we will just provide a bullet list of key new features here.
 <LI>Default to last selection when prompting for CRS.
 </UL>
 
-<H2>14.5. Rasters</H2>
+<H2>15.5. Rasters</H2>
 
 <UL>
 <LI>Added AND and OR operator for raster calculator
@@ -907,7 +941,7 @@ changed so we will just provide a bullet list of key new features here.
 <LI>Added raster toolbar with histogram stretch functions.
 </UL>
 
-<H2>14.6. Providers and Data Handling</H2>
+<H2>15.6. Providers and Data Handling</H2>
 
 <UL>
 <LI>New SQLAnywhere vector provider.
@@ -939,7 +973,7 @@ changed so we will just provide a bullet list of key new features here.
  </UL>
 </UL>
 
-<H2>14.7. Api and Developer Centric</H2>
+<H2>15.7. Api and Developer Centric</H2>
 
 <UL>
 <LI>Refactored attribute dialog calls to QgsFeatureAttribute.
@@ -951,7 +985,7 @@ changed so we will just provide a bullet list of key new features here.
   new QgsGeometry.validateGeometry function
 </UL>
 
-<H2>14.8. QGIS Mapserver</H2>
+<H2>15.8. QGIS Mapserver</H2>
 
 <UL>
 <LI>Ability to specify wms service capabilities in the properties 
@@ -959,7 +993,7 @@ changed so we will just provide a bullet list of key new features here.
 <LI>Support for wms printing with GetPrint-Request.
 </UL>
 
-<H2>14.9. Plugins</H2>
+<H2>15.9. Plugins</H2>
 
 <UL>
 <LI>Support for icons of plugins in the plugin manager dialog.
@@ -967,14 +1001,14 @@ changed so we will just provide a bullet list of key new features here.
 <LI>Removed ogr converter plugin - use 'save as' context menu rather.
 </UL>
 
-<H2>14.10. Printing</H2>
+<H2>15.10. Printing</H2>
 
 <UL>
 <LI>Undo/Redo support for the print composer
 </UL>
 
-<A NAME="toc15"></A>
-<H1>15. Whats new in Version 1.6.0 'Capiapo'?</H1>
+<A NAME="toc16"></A>
+<H1>16. Whats new in Version 1.6.0 'Capiapo'?</H1>
 
 <P>
 Please note that this is a release in our 'cutting edge' release series. As
@@ -987,7 +1021,7 @@ Once again it is impossible to document everything here that has changed so we w
 just provide a bullet list of key new features here.
 </P>
 
-<H2>15.1. General Improvements</H2>
+<H2>16.1. General Improvements</H2>
 
 <UL>
 <LI>Added gpsd support to live gps tracking.
@@ -1021,7 +1055,7 @@ caching providers (currently WMS and WFS) can synchronize with changes in
 the datasource.
 </UL>
 
-<H2>15.2. Table of contents (TOC) improvements</H2>
+<H2>16.2. Table of contents (TOC) improvements</H2>
 
 <UL>
 <LI>Added a new option to the raster legend menu that will stretch the current
@@ -1031,14 +1065,14 @@ as' option, you can now specify OGR creation options.
 <LI>In the table of contents, it is now possible to select and remove several layers at once.
 </UL>
 
-<H2>15.3. Labeling (New generation only)</H2>
+<H2>16.3. Labeling (New generation only)</H2>
 
 <UL>
 <LI>Data defined label position in labeling-ng.
 <LI>Line wrapping, data defined font and buffer settings for labeling-ng.
 </UL>
 
-<H2>15.4. Layer properties and symbology</H2>
+<H2>16.4. Layer properties and symbology</H2>
 
 <UL>
 <LI>Three new classification modes added to graduated symbol renderer (version
@@ -1059,7 +1093,7 @@ the transparency table in the raster layer properties dialog.
 the style manager more easily.
 </UL>
 
-<H2>15.5. Map Composer</H2>
+<H2>16.5. Map Composer</H2>
 
 <UL>
 <LI>add capability to show and manipulate composer item width/ height in item
@@ -1068,8 +1102,8 @@ position dialog.
 <LI>Sorting for composer attribute table (several columns and ascending / descending).
 </UL>
 
-<A NAME="toc16"></A>
-<H1>16. Whats new in Version 1.5.0?</H1>
+<A NAME="toc17"></A>
+<H1>17. Whats new in Version 1.5.0?</H1>
 
 <P>
 Please note that this is a release in our 'cutting edge' release series. As
@@ -1085,7 +1119,7 @@ Once again it is impossible to document everything here that has changed so we w
 just provide a bullet list of key new features here.
 </P>
 
-<H2>16.1. Main GUI</H2>
+<H2>17.1. Main GUI</H2>
 
 <UL>
 <LI>There is a new angle measuring tool that allows you to interactively
@@ -1140,7 +1174,7 @@ only visible features in composer table or all features
 closed and reappears when reactivated.
 </UL>
 
-<H2>16.2. WMS and WMS-C Support</H2>
+<H2>17.2. WMS and WMS-C Support</H2>
 
 <UL>
 <LI>WMS-C support, new spatial authorities, wms selection improvements
@@ -1153,7 +1187,7 @@ IGNF definitions in srs.db
 <LI>WMS-C scale slider gui added and more selection improvements
 </UL>
 
-<H2>16.3. API Updates</H2>
+<H2>17.3. API Updates</H2>
 
 <UL>
 <LI>QgsDataProvider &amp;amp; QgsMapLayer: add dataChanged() signal, so that a
@@ -1170,8 +1204,8 @@ variables. More paths can be passed, separated by semicolon.
 <LI>Support more GEOS operators
 </UL>
 
-<A NAME="toc17"></A>
-<H1>17. Whats new in Version 1.4.0 'Enceladus'?</H1>
+<A NAME="toc18"></A>
+<H1>18. Whats new in Version 1.4.0 'Enceladus'?</H1>
 
 <P>
 Please note that this is a release in our 'cutting edge' release series. As
@@ -1238,14 +1272,14 @@ For power users, you can now create customizable attribute forms using Qt
 Designer dialog UIs.
 </P>
 
-<A NAME="toc18"></A>
-<H1>18. Whats new in Version 1.3.0 'Mimas'?</H1>
+<A NAME="toc19"></A>
+<H1>19. Whats new in Version 1.3.0 'Mimas'?</H1>
 
 <P>
 This release includes over 30 bug fixes and several useful new features:
 </P>
 
-<H2>18.1. OSM plugin &amp;amp; provider updates</H2>
+<H2>19.1. OSM plugin &amp;amp; provider updates</H2>
 
 <UL>
 <LI>new OSM style files.
@@ -1257,7 +1291,7 @@ This release includes over 30 bug fixes and several useful new features:
 <LI>other OSM related bugfixes.
 </UL>
 
-<H2>18.2. Other notable features and improvements in this release</H2>
+<H2>19.2. Other notable features and improvements in this release</H2>
 
 <UL>
 <LI>Marker size is now configurable when editing a layer.
@@ -1272,8 +1306,8 @@ This release includes over 30 bug fixes and several useful new features:
 <LI>Zoom to a coordinate by entering it in the status bar coordinate display.
 </UL>
 
-<A NAME="toc19"></A>
-<H1>19. Version 1.2.0 'Daphnis'</H1>
+<A NAME="toc20"></A>
+<H1>20. Version 1.2.0 'Daphnis'</H1>
 
 <P>
 Please note that this is a release in our 'cutting edge' release series. As 
@@ -1286,7 +1320,7 @@ over the QGIS 1.1.0 release. In addition we have added
 the following new features:
 </P>
 
-<H2>19.1. Editing</H2>
+<H2>20.1. Editing</H2>
 
 <P>
 Editing functionality in QGIS has had a major update in this release. This
@@ -1324,14 +1358,14 @@ this tool: the redraws are much faster and the map is not cluttered with
 markers. 
 </P>
 
-<H2>19.2. Keyboard shortcuts</H2>
+<H2>20.2. Keyboard shortcuts</H2>
 
 <P>
 New feature: configure shortcuts for actions within main window of qgis!
 See menu Setting-&gt;Configure shortcuts
 </P>
 
-<H2>19.3. Map Composer</H2>
+<H2>20.3. Map Composer</H2>
 
 <P>
 It is now possible to lock/unlock composer item positions by right mouse click.
@@ -1342,7 +1376,7 @@ It is now possible to keep the current layers in a composer map even if further
 layers are added to the main map. Export to PDF in composer is now possible.
 </P>
 
-<H2>19.4. Attribute tables</H2>
+<H2>20.4. Attribute tables</H2>
 
 <P>
 It is now possible to search the attribute table within selected records only.
@@ -1359,7 +1393,7 @@ for layer attributes.  A new dialog allows loading a value map from a layer
 be respected in the attribute table.
 </P>
 
-<H2>19.5. Plugins</H2>
+<H2>20.5. Plugins</H2>
 
 <UL>
 <LI>The order of layers in the WMS dialog can now be changed.
@@ -1372,14 +1406,14 @@ be respected in the attribute table.
 <LI>An new OpenStreetMap provider and plugin have been added to QGIS.
 </UL>
 
-<H2>19.6. Projects Management</H2>
+<H2>20.6. Projects Management</H2>
 
 <P>
 QGIS now includes support for  project relative position of file data sources
 and svgs. The saving of relative paths of file data sources is optional.
 </P>
 
-<H2>19.7. PostGIS &amp; the PostgreSQL Provider</H2>
+<H2>20.7. PostGIS &amp; the PostgreSQL Provider</H2>
 
 <P>
 You can now select the SSL mode when adding a new DB connection. Turning off
@@ -1388,7 +1422,7 @@ connection security is not required. Support has been added for more native
 types and for setting of column comments.
 </P>
 
-<H2>19.8. Symbology enhancements</H2>
+<H2>20.8. Symbology enhancements</H2>
 
 <UL>
 <LI>allow refresh of symbols via popup menu on the renderer's symbol selection
@@ -1398,7 +1432,7 @@ types and for setting of column comments.
   independent of the mapscale)
 </UL>
 
-<H2>19.9. Command line arguments</H2>
+<H2>20.9. Command line arguments</H2>
 
 <P>
 Added command line argument support on windows.
@@ -1471,8 +1505,8 @@ implementation based on the SQLITE database.
 layers based on attribute data.
 </UL>
 
-<A NAME="toc20"></A>
-<H1>20. Version 1.0.0 'Kore'</H1>
+<A NAME="toc21"></A>
+<H1>21. Version 1.0.0 'Kore'</H1>
 
 <P>
 This release includes over 265 bug fixes and enhancements over the 
@@ -1503,8 +1537,8 @@ running will support a plugin that is being installed.
 <LI>Ported all GDAL/OGR and GEOS usage to use C APIs only.
 </UL>
 
-<A NAME="toc21"></A>
-<H1>21. Version 0.11.0 'Metis'</H1>
+<A NAME="toc22"></A>
+<H1>22. Version 0.11.0 'Metis'</H1>
 
 <P>
 This release includes over 60 bug fixes and enhancements over the 
@@ -1522,8 +1556,8 @@ QGIS 0.10.0 release. In addition we have made the following changes:
 <LI>QML Style support for rasters and database layers
 </UL>
 
-<A NAME="toc22"></A>
-<H1>22. Version 0.10.0 'Io'</H1>
+<A NAME="toc23"></A>
+<H1>23. Version 0.10.0 'Io'</H1>
 
 <P>
 This release includes over 120 bug fixes and enhancements 
@@ -1546,8 +1580,8 @@ improvements 'under the hood'.
 <LI>Support for migration of old projects to work in newer QGIS versions.
 </UL>
 
-<A NAME="toc23"></A>
-<H1>23. Version 0.9.2rc1 'Ganymede'</H1>
+<A NAME="toc24"></A>
+<H1>24. Version 0.9.2rc1 'Ganymede'</H1>
 
 <UL>
 <LI>This release candidate includes over 40 bug fixes and enhancements 
@@ -1564,8 +1598,8 @@ in raster layers. Support for color ramps in raster layers.
 improvements 'under the hood'.
 </UL>
 
-<A NAME="toc24"></A>
-<H1>24. Version 0.9.1 'Ganymede'</H1>
+<A NAME="toc25"></A>
+<H1>25. Version 0.9.1 'Ganymede'</H1>
 
 <P>
 This is a bug fix release
@@ -1580,8 +1614,8 @@ This is a bug fix release
 <LI>Python Plugin installer to install PyQGIS plugins from the repository
 </UL>
 
-<A NAME="toc25"></A>
-<H1>25. Version 0.9 'Ganymede'</H1>
+<A NAME="toc26"></A>
+<H1>26. Version 0.9 'Ganymede'</H1>
 
 <UL>
 <LI>Python bindings - This is the major focus of this release
@@ -1596,8 +1630,8 @@ This is a bug fix release
 <LI>Improvements to the GeoReferencer
 </UL>
 
-<A NAME="toc26"></A>
-<H1>26. Version 0.8 'Joesephine' .... development version</H1>
+<A NAME="toc27"></A>
+<H1>27. Version 0.8 'Joesephine' .... development version</H1>
 
 <UL>
 <LI>2006-01-23 [timlinux] 0.7.9.10 Dropped use of qpicture and resampling for point markers in favour of
@@ -1621,8 +1655,8 @@ over time,
 grid_maker plugin
 </UL>
 
-<A NAME="toc27"></A>
-<H1>27. Version 0.6 'Simon'</H1>
+<A NAME="toc28"></A>
+<H1>28. Version 0.6 'Simon'</H1>
 
 <P>
 QGIS Change Log
@@ -1716,8 +1750,8 @@ under construction.
  save or save as (if not specified by the user). 
 </UL>
 
-<A NAME="toc28"></A>
-<H1>28. 0.5</H1>
+<A NAME="toc29"></A>
+<H1>29. 0.5</H1>
 
 <UL>
 <LI>2004-12-01 [gsherman] 0.5.0devel30 Added functions to qgsdataprovider.h to support updating the feature count
@@ -3091,5 +3125,5 @@ July 6, 2002
 </DIV>
 
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-qt5/doc/news.html -t html /home/fischer/src/qgis/doc/news.t2t -->
+<!-- cmdline: txt2tags -\-encoding=utf-8 -o/Users/mkuhn/dev/qgis/build-QGIS-Desktop-RelWithDebInfo/doc/news.html -t html /Users/mkuhn/dev/qgis/QGIS/doc/news.t2t -->
 </BODY></HTML>
diff --git a/doc/news.t2t b/doc/news.t2t
index aca35082c6d..ffc81e7012b 100644
--- a/doc/news.t2t
+++ b/doc/news.t2t
@@ -38,6 +38,36 @@ Change history for the QGIS Project
 Last Updated: %%date(%A %B %d, %Y)
 Last Change : %%mtime(%A %B %d, %Y)
 
+= What's new in Version 2.18 'Las Palmas'? =
+
+This release has following new features:
+
+- Symbology: Color picker is now embedded in layer style panel
+- Labelling: Substitution list support for labeling
+- Labelling: Improved line label placement algorithm
+- Labelling: Label polygons using curved labels along perimeter
+- Data Management: Add flag to only copy selected features
+- Forms and Widgets: Allow controlling labels for individual edit widgets
+- Forms and Widgets: Conditional visibility for tabs and group boxes
+- Forms and Widgets: Client side default field values
+- Map Composer: True North Arrows
+- Processing: Point on surface algorithm  added
+- Processing: New algorithm for geometry boundary
+- Processing: New algorithm for calculating feature bounding box
+- Processing: Processing dissolve algorithm accepts multiple fields
+- Processing: Optimised processing clip algorithm
+- Processing: New algorithm for merging connected lines
+- General: Automatic links in identify results
+- General: Mouse wheel over color dialog sliders
+- General: Add custom color schemes to color button drop down menu
+- Data Providers: Preview for WMTS + added XYZ tile layers
+- QGIS Server: Possibility to segmentize feature info geometry in server
+- Plugins: DB Manager: Add the ability to update SQL Layer
+- Programmability: New expression functions
+- Programmability: Expose GEOS linear referencing function to QgsGeometry
+-
+
+
 = What's new in Version 2.16 'Nødebo'? =
 
 This release has following new features: