Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
update t2tdoc outputs (INSTALL, NEWS; followup 0d9945d)
  • Loading branch information
jef-n committed Jul 14, 2017
1 parent bf94df8 commit 9c08d00
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 30 deletions.
10 changes: 5 additions & 5 deletions INSTALL
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Saturday July 08, 2017
Friday July 14, 2017


Last Updated: Saturday July 08, 2017
Last Change : Tuesday July 04, 2017
Last Updated: Friday July 14, 2017
Last Change : Friday July 14, 2017


1. Introduction
Expand Down Expand Up @@ -1246,9 +1246,9 @@ http://www.kyngchaos.com/software/frameworks
Once downloaded, open and install the frameworks.

William provides an additional installer package for PostgreSQL (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:
package. It's available here:

http://www.kyngchaos.com/software/postgres

Expand Down
6 changes: 3 additions & 3 deletions NEWS
@@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Saturday April 29, 2017
Friday July 14, 2017


------------------------------------------------------------------------
Expand Down Expand Up @@ -39,8 +39,8 @@ Saturday April 29, 2017
------------------------------------------------------------------------


Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017
Last Updated: Friday July 14, 2017
Last Change : Friday July 14, 2017


1. What's new in Version 2.16 'Nødebo'?
Expand Down
23 changes: 8 additions & 15 deletions doc/INSTALL.html
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Tuesday June 27, 2017</H3>
<H3>Friday July 14, 2017</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday June 27, 2017
Last Change : Tuesday June 27, 2017
Last Updated: Friday July 14, 2017
Last Change : Friday July 14, 2017
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -433,7 +433,7 @@ <H2>3.7. Starting the compile</H2>
interactive dialog.
</P>
<P>
/!\ <B>Warning:</B> Make sure that your build directory is completely empty when you
/!\ <B>Warning:</B> Make sure that your build directory is completely empty when you
enter the command. Do never try to "re-use" an existing <B>Qt4</B> build directory.
If you want to use `ccmake` or other interactive tools, run the command in
the empty build directory once before starting to use the interactive tools.
Expand Down Expand Up @@ -590,14 +590,7 @@ <H2>3.9. On Fedora Linux</H2>
<H3>3.9.1. Install build dependencies</H3>

<div class="code"><PRE>
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel
qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5
clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel
qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel
qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OSWLib
qca-qt5-ossl
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OSWLib qca-qt5-ossl
</PRE></div>

<P>
Expand Down Expand Up @@ -1734,7 +1727,7 @@ <H2>5.4. Install development frameworks for QGIS dependencies</H2>

<P>
Download William Kyngesburye's excellent GDAL Complete package that includes
PROJ, GEOS, GDAL, SQLite3, Spatialite, and image libraries, as frameworks.
PROJ, GEOS, GDAL, SQLite3, SpatiaLite, and image libraries, as frameworks.
There are also GSL and FreeType frameworks.
</P>
<P>
Expand All @@ -1745,9 +1738,9 @@ <H2>5.4. Install development frameworks for QGIS dependencies</H2>
</P>
<P>
William provides an additional installer package for PostgreSQL (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:
package. It's available here:
</P>
<P>
<A HREF="http://www.kyngchaos.com/software/postgres">http://www.kyngchaos.com/software/postgres</A>
Expand Down
8 changes: 4 additions & 4 deletions doc/news.html
Expand Up @@ -77,7 +77,7 @@
<DIV CLASS="header" ID="header">
<H1>QGIS News</H1>
<H2>Change history for the QGIS Project</H2>
<H3>Saturday April 29, 2017</H3>
<H3>Friday July 14, 2017</H3>
</DIV>

<DIV CLASS="toc">
Expand Down Expand Up @@ -116,8 +116,8 @@ <H3>Saturday April 29, 2017</H3>
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017
Last Updated: Friday July 14, 2017
Last Change : Friday July 14, 2017
</P>

<A NAME="toc1"></A>
Expand Down Expand Up @@ -1865,7 +1865,7 @@ <H1>28. 0.5</H1>
Fixed command line loading bug to eliminate bogus warning for vector layers
Modified splashscreen.cpp to allow specification of x,y for text drawing on
the splash image
Imperfectly fixed problem where postgis attributes aren't displayed if the
Imperfectly fixed problem where PostGIS attributes aren't displayed if the
primary key is not of type int4 (bug 1042706).
Added Latvian translation file (untranslated at present)
<P></P>
Expand Down
2 changes: 1 addition & 1 deletion doc/news.t2t
Expand Up @@ -2496,7 +2496,7 @@ Added QgsRasterLayer::filterLayer which gets called near the end of each of

2004-03-06 [didge] 0.1.0devel6
Changed configure stuff to write DEFINES in config.h.
Postgresql stuff needs testing as I commented the compileflags in src/Makefile.am
PostgreSQL stuff needs testing as I commented the compileflags in src/Makefile.am
Infos will be posted on the devel mailinglist

2004-03-04 [ts] 0.1.0devel5
Expand Down
4 changes: 2 additions & 2 deletions doc/osx.t2t
Expand Up @@ -212,14 +212,14 @@ osgEarth), try bypassing ccache.
== Install development frameworks for QGIS dependencies ==

Download William Kyngesburye's excellent GDAL Complete package that includes
PROJ, GEOS, GDAL, SQLite3, Spatialite, and image libraries, as frameworks.
PROJ, GEOS, GDAL, SQLite3, SpatiaLite, and image libraries, as frameworks.
There are also GSL and FreeType frameworks.

http://www.kyngchaos.com/software/frameworks

Once downloaded, open and install the frameworks.

William provides an additional installer package for Postgresql (for PostGIS
William provides an additional installer package for PostgreSQL (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:
Expand Down

0 comments on commit 9c08d00

Please sign in to comment.