Skip to content

Commit

Permalink
installation: wording
Browse files Browse the repository at this point in the history
  • Loading branch information
landam committed Jul 26, 2017
1 parent 5a3e217 commit 0af5140
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions docs/installation/docker.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Deploying in Docker containers
==============================
Deployment in Docker containers
===============================

Gisquick application is split into 3 services running in Docker
containers:
Expand Down
25 changes: 13 additions & 12 deletions docs/installation/index.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
Installation
############

Gisquick publishing platform consists of two parts: **Django-based
server application** and **QGIS client plugin**. This section
describes installation process of both components. In the first
subsection is described an easy and quick way of :doc:`deploying
virtual server <vagrant>` controlled by Vagrant. It's very useful for
testing or development since no other hardware equipment except of
host machine is required. Following part is focused on
:doc:`production usage <docker>`, deployment in Docker containers.

In the both cases, for deploying virtual server by Vagrant or in
Docker containers, Gisquick source code is required. The source code
can be easily downloaded from GitHub repository using ``git`` command.
Gisquick publishing platform consists of two major components:
**Django-based server application** and **QGIS client plugin**.

Server application can be deployed by Vagrant or Docker. In the first
subsection is described an easy and quick way of setting up
development environment by :doc:`deploying virtual server <vagrant>`
controlled by Vagrant. Following part is focused on :doc:`deployment
in Docker containers <docker>`, which is preferable for testing
purposes.

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

.. _source-code:

Expand Down
4 changes: 2 additions & 2 deletions docs/installation/vagrant.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Deploying testing environment by Vagrant
========================================
Deploying development environment by Vagrant
============================================

After :ref:`downloading Gisquick source code <source-code>`, go to
newly created :file:`gisquick` directory and deploy virtual server
Expand Down

0 comments on commit 0af5140

Please sign in to comment.