Skip to content

Commit

Permalink
ispell
Browse files Browse the repository at this point in the history
  • Loading branch information
landam committed Jul 13, 2017
1 parent 1ea2d1b commit b7bde07
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 39 deletions.
14 changes: 7 additions & 7 deletions docs/datasets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ bounding box extent. Natural Earth Raster comes in TIFF format with a
TFW world file.

Natural Earth is very useful collection of data. Most of their
attributes are equally important for mapmaking. They contain embedded
attributes are equally important for map-making. They contain embedded
feature names, which are ranked by relative importance. Other
attributes facilitate faster map production, such as width attributes
assigned to river segments for creating tapers, etc.
Expand Down Expand Up @@ -150,7 +150,7 @@ is from `Czech statistical office <https://www.czso.cz/csu/czso/home>`_.

.. rubric:: Coordinate systems (Reference system)

All data in Prague dataset use referense system S-JTSK Krovak East North (EPSG 5514).
All data in Prague dataset use reference system S-JTSK Krovak East North (EPSG 5514).

.. rubric:: Format and other key features

Expand All @@ -167,7 +167,7 @@ Windows-1252. Raster comes in TIFF format.
Thematic layers
---------------

**administrative districts** - administrative boudaries in Prague
**administrative districts** - administrative boundaries in Prague

* *Layer name:* ``districts``
* *Storage type:* SQLite database
Expand Down Expand Up @@ -210,7 +210,7 @@ Thematic layers
:widths: 10, 10

"*number*", "number of basin"
"*area*", "area in square kilometre"
"*area*", "area in square kilometer"

**bike routes** - cycling routes marked, registered and others

Expand Down Expand Up @@ -295,9 +295,9 @@ Thematic layers

"*code*", "code of usage"

**ortophoto** - colored orthophoto of Prague 1 district
**orthophoto** - colored orthophoto of Prague 1 district

* *Layer name:* ``ortophoto``
* *Layer name:* ``orthophoto``
* *Pixel resolution:* ``50 cm``
* *Storage type:* SQLite database
* *Last update:* 10.12.2015
Expand All @@ -320,7 +320,7 @@ Thematic layers
:widths: 10, 10

"*p_number*", "permanent parcel number"
"*f_number*", "fractional parcel numeber"
"*f_number*", "fractional parcel number"
"*area*", "area in square meters"

**pharmacy** - pharmacies
Expand Down
8 changes: 4 additions & 4 deletions docs/installation/docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ containers:

These Docker images can be put together using ``docker-compose``
command. This command reads configuration file in YAML
language. Example of such confuguration is available in Gisquick
language. Example of such configuration is available in Gisquick
source code (`docker/example.docker-compose.yml
<https://github.com/gislab-npo/gisquick/blob/master/docker/example.docker-compose.yml>`__). Simplied
<https://github.com/gislab-npo/gisquick/blob/master/docker/example.docker-compose.yml>`__). Simplified
example is shown below.

.. code-block:: yaml
Expand Down Expand Up @@ -102,11 +102,11 @@ At this point ``docker-compose`` command can be run
$ docker-compose up
This command downloades required Docker images, run and compose
This command downloads required Docker images, run and compose
them. Gunicorn logs (see lines ``20`` and ``21`` in
:file:`docker-compose.yml`) are redirected to the terminal.

.. note:: |note| Docker compose command can require Admininstrator rights
.. note:: |note| Docker compose command can require Administrator rights
(``sudo``). To avoid that add current user to ``docker``
user group.

Expand Down
2 changes: 1 addition & 1 deletion docs/installation/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ host machine is required. Second procedure is dedicated for

In both cases, for deploying virtual server or installation using
Docker containers, Gisquick source code is required. The source code
can be easily downloaded from GitHub reposirory using ``git`` command.
can be easily downloaded from GitHub repository using ``git`` command.

.. _source-code:

Expand Down
6 changes: 3 additions & 3 deletions docs/installation/plugin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ expiration.
Source code of the plugin is available from GitHub
`gisquick-qgis-plugin
<https://github.com/gislab-npo/gisquick-qgis-plugin>`_ repository and
licenced under `GNU General Public License
licensed under `GNU General Public License
<https://github.com/gislab-npo/gisquick-qgis-plugin/blob/master/LICENSE>`__
version 2 or later.

Plugin can be installed into QGIS in the standard way by
:menuselection:`Plugins --> Manage and Install Plugins`.

.. important:: |imp| Currently Gisquick plugin **is not** available
from QGIS Plugins Repository. Therefore is neccessary to register
from QGIS Plugins Repository. Therefore is necessary to register
new repository, see URL bellow

::
Expand All @@ -33,7 +33,7 @@ Plugin can be installed into QGIS in the standard way by

Install Gisquick QGIS plugin.

After successfull installation, a new icon should appear in QGIS
After successful installation, a new icon should appear in QGIS
plugin toolbar.

.. _gisquick-qgis-plugin-logo:
Expand Down
4 changes: 2 additions & 2 deletions docs/installation/vagrant.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ providing Gisquick service.
.. note:: |note| Default configuration is stored in
:file:`provision/group_vars/all`. Custom user configuration can be
defined in :file:`provision/host_vars/gisquick`. In this file can
be optionaly enabled Gisquick experimental mobile client by adding
be optionally enabled Gisquick experimental mobile client by adding
configuration variable as ``GISLAB_CLIENT_MOBILE: yes``.

Virtual server can be deployed using ``vagrant`` command. This
Expand Down Expand Up @@ -50,7 +50,7 @@ To deploy virtual server called ``gisquick`` run:

.. _vagrant-dev-dir:

After succesfull deployment, new directories in source code tree are
After successful deployment, new directories in source code tree are
created:

``dev``
Expand Down
4 changes: 2 additions & 2 deletions docs/other.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ See Gisquick `GitHub repository <https://github.com/gislab-npo/gisquick>`__.
``clients``
web and mobile client interfaces
``docker``
Docker recepies, see :doc:`./installation/docker`
Docker recipes, see :doc:`./installation/docker`
``provision``
development environment provisioning configuration with Vagrant/Ansible, see :doc:`./installation/vagrant`
``server``
Expand All @@ -54,7 +54,7 @@ Mobile
------

GIS.lab Mobile is represented by dedicated hybrid Android client interface
built on top of the same code base as web inteface with native user interface.
built on top of the same code base as web interface with native user interface.

---------
Packaging
Expand Down
28 changes: 14 additions & 14 deletions docs/project-publishing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ Before publishing using Gisquick plugin, the project must be saved.
project) in the same directory. QGIS project must be set up to use
**relative** paths (see *Project Properties*).

When using any kind of authentatization (databases, web services)
When using any kind of authentication (databases, web services)
it must be ensured that server used for publishing will have access
to such data sources.

Publishing QGIS project will be demostrated on :ref:`Prague sample
Publishing QGIS project will be demonstrated on :ref:`Prague sample
project <dataset-prague>` downloadable as as `zip file
<http://training.gismentors.eu/geodata/gisquick/prague.tar.gz>`__. At
first, sample :file:`prague.qgs` QGIS project will be open in QGIS
Expand All @@ -57,7 +57,7 @@ First page of the wizard allows defining basic settings for publishing:
.. _publication-base-layers:

By **base layers** are meant typically WMS layers provided by QGIS
project. ``Base layer`` subpage also allows adding base layers provided by
project. ``Base layer`` sub-page also allows adding base layers provided by
external services like OpenStreetMap, MapBox or Bing.

.. important:: |imp| External base layers are available only when QGIS
Expand All @@ -67,7 +67,7 @@ Here also default base layer can be defined, see figure below.

.. figure:: ./img/project-publishing-1.png

In the second ``Layers`` subpage is controlled, simply by checkboxes,
In the second ``Layers`` sub-page is controlled, simply by check boxes,
which map layers will be published. It's also possible to publish
layer as hidden (ie. not shown in ``Overlay layers`` tab, see
:doc:`user-interface`). Top-left checkbox ``Use cached`` controls
Expand All @@ -78,7 +78,7 @@ cached by QGIS server and re-used when possible.

.. _publication-metadata:

The last ``Project`` subpage allows defining basic project metadata
The last ``Project`` sub-page allows defining basic project metadata
like title, extent, min/max scales, info message, access constraints,
etc.

Expand All @@ -90,23 +90,23 @@ In the following page **topics** can be defined. By topic it's meant
group of thematically-related overlay layers. Topics can be easily
switched in ``Topics`` tab of Gisquick UI, see :doc:`user-interface`
section. Layers which should be part of defined topic are simply
checked. Topics can be added or removed by buttons localed in
checked. Topics can be added or removed by buttons located in
bottom-left part of the dialog. Each topic has defined short
description (abstract) which is shown by Gisquick UI.

.. figure:: ./img/project-publishing-4.png

Last but one page showns read-only **configuration summary**. It's last
Last but one page shows read-only **configuration summary**. It's last
chance to go back by ``Back`` button and change publication settings.

.. figure:: ./img/project-publishing-5.png

On the last page are displayed files which needs to transfered to the
On the last page are displayed files which needs to transferred to the
server providing Gisquick publication platform, see
:doc:`installation/index` section. The result of publication proccess
:doc:`installation/index` section. The result of publication process
are two generated files: timestamped QGIS project (``.qgs``) and
metafile (``.meta``). These files are data (see ``Data sources``) must
be transfered to the publication server.
be transferred to the publication server.

.. figure:: ./img/project-publishing-6.png

Expand All @@ -119,11 +119,11 @@ project. The destination file can be changed by ``Change`` button. In
this case data source files are also copied to the newly defined
directory.

Transfering project to publication server
-----------------------------------------
Transferring project to publication server
------------------------------------------

In this section is described finishing publication process,
transfering published project to the publication server. Destination
transferring published project to the publication server. Destination
folder on the server can be different depending on installation
process.

Expand Down Expand Up @@ -151,7 +151,7 @@ in Gisquick source tree :file:`docker/_data/publish`.

Publish directory provided by Docker containers.

Projects in the *publish* directory are split into subdirectories
Projects in the *publish* directory are split into sub-directories
corresponding registered users, see
:doc:`./installation/user-management` section. In the case of virtual
server it's possible to use predefined :ref:`vagrant user
Expand Down
12 changes: 6 additions & 6 deletions docs/user-interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Content management
==================

Basic project metadata - project description - is accessible by
questionmark, see figure below.
question-mark, see figure below.

.. figure:: ./img/project-info.png

Expand Down Expand Up @@ -91,13 +91,13 @@ In ``Layers`` mode the overlay layers can be switch on/off one by one.
.. figure:: ./img/ui-map-layers.png
:width: 250px

Switch on/off overlayer layers.
Switch on/off overlay layers.

.. tip:: |tip| It is also possible to switch on/off group of layers
|group-switcher|.

In this mode layer attribute data can be accessed by
|layer-attributes|. Atrribute table is displayed in bottom part.
|layer-attributes|. Attribute table is displayed in bottom part.

.. figure:: ./img/ui-attributes.svg

Expand Down Expand Up @@ -137,7 +137,7 @@ example below.
Zoom tools
==========

Zoom tools enables controling map view.
Zoom tools enables controlling map view.

* Geolocation |zoom-geolocation|
* Zoom in/out |zoom-in-out|
Expand All @@ -147,7 +147,7 @@ Zoom tools enables controling map view.

Geolocation in action.

.. tip:: Zooming and panning is also possible by middle mouse buttom.
.. tip:: Zooming and panning is also possible by middle mouse button.

.. _tool-menu:

Expand All @@ -169,7 +169,7 @@ example below in Schools and District layers).

Identify schools layer.

This settings can be changed in ``Identification`` combobox.
This settings can be changed in ``Identification`` combo box.

.. figure:: ./img/identification-layers.png
:width: 250px
Expand Down

0 comments on commit b7bde07

Please sign in to comment.