Skip to content

Commit 04508fc

Browse files
DelazJm-kuhn
authored andcommittedMar 15, 2017
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
1 parent 0607430 commit 04508fc

File tree

7 files changed

+45
-52
lines changed

7 files changed

+45
-52
lines changed
 

‎INSTALL

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Monday March 13, 2017
3+
Tuesday March 14, 2017
44

55

6-
Last Updated: Monday March 13, 2017
6+
Last Updated: Tuesday March 14, 2017
77
Last Change : Monday March 13, 2017
88

99

@@ -61,22 +61,20 @@ liable to any duties or guarantees. The editors and publishers do not take
6161
any responsibility or liability for failures and their consequences. You are
6262
always welcome for indicating possible mistakes.
6363

64-
You can download this document as part of the QGIS 'User and
65-
Installation Guide' in HTML and PDF format via http://qgis.org. A current
66-
version is also available at:
67-
http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html
68-
69-
Translations of this document can also be downloaded at the documentation area
70-
of the QGIS project at http://qgis.org. More information is
71-
available via http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources.
64+
Because the code of QGIS evolves from release to release, These instructions are
65+
regularly updated to match the corresponding release. Instructions for the current
66+
master branch are available at
67+
http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html.
68+
If you wish to build another version of QGIS, ensure to checkout the appropriate
69+
release branch.
7270

7371
Please visit http://qgis.org for information on joining our mailing lists
7472
and getting involved in the project further.
7573

7674
/!\ Note to document writers: Please use this document as the central
7775
place for describing build procedures. Please do not remove this notice.
7876

79-
/!\ Note to document writers: This documented is generated from
77+
/!\ Note to document writers: This document is generated from
8078
doc/INSTALL.t2t - if you need to edit this document, be sure to edit that
8179
file rather than the generated INSTALL document found in the root of the
8280
source directory.
@@ -117,7 +115,7 @@ Optional dependencies:
117115
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
118116
LD_LIBRARY_PATH or PATH.
119117
- for georeferencer - GSL >= 1.8
120-
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
118+
- for postgis support - PostgreSQL >= 8.0.x
121119
- for gps plugin - gpsbabel
122120
- for mapserver export and PyQGIS - Python >= 3.3
123121
- for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2

‎NEWS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QGIS News
22
Change history for the QGIS Project
3-
Wednesday February 22, 2017
3+
Tuesday March 14, 2017
44

55

66
------------------------------------------------------------------------
@@ -39,8 +39,8 @@ Wednesday February 22, 2017
3939
------------------------------------------------------------------------
4040

4141

42-
Last Updated: Wednesday February 22, 2017
43-
Last Change : Tuesday January 31, 2017
42+
Last Updated: Tuesday March 14, 2017
43+
Last Change : Sunday March 12, 2017
4444

4545

4646
1. What's new in Version 2.16 'Nødebo'?
@@ -94,7 +94,7 @@ This release has following new features:
9494
- Map Composer: Parametrized svg support for composer svg images
9595
- Map Composer: Easier use of HTML in labels
9696
- Map Composer: Relative links in composer labels
97-
- Map Composer: Georeference outputs (eg PDF) from composer
97+
- Map Composer: Georeference outputs (e.g., PDF) from composer
9898
- Map Composer: Composer maps now auto-update with presets
9999
- Analysis tools: Named parameters in expressions
100100
- 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
10551055
release series. In all other cases we recommend that you use this version.
10561056

10571057
This release includes around 200 bug fixes, nearly 30 new features and has had
1058-
a lot of love and attention poured in to it to take our favorite desktop GIS
1058+
a lot of love and attention poured into it to take our favorite desktop GIS
10591059
application another step on the road to GIS nirvana! So much has happened in
10601060
the 3 months since our last release that it is impossible to document
10611061
everything here. Instead we will just highlight a couple of important new

‎doc/INSTALL.html

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
66
<TITLE>QGIS</TITLE>
77

8-
<!-- Included /home/fischer/src/qgis/doc/style.css -->
8+
<!-- Included doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,12 +77,12 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Monday March 13, 2017</H3>
80+
<H3>Tuesday March 14, 2017</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Monday March 13, 2017
85+
Last Updated: Tuesday March 14, 2017
8686
Last Change : Monday March 13, 2017
8787
</P>
8888
<DIV CLASS="toc">
@@ -155,15 +155,12 @@ <H1>1. Introduction</H1>
155155
always welcome for indicating possible mistakes.
156156
</P>
157157
<P>
158-
You can download this document as part of the QGIS 'User and
159-
Installation Guide' in HTML and PDF format via <A HREF="http://qgis.org">http://qgis.org</A>. A current
160-
version is also available at:
161-
<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>
162-
</P>
163-
<P>
164-
Translations of this document can also be downloaded at the documentation area
165-
of the QGIS project at <A HREF="http://qgis.org">http://qgis.org</A>. More information is
166-
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>
158+
Because the code of QGIS evolves from release to release, These instructions are
159+
regularly updated to match the corresponding release. Instructions for the current
160+
master branch are available at
161+
<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>
162+
If you wish to build another version of QGIS, ensure to checkout the appropriate
163+
release branch.
167164
</P>
168165
<P>
169166
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>
174171
place for describing build procedures. Please do not remove this notice.
175172
</P>
176173
<P>
177-
/!\ <B>Note to document writers:</B> This documented is generated from
174+
/!\ <B>Note to document writers:</B> This document is generated from
178175
doc/INSTALL.t2t - if you need to edit this document, be sure to edit that
179176
file rather than the generated INSTALL document found in the root of the
180177
source directory.
@@ -228,7 +225,7 @@ <H1>2. Overview</H1>
228225
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
229226
LD_LIBRARY_PATH or PATH.
230227
<LI>for georeferencer - GSL &gt;= 1.8
231-
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
228+
<LI>for postgis support - PostgreSQL &gt;= 8.0.x
232229
<LI>for gps plugin - gpsbabel
233230
<LI>for mapserver export and PyQGIS - Python &gt;= 3.3
234231
<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>
30273024

30283025
</DIV>
30293026
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3030-
<!-- 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 -->
3027+
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
30313028
</BODY></HTML>

‎doc/INSTALL.t2t

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Building QGIS from source - step by step
5050
%apply vim formatting to the whole document as it screws up some formatting
5151
%rather apply it selectively to paragraphs where needed.
5252

53-
% To generate output fies from this document:
53+
% To generate output files from this document:
5454
% cmake --build $YOURBUILDDIR --target t2tdoc
5555

5656
% End of comments
@@ -79,22 +79,20 @@ liable to any duties or guarantees. The editors and publishers do not take
7979
any responsibility or liability for failures and their consequences. You are
8080
always welcome for indicating possible mistakes.
8181

82-
You can download this document as part of the QGIS 'User and
83-
Installation Guide' in HTML and PDF format via http://qgis.org. A current
84-
version is also available at:
85-
http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html
86-
87-
Translations of this document can also be downloaded at the documentation area
88-
of the QGIS project at http://qgis.org. More information is
89-
available via http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources.
82+
Because the code of QGIS evolves from release to release, These instructions are
83+
regularly updated to match the corresponding release. Instructions for the current
84+
master branch are available at
85+
http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html.
86+
If you wish to build another version of QGIS, ensure to checkout the appropriate
87+
release branch.
9088

9189
Please visit http://qgis.org for information on joining our mailing lists
9290
and getting involved in the project further.
9391

9492
/!\ **Note to document writers:** Please use this document as the central
9593
place for describing build procedures. Please do not remove this notice.
9694

97-
/!\ **Note to document writers:** This documented is generated from
95+
/!\ **Note to document writers:** This document is generated from
9896
doc/INSTALL.t2t - if you need to edit this document, be sure to edit that
9997
file rather than the generated INSTALL document found in the root of the
10098
source directory.

‎doc/news.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
66
<TITLE>QGIS News</TITLE>
77

8-
<!-- Included /home/fischer/src/qgis/doc/style.css -->
8+
<!-- Included doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,7 +77,7 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS News</H1>
7979
<H2>Change history for the QGIS Project</H2>
80-
<H3>Wednesday February 22, 2017</H3>
80+
<H3>Tuesday March 14, 2017</H3>
8181
</DIV>
8282

8383
<DIV CLASS="toc">
@@ -116,8 +116,8 @@ <H3>Wednesday February 22, 2017</H3>
116116
</DIV>
117117
<DIV CLASS="body" ID="body">
118118
<P>
119-
Last Updated: Wednesday February 22, 2017
120-
Last Change : Tuesday January 31, 2017
119+
Last Updated: Tuesday March 14, 2017
120+
Last Change : Sunday March 12, 2017
121121
</P>
122122

123123
<A NAME="toc1"></A>
@@ -174,7 +174,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
174174
<LI>Map Composer: Parametrized svg support for composer svg images
175175
<LI>Map Composer: Easier use of HTML in labels
176176
<LI>Map Composer: Relative links in composer labels
177-
<LI>Map Composer: Georeference outputs (eg PDF) from composer
177+
<LI>Map Composer: Georeference outputs (e.g., PDF) from composer
178178
<LI>Map Composer: Composer maps now auto-update with presets
179179
<LI>Analysis tools: Named parameters in expressions
180180
<LI>Analysis tools: More distance units
@@ -1183,7 +1183,7 @@ <H1>17. Whats new in Version 1.4.0 'Enceladus'?</H1>
11831183
</P>
11841184
<P>
11851185
This release includes around 200 bug fixes, nearly 30 new features and has had
1186-
a lot of love and attention poured in to it to take our favorite desktop GIS
1186+
a lot of love and attention poured into it to take our favorite desktop GIS
11871187
application another step on the road to GIS nirvana! So much has happened in
11881188
the 3 months since our last release that it is impossible to document
11891189
everything here. Instead we will just highlight a couple of important new
@@ -3091,5 +3091,5 @@ <H1>28. 0.5</H1>
30913091
</DIV>
30923092

30933093
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3094-
<!-- 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 -->
3094+
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/news.html -t html doc/news.t2t -->
30953095
</BODY></HTML>

‎doc/news.t2t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ This release has following new features:
8888
- Map Composer: Parametrized svg support for composer svg images
8989
- Map Composer: Easier use of HTML in labels
9090
- Map Composer: Relative links in composer labels
91-
- Map Composer: Georeference outputs (eg PDF) from composer
91+
- Map Composer: Georeference outputs (e.g., PDF) from composer
9292
- Map Composer: Composer maps now auto-update with presets
9393
- Analysis tools: Named parameters in expressions
9494
- Analysis tools: More distance units
@@ -1023,7 +1023,7 @@ release series. In all other cases we recommend that you use this version.
10231023

10241024

10251025
This release includes around 200 bug fixes, nearly 30 new features and has had
1026-
a lot of love and attention poured in to it to take our favorite desktop GIS
1026+
a lot of love and attention poured into it to take our favorite desktop GIS
10271027
application another step on the road to GIS nirvana! So much has happened in
10281028
the 3 months since our last release that it is impossible to document
10291029
everything here. Instead we will just highlight a couple of important new

‎doc/overview.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Optional dependencies:
3535
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
3636
LD_LIBRARY_PATH or PATH.
3737
- for georeferencer - GSL >= 1.8
38-
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
38+
- for postgis support - PostgreSQL >= 8.0.x
3939
- for gps plugin - gpsbabel
4040
- for mapserver export and PyQGIS - Python >= 3.3
4141
- for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2

0 commit comments

Comments
 (0)
Please sign in to comment.