Remove legacy documentation, cleanup #3833
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pvalsecc
approved these changes
Jun 18, 2018
jwkaltz
reviewed
Jun 18, 2018
doc/administrator/administrate.rst
Outdated
| layer, e.g.: 'name', used by | ||
| `FeaturesWindow <http://docs.camptocamp.net/cgxp/2.2/lib/plugins/FeaturesWindow.html>`_. | ||
| * ``Disclaimer``: optional, copyright of the layer. | ||
| * ``Identifier attribute field``: field used to identify a feature from the layer, e.g.: 'name'. | ||
| * ``Restrictions area``: the areas throw witch the user can see the layer. |
There was a problem hiding this comment.
throw witch -> through which
(yes I know it is not part of the PR changes, but I am seeing it now :) )
jwkaltz
reviewed
Jun 18, 2018
doc/administrator/administrate.rst
Outdated
| layer, e.g.: 'name', used by | ||
| `FeaturesWindow <http://docs.camptocamp.net/cgxp/2.2/lib/plugins/FeaturesWindow.html>`_. | ||
| * ``Disclaimer``: optional, copyright of the layer. | ||
| * ``Identifier attribute field``: field used to identify a feature from the layer, e.g.: 'name'. | ||
| * ``Restrictions area``: the areas throw witch the user can see the layer. | ||
|
|
||
| On ``internal WMS`` layer we have the following specific attributes: |
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/backend_qgis.rst
Outdated
| @@ -88,13 +48,15 @@ Finally, your QGIS project layers CRS should all be in the same CSR. This is sub | |||
| change. | |||
|
|
|||
| Connect to Postgres database | |||
| ***************************** | |||
| **************************** | |||
|
|
|||
| This section is subject to change when the QGIS plugin is available. | |||
|
|
|||
| The way you should connect QGIS to the database is based on an external file | |||
| called. pg_service.conf located in the home directory. The content of this file | |||
There was a problem hiding this comment.
called. pg_service.conf -> called pg_service.conf
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/backend_qgis.rst
Outdated
|
|
||
| This section is subject to change when the QGIS plugin is available. | ||
|
|
||
| The way you should connect QGIS to the database is based on an external file | ||
| called. pg_service.conf located in the home directory. The content of this file | ||
| is as follow:: | ||
| is as follow: |
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/backend_qgis.rst
Outdated
| @@ -117,19 +79,16 @@ You can have several sections. A section start with a name with [] and | |||
| finish with a blanck line. This file should be a unix file. | |||
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/backend_qgis.rst
Outdated
| @@ -117,19 +79,16 @@ You can have several sections. A section start with a name with [] and | |||
| finish with a blanck line. This file should be a unix file. | |||
|
|
|||
| On QGIS desktop, when creating a new PostGIS connection, give it a name and use | |||
| the service name (`geomapfish` in our example) in the connection parameters | |||
| the service name (``geomapfish`` in our example) in the connection parameters | |||
| form. | |||
|
|
|||
| Copy past this file in the server, change the parameters to fit with the server | |||
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/caching.rst
Outdated
| @@ -9,11 +9,11 @@ Headers | |||
| By default most of the elements will be cached for 10 days by the browser. | |||
|
|
|||
| To change this value for all the application change in the | |||
| ``vars_<package>.yaml`` file the ``vars/default_max_age`` value. ``0`` will mean ``no-cache``. | |||
| ``vars.yaml`` file the ``vars/default_max_age`` value. ``0`` will mean ``no-cache``. | |||
| The specified value is in seconds. | |||
|
|
|||
| To change this value for a specific service add the following stricture in the | |||
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/docker.rst
Outdated
| @@ -51,7 +51,7 @@ A ``docker-compose.yml.mako`` file is created as a starting point. | |||
|
|
|||
| If you want to host the database on your local machine, you must add a | |||
| ``dbhost`` and ``dbhost_slave`` entry pointing to ``172.17.0.1`` (your host address for Docker | |||
| container) in your ``vars_<package>.yaml`` file. Then you need to make sure | |||
| container) in your ``vars.yaml`` file. Then you need to make sure | |||
| Postgres is configured to listen on that interface and accepts authentication. | |||
|
|
|||
| If you want to use an external serveur for the database, just put it is address | |||
There was a problem hiding this comment.
serveur -> server
it is address -> its address
jwkaltz
reviewed
Jun 18, 2018
doc/integrator/print.rst
Outdated
| @@ -97,6 +69,7 @@ generated by the templating. Then we should do: | |||
| This system works for print v2 but must be adapted for | |||
There was a problem hiding this comment.
Should we remove this part (is print v2 considered deprecated?)
jwkaltz
reviewed
Jun 18, 2018
| @@ -1,28 +0,0 @@ | |||
| .. _build_doc: | |||
There was a problem hiding this comment.
Are we removing this from our documentation? Or moving it elsewhere?
There was a problem hiding this comment.
The documentation is build by Travis and has this own make rule, then for me it don't needs a specific (and probably unmaintained) documentation...
There was a problem hiding this comment.
That's fine for me, but I think then you need to remove references to "build_doc", too
There was a problem hiding this comment.
For me it's done, do you see an other one?
sbrunner
force-pushed
the
rm-floor-slider
branch
from
325eeac to
9021347
Compare
jwkaltz
approved these changes
Jun 18, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.