Update the install instructions

- The install doc is not available in documentation nor translated - SPIT plugin no longer exists - Mention versioning of instructions depending on branches
qgis · Mar 15, 2017 · 04508fc · 04508fc
1 parent 0607430
commit 04508fc
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 52 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,9 +1,9 @@
 QGIS
 Building QGIS from source - step by step
-Monday March 13, 2017
+Tuesday March 14, 2017
 
 
-Last Updated: Monday March 13, 2017
+Last Updated: Tuesday March 14, 2017
 Last Change : Monday March 13, 2017
 
 
@@ -61,22 +61,20 @@ liable to any duties or guarantees. The editors and publishers do not take
 any responsibility or liability for failures and their consequences. You are 
 always welcome for indicating possible mistakes.
 
-You can download this document as part of the QGIS 'User and 
-Installation Guide' in HTML and PDF format via http://qgis.org. A current 
-version is also available at:
-http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html
-
-Translations of this document can also be downloaded at the documentation area 
-of the QGIS project at http://qgis.org. More information is 
-available via http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources. 
+Because the code of QGIS evolves from release to release, These instructions are
+regularly updated to match the corresponding release. Instructions for the current
+master branch are available at
+http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html.
+If you wish to build another version of QGIS, ensure to checkout the appropriate
+release branch.
 
 Please visit http://qgis.org for information on joining our mailing lists 
 and getting involved in the project further.
 
 /!\ Note to document writers: Please use this document as the central
 place for describing build procedures. Please do not remove this notice. 
 
-/!\ Note to document writers: This documented is generated from 
+/!\ Note to document writers: This document is generated from 
 doc/INSTALL.t2t - if you need to edit this document, be sure to edit that 
 file rather than the generated INSTALL document found in the root of the 
 source directory.
@@ -117,7 +115,7 @@ Optional dependencies:
   is not installed with rpath. The desired GRASS version is chosen on runtime by setting
   LD_LIBRARY_PATH or PATH.
 - for georeferencer - GSL >= 1.8
-- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
+- for postgis support - PostgreSQL >= 8.0.x
 - for gps plugin - gpsbabel
 - for mapserver export and PyQGIS - Python >= 3.3
 - for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2

diff --git a/NEWS b/NEWS
@@ -1,6 +1,6 @@
 QGIS News
 Change history for the QGIS Project
-Wednesday February 22, 2017
+Tuesday March 14, 2017
 
 
 ------------------------------------------------------------------------
@@ -39,8 +39,8 @@ Wednesday February 22, 2017
 ------------------------------------------------------------------------
 
 
-Last Updated: Wednesday February 22, 2017
-Last Change : Tuesday January 31, 2017
+Last Updated: Tuesday March 14, 2017
+Last Change : Sunday March 12, 2017
 
 
   1. What's new in Version 2.16 'Nødebo'?
@@ -94,7 +94,7 @@ This release has following new features:
 - Map Composer: Parametrized svg support for composer svg images
 - Map Composer: Easier use of HTML in labels
 - Map Composer: Relative links in composer labels
-- Map Composer: Georeference outputs (eg PDF) from composer
+- Map Composer: Georeference outputs (e.g., PDF) from composer
 - Map Composer: Composer maps now auto-update with presets
 - Analysis tools: Named parameters in expressions
 - Analysis tools: More distance units
@@ -1055,7 +1055,7 @@ we recommend that you use a copy of QGIS from our Long Term Support (LTS)1.0.x
 release series. In all other cases we recommend that you use this version.
 
 This release includes around 200 bug fixes, nearly 30 new features and has had
-a lot of love and attention poured in to it to take our favorite desktop GIS
+a lot of love and attention poured into it to take our favorite desktop GIS
 application another step on the road to GIS nirvana! So much has happened in
 the 3 months since our last release that it is impossible to document
 everything here. Instead we will just highlight a couple of important new

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -5,7 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 <TITLE>QGIS</TITLE>
 
-<!-- Included /home/fischer/src/qgis/doc/style.css -->
+<!-- Included doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,12 +77,12 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Monday March 13, 2017</H3>
+<H3>Tuesday March 14, 2017</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Monday March 13, 2017
+Last Updated: Tuesday March 14, 2017
 Last Change : Monday March 13, 2017
 </P>
 <DIV CLASS="toc">
@@ -155,15 +155,12 @@ <H1>1. Introduction</H1>
 always welcome for indicating possible mistakes.
 </P>
 <P>
-You can download this document as part of the QGIS 'User and 
-Installation Guide' in HTML and PDF format via <A HREF="http://qgis.org">http://qgis.org</A>. A current 
-version is also available at:
-<A HREF="http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html">http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html</A>
-</P>
-<P>
-Translations of this document can also be downloaded at the documentation area 
-of the QGIS project at <A HREF="http://qgis.org">http://qgis.org</A>. More information is 
-available via <A HREF="http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources.">http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources.</A> 
+Because the code of QGIS evolves from release to release, These instructions are
+regularly updated to match the corresponding release. Instructions for the current
+master branch are available at
+<A HREF="http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html.">http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html.</A>
+If you wish to build another version of QGIS, ensure to checkout the appropriate
+release branch.
 </P>
 <P>
 Please visit <A HREF="http://qgis.org">http://qgis.org</A> for information on joining our mailing lists 
@@ -174,7 +171,7 @@ <H1>1. Introduction</H1>
 place for describing build procedures. Please do not remove this notice. 
 </P>
 <P>
-/!\ <B>Note to document writers:</B> This documented is generated from 
+/!\ <B>Note to document writers:</B> This document is generated from 
 doc/INSTALL.t2t - if you need to edit this document, be sure to edit that 
 file rather than the generated INSTALL document found in the root of the 
 source directory.
@@ -228,7 +225,7 @@ <H1>2. Overview</H1>
   is not installed with rpath. The desired GRASS version is chosen on runtime by setting
   LD_LIBRARY_PATH or PATH.
 <LI>for georeferencer - GSL &gt;= 1.8
-<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
+<LI>for postgis support - PostgreSQL &gt;= 8.0.x
 <LI>for gps plugin - gpsbabel
 <LI>for mapserver export and PyQGIS - Python &gt;= 3.3
 <LI>for python support - SIP &gt;= 4.12, PyQt &gt;= 5.3 must match Qt version, Qscintilla2
@@ -3027,5 +3024,5 @@ <H1>9. Authors and Acknowledgments</H1>
 
 </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/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
+<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
 </BODY></HTML>
diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t
@@ -50,7 +50,7 @@ Building QGIS from source - step by step
 %apply vim formatting to the whole document as it screws up some formatting
 %rather apply it selectively to paragraphs where needed.
 
-% To generate output fies from this document:
+% To generate output files from this document:
 % cmake --build $YOURBUILDDIR --target t2tdoc
 
 % End of comments
@@ -79,22 +79,20 @@ liable to any duties or guarantees. The editors and publishers do not take
 any responsibility or liability for failures and their consequences. You are 
 always welcome for indicating possible mistakes.
 
-You can download this document as part of the QGIS 'User and 
-Installation Guide' in HTML and PDF format via http://qgis.org. A current 
-version is also available at:
-http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html
-
-Translations of this document can also be downloaded at the documentation area 
-of the QGIS project at http://qgis.org. More information is 
-available via http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources. 
+Because the code of QGIS evolves from release to release, These instructions are
+regularly updated to match the corresponding release. Instructions for the current
+master branch are available at
+http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html.
+If you wish to build another version of QGIS, ensure to checkout the appropriate
+release branch.
 
 Please visit http://qgis.org for information on joining our mailing lists 
 and getting involved in the project further.
 
 /!\ **Note to document writers:** Please use this document as the central
 place for describing build procedures. Please do not remove this notice. 
 
-/!\ **Note to document writers:** This documented is generated from 
+/!\ **Note to document writers:** This document is generated from 
 doc/INSTALL.t2t - if you need to edit this document, be sure to edit that 
 file rather than the generated INSTALL document found in the root of the 
 source directory.

diff --git 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 doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,7 +77,7 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS News</H1>
 <H2>Change history for the QGIS Project</H2>
-<H3>Wednesday February 22, 2017</H3>
+<H3>Tuesday March 14, 2017</H3>
 </DIV>
 
 <DIV CLASS="toc">
@@ -116,8 +116,8 @@ <H3>Wednesday February 22, 2017</H3>
 </DIV>
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Wednesday February 22, 2017
-Last Change : Tuesday January 31, 2017
+Last Updated: Tuesday March 14, 2017
+Last Change : Sunday March 12, 2017
 </P>
 
 <A NAME="toc1"></A>
@@ -174,7 +174,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
 <LI>Map Composer: Parametrized svg support for composer svg images
 <LI>Map Composer: Easier use of HTML in labels
 <LI>Map Composer: Relative links in composer labels
-<LI>Map Composer: Georeference outputs (eg PDF) from composer
+<LI>Map Composer: Georeference outputs (e.g., PDF) from composer
 <LI>Map Composer: Composer maps now auto-update with presets
 <LI>Analysis tools: Named parameters in expressions
 <LI>Analysis tools: More distance units
@@ -1183,7 +1183,7 @@ <H1>17. Whats new in Version 1.4.0 'Enceladus'?</H1>
 </P>
 <P>
 This release includes around 200 bug fixes, nearly 30 new features and has had
-a lot of love and attention poured in to it to take our favorite desktop GIS
+a lot of love and attention poured into it to take our favorite desktop GIS
 application another step on the road to GIS nirvana! So much has happened in
 the 3 months since our last release that it is impossible to document
 everything here. Instead we will just highlight a couple of important new
@@ -3091,5 +3091,5 @@ <H1>28. 0.5</H1>
 </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 doc/news.html -t html doc/news.t2t -->
 </BODY></HTML>
diff --git a/doc/news.t2t b/doc/news.t2t
@@ -88,7 +88,7 @@ This release has following new features:
 - Map Composer: Parametrized svg support for composer svg images
 - Map Composer: Easier use of HTML in labels
 - Map Composer: Relative links in composer labels
-- Map Composer: Georeference outputs (eg PDF) from composer
+- Map Composer: Georeference outputs (e.g., PDF) from composer
 - Map Composer: Composer maps now auto-update with presets
 - Analysis tools: Named parameters in expressions
 - Analysis tools: More distance units
@@ -1023,7 +1023,7 @@ release series. In all other cases we recommend that you use this version.
 
 
 This release includes around 200 bug fixes, nearly 30 new features and has had
-a lot of love and attention poured in to it to take our favorite desktop GIS
+a lot of love and attention poured into it to take our favorite desktop GIS
 application another step on the road to GIS nirvana! So much has happened in
 the 3 months since our last release that it is impossible to document
 everything here. Instead we will just highlight a couple of important new

diff --git a/doc/overview.t2t b/doc/overview.t2t
@@ -35,7 +35,7 @@ Optional dependencies:
   is not installed with rpath. The desired GRASS version is chosen on runtime by setting
   LD_LIBRARY_PATH or PATH.
 - for georeferencer - GSL >= 1.8
-- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
+- for postgis support - PostgreSQL >= 8.0.x
 - for gps plugin - gpsbabel
 - for mapserver export and PyQGIS - Python >= 3.3
 - for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2