Skip to content
Permalink
Browse files

Merge pull request #4818 from DelazJ/spelling

Fix some spelling issues
  • Loading branch information
m-kuhn committed Jul 8, 2017
2 parents ada9ce4 + 0d1c4cd commit 875a5d6d9d88ceda4077787efed1aa44be2564ee
Showing with 299 additions and 296 deletions.
  1. +5 −5 INSTALL
  2. +3 −3 NEWS
  3. +1 −1 README.md
  4. +1 −1 cmake/FindSpatiaLite.cmake
  5. +4 −4 doc/INSTALL.html
  6. +2 −2 doc/news.html
  7. +2 −2 doc/news.t2t
  8. +1 −1 doc/overview.t2t
  9. +1 −1 python/analysis/openstreetmap/qgsosmdatabase.sip
  10. +1 −1 python/console/console_sci.py
  11. +2 −2 python/core/qgscoordinatereferencesystem.sip
  12. +16 −16 python/core/qgsvectorlayer.sip
  13. +20 −20 python/gui/qgscolorbutton.sip
  14. +13 −13 python/gui/qgscolorrampbutton.sip
  15. +1 −1 python/gui/qgsexpressionlineedit.sip
  16. +1 −1 python/gui/qgsfontbutton.sip
  17. +1 −1 python/gui/qgsmapcanvas.sip
  18. +1 −1 python/gui/qgsmaptool.sip
  19. +3 −3 python/plugins/MetaSearch/pavement.py
  20. +1 −1 python/plugins/MetaSearch/ui/maindialog.ui
  21. +6 −6 python/plugins/db_manager/db_plugins/postgis/connector.py
  22. +2 −2 python/plugins/db_manager/db_plugins/spatialite/connector.py
  23. +1 −1 python/plugins/db_manager/db_plugins/spatialite/plugin.py
  24. +1 −1 python/plugins/db_manager/dlg_sql_layer_window.py
  25. +1 −1 python/plugins/db_manager/dlg_sql_window.py
  26. +2 −2 python/plugins/processing/algs/help/qgis.yaml
  27. +1 −1 python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py
  28. +2 −2 python/plugins/processing/gui/DestinationSelectionPanel.py
  29. +9 −9 python/plugins/processing/tools/postgis.py
  30. +2 −2 python/plugins/processing/tools/spatialite.py
  31. +1 −1 python/plugins/processing/ui/DlgNumberInput.ui
  32. +4 −4 python/utils.py
  33. +1 −1 resources/context_help/QgsOracleSourceSelect
  34. +1 −1 resources/context_help/QgsPgSourceSelect
  35. +1 −1 resources/context_help/QgsSpatiaLiteSourceSelect
  36. +1 −1 resources/context_help/QgsVectorLayerProperties
  37. +1 −1 resources/context_help/QgsVectorLayerSaveAsDialog
  38. +1 −1 resources/function_help/json/Field
  39. +3 −0 scripts/spell_check/spelling.dat
  40. +2 −2 src/analysis/openstreetmap/qgsosmdatabase.h
  41. +1 −1 src/app/pluginmanager/qgspluginmanager.h
  42. +2 −2 src/app/pluginmanager/qgspluginmanager_texts.cpp
  43. +1 −1 src/app/qgisapp.cpp
  44. +1 −1 src/app/qgisapp.h
  45. +3 −3 src/app/qgsnewspatialitelayerdialog.cpp
  46. +1 −1 src/core/expression/qgsexpressionfunction.cpp
  47. +1 −1 src/core/geometry/qgsgeometryutils.cpp
  48. +1 −1 src/core/geometry/qgswkbtypes.h
  49. +1 −1 src/core/qgsattributetableconfig.h
  50. +1 −1 src/core/qgscolorscheme.h
  51. +1 −1 src/core/qgsconnectionpool.h
  52. +5 −5 src/core/qgscoordinatereferencesystem.h
  53. +1 −1 src/core/qgscoordinatereferencesystem_p.h
  54. +1 −1 src/core/qgsdataitem.cpp
  55. +9 −9 src/core/qgsofflineediting.cpp
  56. +1 −1 src/core/qgsslconnect.cpp
  57. +1 −1 src/core/qgsslconnect.h
  58. +1 −1 src/core/qgssqliteexpressioncompiler.h
  59. +1 −1 src/core/qgsvectorfilewriter.cpp
  60. +16 −16 src/core/qgsvectorlayer.h
  61. +1 −1 src/core/symbology-ng/qgssymbollayerutils.cpp
  62. +2 −2 src/gui/qgscolorbutton.cpp
  63. +22 −22 src/gui/qgscolorbutton.h
  64. +2 −2 src/gui/qgscolorrampbutton.cpp
  65. +15 −15 src/gui/qgscolorrampbutton.h
  66. +2 −2 src/gui/qgscolorwidgets.h
  67. +1 −1 src/gui/qgscomposerview.cpp
  68. +1 −1 src/gui/qgsexpressionbuilderwidget.cpp
  69. +1 −1 src/gui/qgsexpressionlineedit.h
  70. +3 −3 src/gui/qgsfontbutton.h
  71. +11 −11 src/gui/qgsmanageconnectionsdialog.cpp
  72. +1 −1 src/gui/qgsmapcanvas.h
  73. +1 −1 src/gui/qgsmaptool.h
  74. +1 −1 src/gui/qgsmaptooladvanceddigitizing.h
  75. +1 −1 src/gui/qgsprojectionselectiondialog.cpp
  76. +1 −1 src/gui/qgsprojectionselectiontreewidget.h
  77. +1 −1 src/gui/qgssourceselectdialog.cpp
  78. +2 −2 src/plugins/grass/qtermwidget/TerminalDisplay.cpp
  79. +2 −2 src/plugins/spatialquery/qgsspatialquerydialog.cpp
  80. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  81. +1 −1 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  82. +1 −1 src/providers/grass/qgsgrass.cpp
  83. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  84. +2 −2 src/providers/postgres/qgspostgresconn.cpp
  85. +2 −2 src/providers/postgres/qgspostgresfeatureiterator.cpp
  86. +4 −4 src/providers/postgres/qgspostgresprovider.cpp
  87. +1 −1 src/providers/spatialite/qgsspatialiteconnpool.h
  88. +1 −1 src/providers/spatialite/qspatialite/README
  89. +5 −5 src/providers/virtual/qgsvirtuallayerblob.cpp
  90. +5 −5 src/providers/virtual/qgsvirtuallayerblob.h
  91. +1 −1 src/providers/virtual/qgsvirtuallayersourceselectbase.ui
  92. +3 −3 src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
  93. +1 −1 src/providers/wfs/qgswfsprovider.h
  94. +5 −5 src/providers/wfs/qgswfsshareddata.cpp
  95. +2 −2 src/providers/wfs/qgswfsshareddata.h
  96. +1 −1 src/providers/wfs/qgswfssourceselect.cpp
  97. +2 −2 src/ui/qgsnewspatialitelayerdialogbase.ui
  98. +3 −3 src/ui/qgsoptionsbase.ui
  99. +1 −1 src/ui/qgsspatialitesridsdialogbase.ui
  100. +2 −2 tests/README.md
  101. +2 −2 tests/src/python/test_authmanager_pki_postgres.py
  102. +1 −1 tests/src/python/test_layer_dependencies.py
  103. +2 −2 tests/src/python/test_provider_spatialite.py
  104. +2 −2 tests/src/python/test_provider_wfs.py
  105. +2 −2 tests/src/python/test_qgsdistancearea.py
  106. +1 −1 tests/src/python/test_qgspallabeling_base.py
10 INSTALL
@@ -116,7 +116,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 - 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
@@ -1245,17 +1245,17 @@ osgEarth), try bypassing ccache.
=========================================================

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
support). QGIS just needs the libpq client library, so unless you want to
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:
package. It's available here:

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

6 NEWS
@@ -800,7 +800,7 @@ changed so we will just provide a bullet list of key new features here.
- Make NULL value string representation configurable.
- Fix feature updates in feature form from attribute table.
- Add support for NULL values in value maps (comboboxes).
- Use layer names instead of ids in drop down list when loading value maps from layers.
- Use layer names instead of ids in drop-down list when loading value maps from layers.
- Support feature form expression fields: line edits on the form which
name prefix "expr_" are evaluated. Their value is interpreted as field
calculator string and replaced with the calculated value.
@@ -1695,7 +1695,7 @@ Added Simon splash screen
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)

@@ -2540,7 +2540,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
@@ -42,7 +42,7 @@ modified.
* PostgreSQL/PostGIS
* GRASS
* GeoPackage
* Spatialite
* SpatiaLite
* [Other OGR supported formats](http://www.gdal.org/ogr_formats.html)
* MSSQL
* Oracle
@@ -31,7 +31,7 @@ IF (APPLE)
SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
FIND_PATH(SPATIALITE_INCLUDE_DIR SQLite3/spatialite.h)
# if no spatialite header, we don't want sqlite find below to succeed
# if no SpatiaLite header, we don't want SQLite find below to succeed
IF (SPATIALITE_INCLUDE_DIR)
FIND_LIBRARY(SPATIALITE_LIBRARY SQLite3)
# FIND_PATH doesn't add "Headers" for a framework
@@ -226,7 +226,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 - 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
@@ -1744,10 +1744,10 @@ <H2>5.4. Install development frameworks for QGIS dependencies</H2>
Once downloaded, open and install the frameworks.
</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
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:
package. It's available here:
</P>
<P>
<A HREF="http://www.kyngchaos.com/software/postgres">http://www.kyngchaos.com/software/postgres</A>
@@ -917,7 +917,7 @@ <H2>14.6. Providers and Data Handling</H2>
<LI>Make NULL value string representation configurable.
<LI>Fix feature updates in feature form from attribute table.
<LI>Add support for NULL values in value maps (comboboxes).
<LI>Use layer names instead of ids in drop down list when loading value maps from layers.
<LI>Use layer names instead of ids in drop-down list when loading value maps from layers.
<LI>Support feature form expression fields: line edits on the form which
name prefix "expr_" are evaluated. Their value is interpreted as field
calculator string and replaced with the calculated value.
@@ -2865,7 +2865,7 @@ <H1>28. 0.5</H1>
<P>
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
</P>
<P>
@@ -779,7 +779,7 @@ changed so we will just provide a bullet list of key new features here.
- Make NULL value string representation configurable.
- Fix feature updates in feature form from attribute table.
- Add support for NULL values in value maps (comboboxes).
- Use layer names instead of ids in drop down list when loading value maps from layers.
- Use layer names instead of ids in drop-down list when loading value maps from layers.
- Support feature form expression fields: line edits on the form which
name prefix "expr_" are evaluated. Their value is interpreted as field
calculator string and replaced with the calculated value.
@@ -1646,7 +1646,7 @@ Added Simon splash screen
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)

@@ -36,7 +36,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 - 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
@@ -41,7 +41,7 @@ class QgsOSMDatabase

void setFileName( const QString &dbFileName );
%Docstring
Setter for the spatialite database.
Setter for the SpatiaLite database.
%End
QString filename() const;
%Docstring
@@ -629,7 +629,7 @@ def __init__(self, parent):
self.setWindowTitle(QCoreApplication.translate("PythonConsole",
"Python Console - Command History"))
self.listView.setToolTip(QCoreApplication.translate("PythonConsole",
"Double click on item to execute"))
"Double-click on item to execute"))
self.model = QStandardItemModel(self.listView)

self._reloadHistory()
@@ -190,7 +190,7 @@ Constructs an invalid CRS object

explicit QgsCoordinateReferenceSystem( const long id, CrsType type = PostgisCrsId );
%Docstring
Constructor a CRS object using a postgis SRID, an EPSG code or an internal QGIS CRS ID.
Constructor a CRS object using a PostGIS SRID, an EPSG code or an internal QGIS CRS ID.
.. note::

We encourage you to use EPSG code, WKT or Proj4 to describe CRS's in your code
@@ -304,7 +304,7 @@ Allows direct construction of QVariants from QgsCoordinateReferenceSystem.
bool createFromSrid( const long srid );
%Docstring
Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
\param srid The postgis SRID for the desired spatial reference system.
\param srid The PostGIS SRID for the desired spatial reference system.
:return: True on success else false
/ // TODO QGIS 3: remove unless really necessary - let's use EPSG codes instead
:rtype: bool
@@ -25,10 +25,10 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSin
The QgsVectorLayer is instantiated by specifying the name of a data provider,
such as postgres or wfs, and url defining the specific data set to connect to.
The vector layer constructor in turn instantiates a QgsVectorDataProvider subclass
corresponding to the provider type, and passes it the url. The data provider
corresponding to the provider type, and passes it the url. The data provider
connects to the data source.

The QgsVectorLayer provides a common interface to the different data types. It also
The QgsVectorLayer provides a common interface to the different data types. It also
manages editing transactions.

Sample usage of the QgsVectorLayer class:
@@ -45,8 +45,8 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSin
\subsection memory Memory data providerType (memory)

The memory data provider is used to construct in memory data, for example scratch
data or data generated from spatial operations such as contouring. There is no
inherent persistent storage of the data. The data source uri is constructed. The
data or data generated from spatial operations such as contouring. There is no
inherent persistent storage of the data. The data source uri is constructed. The
url specifies the geometry type ("point", "linestring", "polygon",
"multipoint","multilinestring","multipolygon"), optionally followed by url parameters
as follows:
@@ -59,35 +59,35 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSin
Specifies that the layer will be constructed with a spatial index

- field=name:type(length,precision)
Defines an attribute of the layer. Multiple field parameters can be added
to the data provider definition. type is one of "integer", "double", "string".
Defines an attribute of the layer. Multiple field parameters can be added
to the data provider definition. type is one of "integer", "double", "string".

An example url is "Point?crs=epsg:4326&field=id:integer&field=name:string(20)&index=yes"

\subsection ogr OGR data provider (ogr)

Accesses data using the OGR drivers (http://www.gdal.org/ogr/ogr_formats.html). The url
is the OGR connection string. A wide variety of data formats can be accessed using this
is the OGR connection string. A wide variety of data formats can be accessed using this
driver, including file based formats used by many GIS systems, database formats, and
web services. Some of these formats are also supported by custom data providers listed
web services. Some of these formats are also supported by custom data providers listed
below.

\subsection spatialite Spatialite data provider (spatialite)
\subsection spatialite SpatiaLite data provider (spatialite)

Access data in a spatialite database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
Access data in a SpatiaLite database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
QgsDataSourceUri class.

\subsection postgres Postgresql data provider (postgres)
\subsection postgres PostgreSQL data provider (postgres)

Connects to a postgresql database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
Connects to a PostgreSQL database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
QgsDataSourceUri class.

\subsection mssql Microsoft SQL server data provider (mssql)

Connects to a Microsoft SQL server database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
Connects to a Microsoft SQL server database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
QgsDataSourceUri class.

\subsection wfs WFS (web feature service) data provider (wfs)

0 comments on commit 875a5d6

Please sign in to comment.
You can’t perform that action at this time.