From d9f2997d6b792a0dd8c08fae1236b11c2e84f5e7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 26 Nov 2018 11:02:15 +0100 Subject: [PATCH] fix typo and links --- README.md | 2 +- doc/environment.md | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b2dfc185f..082d24e68 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ This procedure is not easy to follow so if you don't need to write some code for yarn install ``` -9. Create the default configuration files **and configure them!** (see the [environment configuration documentation](doc/environment.md) +9. Create the default configuration files **and configure them!** (see the [environment configuration documentation](doc/environment.md)) ```bash cp config/database.yml.default config/database.yml diff --git a/doc/environment.md b/doc/environment.md index 0ce186486..9fd42d841 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -11,9 +11,10 @@ ## Introduction The following environment variables configure the addresses of the databases, some credentials, some application behaviours and the localization preferences. -If you are in a development environment, your can keep most the default values, otherwise, in production, values must be configured carefully. -The settings in [config/application.yml](config/application.yml.default) configure the environment variables when the application run in development mode. -If you run the application in production with docker, the settings are localized in [config/env](docker/env.example). +If you are in a development environment, your can keep most of the default values, otherwise, in production, values must be configured carefully. + +The settings in [config/application.yml](../config/application.yml.default) configure the environment variables when the application run in development mode. +If you run the application in production with docker, the settings are localized in [config/env](../docker/env.example). ## General settings @@ -21,14 +22,14 @@ If you run the application in production with docker, the settings are localized POSTGRES_HOST -DNS name or IP address of the server hosting the PostgreSQL database of the application (see [PostgreSQL](#postgresql)). -This value is only used when deploying with Docker, otherwise this is configured in `config/database.yml`. +DNS name or IP address of the server hosting the PostgreSQL database of the application (see [PostgreSQL](../README.md#postgresql)). +This value is only used when deploying with Docker, otherwise this is configured in [config/database.yml](../config/database.yml.default). POSTGRES_PASSWORD Password for the PostgreSQL user, as specified in `database.yml`. -Please see [Setup the FabManager database in PostgreSQL](#setup-fabmanager-in-postgresql) for information on how to create a user and set his password. -This value is only used when deploying with Docker, otherwise this is configured in `config/database.yml`. +Please see [Setup the FabManager database in PostgreSQL](../README.md#setup-fabmanager-in-postgresql) for information on how to create a user and set his password. +This value is only used when deploying with Docker, otherwise this is configured in [config/database.yml](../config/database.yml.default). REDIS_HOST