qgis
diff --git a/‎INSTALL
+5-4 b/‎INSTALL
+5-4
diff --git a/‎NEWS
+13-45 b/‎NEWS
+13-45
diff --git a/‎doc/CODING.html
+1-1 b/‎doc/CODING.html
+1-1
diff --git a/‎doc/CODING.t2t
+1-1 b/‎doc/CODING.t2t
+1-1
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Thursday February 12, 2015
+Wednesday February 25, 2015
 
 
-Last Updated: Thursday February 12, 2015
-Last Change : Monday November 24, 2014
+Last Updated: Wednesday February 25, 2015
+Last Change : Wednesday February 25, 2015
 
 
   1. Introduction
@@ -180,9 +180,10 @@ Now update your local sources database:
   | precise | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
   | trusty | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
   | utopic | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | vivid | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
   | sid | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales pkg-config poppler-utils pyqt4-dev-tools pyqt4.qsci-dev python-all python-all-dev python-qscintilla2 python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
 
-(extracted from the respective control files in debian/)
+(extracted from the control.in file in debian/)
 
 
   3.4. Setup ccache (Optional)
 
@@ -1,11 +1,12 @@
 QGIS News
 Change history for the QGIS Project
-Friday February 20, 2015
+Wednesday February 25, 2015
 
 
 ------------------------------------------------------------------------
 
-  1. What's new in Version 2.8.0 'Wien'?
+
+  1. What's new in Version 2.8 'Wien'?
   2. What's new in Version 2.6.0 'Brighton'?
   3. What's new in Version 2.4.0 'Chugiak'?
   4. Whats new in Version 2.2.0 'Valmiera'?
@@ -33,12 +34,13 @@ Friday February 20, 2015
 
 ------------------------------------------------------------------------
 
-Last Updated: Friday February 20, 2015
-Last Change : Friday February 20, 2015
+
+Last Updated: Wednesday February 25, 2015
+Last Change : Wednesday February 25, 2015
 
 
-  1. What's new in Version 2.8.0 'Wien'?
-  ======================================
+  1. What's new in Version 2.8 'Wien'?
+  ====================================
 
 This is a minor release increment with the following feature:
 
@@ -57,7 +59,7 @@ This is a minor release increment with the following feature:
 - Qt5 support (optional - default packages are still currently built against Qt4).
 - Spatial bookmark import/export.
 - Composer user interface improvements.
-- Grid overlay improvements for composer maps. 
+- Grid overlay improvements for composer maps.
 - Raster image fill type.
 - Live heatmap renderer.
 - You can now use multiple styles per layer.
@@ -66,8 +68,8 @@ This is a minor release increment with the following feature:
 - New algorithms in processing.
 - Expressions are now extendable with custom python functions.
 - Comments are now supported in expressions.
-- QGIS server improvements: better caching, layer style support, value relations, DescribeLayer, python plugins.
-
+- QGIS server improvements: better caching, layer style support, value relations,
+  DescribeLayer, python plugins.
 
 
   2. What's new in Version 2.6.0 'Brighton'?
@@ -116,7 +118,6 @@ This is a minor release increment with the following new features:
 - Context menu for identify tool
 
 
-
   3. What's new in Version 2.4.0 'Chugiak'?
   =========================================
 
@@ -137,7 +138,6 @@ This is the minor release sports a number of great new features:
 - New Inverted Polygon renderer
 
 
-
   4. Whats new in Version 2.2.0 'Valmiera'?
   =========================================
 
@@ -179,7 +179,6 @@ This is the minor release sports a number of great new features:
 - 'Processing' can be used headless in scripts.
 
 
-
   5. Whats new in Version 2.0.1 'Dufour'?
   =======================================
 
@@ -329,7 +328,6 @@ added gdal_fillnodata to GDALTools plugin
 - Support for nesting projects within other projects
 
 
-
   8. Whats new in Version 1.7.2 'Wroclaw'?
   ========================================
 
@@ -377,7 +375,6 @@ were made.
 - Fix broken Assign projection functionality in GDALTools and improve handling output file extension
 
 
-
   9. Whats new in Version 1.7.1 'Wroclaw'?
   ========================================
 
@@ -476,7 +473,6 @@ 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.
 
 
-
   10.2. New Tools
   ===============
 
@@ -507,7 +503,6 @@ changed so we will just provide a bullet list of key new features here.
 - Default to last selection when prompting for CRS.
 
 
-
   10.5. Rasters
   =============
 
@@ -517,7 +512,6 @@ changed so we will just provide a bullet list of key new features here.
 - Added raster toolbar with histogram stretch functions.
 
 
-
   10.6. Providers and Data Handling
   =================================
 
@@ -544,7 +538,6 @@ changed so we will just provide a bullet list of key new features here.
  - Allow OGR 'save as' without attributes (for eg. DGN/DXF).
 
 
-
   10.7. Api and Developer Centric
   ===============================
 
@@ -573,14 +566,12 @@ changed so we will just provide a bullet list of key new features here.
 - Removed ogr converter plugin - use 'save as' context menu rather.
 
 
-
   10.10. Printing
   ===============
 
 - Undo/Redo support for the print composer
 
 
-
   11. Whats new in Version 1.6.0 'Capiapo'?
   =========================================
 
@@ -627,7 +618,6 @@ caching providers (currently WMS and WFS) can synchronize with changes in
 the datasource.
 
 
-
   11.2. Table of contents (TOC) improvements
   ==========================================
 
@@ -638,7 +628,6 @@ 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.
 
 
-
   11.3. Labelling (New generation only)
   =====================================
 
@@ -667,7 +656,6 @@ the transparency table in the raster layer properties dialog.
 the style manager more easily.
 
 
-
   11.5. Map Composer
   ==================
 
@@ -677,7 +665,6 @@ position dialog.
 - Sorting for composer attribute table (several columns and ascending / descending).
 
 
-
   12. Whats new in Version 1.5.0?
   ===============================
 
@@ -748,7 +735,6 @@ only visible features in composer table or all features
 closed and reappears when reactivated.
 
 
-
   12.2. WMS and WMS-C Support
   ===========================
 
@@ -762,7 +748,6 @@ IGNF definitions in srs.db
 - WMS-C scale slider gui added and more selection improvements
 
 
-
   12.3. API Updates
   =================
 
@@ -780,7 +765,6 @@ variables. More paths can be passed, separated by semicolon.
 - Support more GEOS operators
 
 
-
   13. Whats new in Version 1.4.0 'Enceladus'?
   ===========================================
 
@@ -857,7 +841,6 @@ This release includes over 30 bug fixes and several useful new features:
 - other OSM related bugfixes.
 
 
-
   14.2. Other notable features and improvements in this release
   =============================================================
 
@@ -873,7 +856,6 @@ 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.
 
 
-
   15. Version 1.2.0 'Daphnis'
   ===========================
 
@@ -902,7 +884,6 @@ includes the addition of new vector editing tools:
 - Added option to show only markers of selected features in editing mode.
 - Change layer's icon in legend to reflext that the layer is editable.
 
-
 In addition, there are undo/redo actions in Edit menu, in Advanced digitizing toolbar
 and there is a new dock widget displaying undo stack of active layer.
 
@@ -967,7 +948,6 @@ be respected in the attribute table.
 - An new OpenStreetMap provider and plugin have been added to QGIS.
 
 
-
   15.6. Projects Management
   =========================
 
@@ -994,7 +974,6 @@ types and for setting of column comments.
   independent of the mapscale)
 
 
-
   15.9. Command line arguments
   ============================
 
@@ -1066,7 +1045,6 @@ implementation based on the SQLITE database.
 layers based on attribute data.
 
 
-
   16. Version 1.0.0 'Kore'
   ========================
 
@@ -1096,7 +1074,6 @@ running will support a plugin that is being installed.
 - Ported all GDAL/OGR and GEOS usage to use C APIs only.
 
 
-
   17. Version 0.11.0 'Metis'
   ==========================
 
@@ -1113,7 +1090,6 @@ QGIS 0.10.0 release. In addition we have made the following changes:
 - QML Style support for rasters and database layers
 
 
-
   18. Version 0.10.0 'Io'
   =======================
 
@@ -1135,7 +1111,6 @@ improvements 'under the hood'.
 - Support for migration of old projects to work in newer QGIS versions.
 
 
-
   19. Version 0.9.2rc1 'Ganymede'
   ===============================
 
@@ -1153,7 +1128,6 @@ in raster layers. Support for color ramps in raster layers.
 improvements 'under the hood'.
 
 
-
   20. Version 0.9.1 'Ganymede'
   ============================
 
@@ -1167,7 +1141,6 @@ This is a bug fix release
 - Python Plugin installer to install PyQGIS plugins from the repository
 
 
-
   21. Version 0.9 'Ganymede'
   ==========================
 
@@ -1183,7 +1156,6 @@ This is a bug fix release
 - Improvements to the GeoReferencer
 
 
-
   22. Version 0.8 'Joesephine' .... development version
   =====================================================
 
@@ -1208,7 +1180,6 @@ over time,
 grid_maker plugin
 
 
-
   23. Version 0.6 'Simon'
   =======================
 
@@ -2109,7 +2080,6 @@ including:
 - currently this process IS NOT KNOWN TO BE REVERSIBLE so please backup data
 first before experimenting.
 
-
 2004-04-27 [ts] 0.2.0devel1
 
 Rejigged single marker symbol so directory, icon selector, preview and 
@@ -2343,7 +2313,9 @@ Search radius for identifying features on vector layers added to Preferences
 2004-02-23 [ts]
 Save current view to disk as a PNG image
 
+
 ------------------------------------------------------------------------------
+
 Version 0.1 'Moroz' February 25, 2004
 User interface improvements - menu and dialog cleanups and a new icon theme
   based on Everaldo's Crystal icon set.
@@ -2488,7 +2460,3 @@ July 6, 2002
 
   This is the initial import of the code base into CVS on Sourceforge.net.
 
-
-
-
-
@@ -1375,7 +1375,7 @@ <H2>3.2. Creating a unit test</H2>
 
 <div class="code"><PRE>
 QTEST_MAIN(TestQgsRasterLayer)
-#include "moc_testqgsrasterlayer.cxx"
+#include "testqgsrasterlayer.moc"
 </PRE></div>
 
 <P>
 
@@ -1047,7 +1047,7 @@ add to our test class:
 
 ```
 QTEST_MAIN(TestQgsRasterLayer)
-#include "moc_testqgsrasterlayer.cxx"
+#include "testqgsrasterlayer.moc"
 ```
 
 The purpose of these two lines is to signal to Qt's moc that his is a QtTest