From f66ad1ca32ad1d46d0c6d738e3a6c7f3b1b63497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 22 Nov 2019 09:31:26 +0100 Subject: [PATCH] Docs: install -> installation "install" is a verb and "installation" is a noun. --- docs/_release_description.md | 2 +- docs/configuration.rst | 2 +- docs/faq.rst | 6 +++--- docs/install.rst | 2 +- docs/local.rst | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/_release_description.md b/docs/_release_description.md index ea367cf..1a7c653 100644 --- a/docs/_release_description.md +++ b/docs/_release_description.md @@ -3,6 +3,6 @@ Tutor can be installed simply by downloading the compiled binaries: sudo curl -L "https://github.com/overhangio/tutor/releases/download/TUTOR_VERSION/tutor-$(uname -s)_$(uname -m)" -o /usr/local/bin/tutor sudo chmod 0755 /usr/local/bin/tutor -See the [install docs](https://docs.tutor.overhang.io/install.html) for more install options and instructions. +See the [installation docs](https://docs.tutor.overhang.io/install.html) for more installation options and instructions. ## Features diff --git a/docs/configuration.rst b/docs/configuration.rst index ba1e04d..f63a69c 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -3,7 +3,7 @@ Configuration and customisation =============================== -Tutor offers plenty of possibilities for platform customisation out of the box. There are two main ways in which the base Open edX install can be customized: +Tutor offers plenty of possibilities for platform customisation out of the box. There are two main ways in which the base Open edX installation can be customized: a. Modifying the Tutor :ref:`configuration parameters `. b. Modifying the :ref:`Open edX docker image ` that runs the Open edX platform. diff --git a/docs/faq.rst b/docs/faq.rst index ac983dc..3c2ad99 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -17,8 +17,8 @@ To make it possible to deploy, administer and upgrade Open edX anywhere, easily. .. _native: -What's the difference with the official "native" install? ---------------------------------------------------------- +What's the difference with the official "native" installation? +-------------------------------------------------------------- The `native installation `_ maintained by edX relies on `Ansible scripts `_ to deploy Open edX on one or multiple servers. These scripts suffer from a couple issues that Tutor tries to address: @@ -28,7 +28,7 @@ The `native installation ` for remotely installing the platform, :ref:`Kubernetes deployment `, additional languages, etc. You'll discover these differences as you explore Tutor :) +There are also many features that are not included in the native installation, such as a :ref:`web user interface ` for remotely installing the platform, :ref:`Kubernetes deployment `, additional languages, etc. You'll discover these differences as you explore Tutor :) What's the difference with the official devstack? ------------------------------------------------- diff --git a/docs/install.rst b/docs/install.rst index 7dc0669..4728a04 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -6,7 +6,7 @@ Installation Requirements ------------ -The only prerequisite for running this is a working docker install. Both docker and docker-compose are required. Follow the instructions from the official documentation: +The only prerequisite for running this is a working docker installation. Both docker and docker-compose are required. Follow the instructions from the official documentation: - `Docker `_ - `Docker compose `_ diff --git a/docs/local.rst b/docs/local.rst index 6961b9a..01464fc 100644 --- a/docs/local.rst +++ b/docs/local.rst @@ -30,9 +30,9 @@ Configuration tutor config save --interactive -This is the only non-automatic step in the install process. You will be asked various questions about your Open edX platform and appropriate configuration files will be generated. If you would like to automate this step then you should run ``tutor config save --interactive`` once. After that, there will be a ``config.yml`` file at the root of the project folder: this file contains all the configuration values for your platform, such as randomly generated passwords, domain names, etc. +This is the only non-automatic step in the installation process. You will be asked various questions about your Open edX platform and appropriate configuration files will be generated. If you would like to automate this step then you should run ``tutor config save --interactive`` once. After that, there will be a ``config.yml`` file at the root of the project folder: this file contains all the configuration values for your platform, such as randomly generated passwords, domain names, etc. -If you want to run a fully automated install, upload the ``config.yml`` file to wherever you want to run Open edX. You can then entirely skip the configuration step. +If you want to run a fully automated installation, upload the ``config.yml`` file to wherever you want to run Open edX. You can then entirely skip the configuration step. Update docker images ~~~~~~~~~~~~~~~~~~~~ @@ -104,7 +104,7 @@ You will asked to set the user password interactively. Importing the demo course ~~~~~~~~~~~~~~~~~~~~~~~~~ -On a fresh install, your platform will not have a single course. To import the `Open edX demo course `_, run:: +After a fresh installation, your platform will not have a single course. To import the `Open edX demo course `_, run:: tutor local importdemocourse @@ -200,7 +200,7 @@ The default settings module loaded by ``edx-platform`` is ``tutor.production``. 1. Copy your settings files for the lms and the cms to ``$(tutor config printroot)/env/apps/openedx/settings/lms/mysettings.py`` and ``$(tutor config printroot)/env/apps/openedx/settings/cms/mysettings.py``. 2. Load your settings by adding ``EDX_PLATFORM_SETTINGS=tutor.mysettings`` to ``$(tutor config printroot)/env/local/.env``. -Of course, your settings should be compatible with the docker install. You can get some inspiration from the ``production.py`` settings modules generated by Tutor, or just import it as a base by adding ``from .production import *`` at the top of ``mysettings.py``. +Of course, your settings should be compatible with the docker installation. You can get some inspiration from the ``production.py`` settings modules generated by Tutor, or just import it as a base by adding ``from .production import *`` at the top of ``mysettings.py``. Upgrading from earlier versions