Skip to content

Commit eb6e283

Browse files
authored
Merge pull request #348 from EnergySystemsModellingLab/spelling_os
Fix spelling: operative system => operating system
2 parents 0845745 + 002b0af commit eb6e283

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If applicable, add screenshots to help explain your problem.
2727

2828
Please, complete the following to better understand the system you are using to run MUSE.
2929

30-
- Operative system (eg. Windows 10):
30+
- Operating system (eg. Windows 10):
3131
- MUSE version (eg. 1.0.1):
3232
- Installation method (eg. pipx, pip, development mode):
3333
- Python version (you can get this running `python --version`):

.github/ISSUE_TEMPLATE/usage-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ assignees: ''
1919

2020
Please, complete the following to better understand the system you are using to run MUSE.
2121

22-
- Operative system (eg. Windows 10):
22+
- Operating system (eg. Windows 10):
2323
- MUSE version (eg. 1.0.1):
2424
- Installation method (eg. pipx, pip, development mode):
2525
- Python version (you can get this running `python --version`):

docs/installation/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Installing MUSE
22
===============
33

4-
There are several ways of installing MUSE depending on your level of proficiency, your operative system and, specially, what you want to do with it (only using it or also developing it). In this section, you will find appropriate instructions for all of these use cases.
4+
There are several ways of installing MUSE depending on your level of proficiency, your operating system and, specially, what you want to do with it (only using it or also developing it). In this section, you will find appropriate instructions for all of these use cases.
55

66
The following table summarises the different options to help you decide on the best one for you:
77

@@ -20,7 +20,7 @@ The following table summarises the different options to help you decide on the b
2020
+-----------------------------+--------------------------+------------------------+-------------------------+-----------------------+
2121
| **Access to source code** | No | No | No | Yes |
2222
+-----------------------------+--------------------------+------------------------+-------------------------+-----------------------+
23-
| **Operative system** | Windows only | Win, Linux, MacOS | Win, Linux, MacOS | Win, Linux, MacOS |
23+
| **Operating system** | Windows only | Win, Linux, MacOS | Win, Linux, MacOS | Win, Linux, MacOS |
2424
+-----------------------------+--------------------------+------------------------+-------------------------+-----------------------+
2525

2626
The :ref:`standalone-muse` and :ref:`pipx-based` installation methods should be the preferred ones for most users who just want to use MUSE *as is* or using custom plugins that only need dependencies already used by MUSE (eg. ``pandas``).

docs/installation/pipx-based.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In the following sections, we will guide you step by step in configuring your sy
3535
Launching a terminal
3636
~~~~~~~~~~~~~~~~~~~~
3737

38-
All operative systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let's just figure out how to launch it:
38+
All operating systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let's just figure out how to launch it:
3939

4040
- **Linux**: Depending on the distribution, you might have a shortcut in your tasks bar already or it should be easily found in the menu. Look for ``Console`` or ``Terminal`` to lunch the application.
4141
- **MacOS**: Press ``Super key + Space`` to open the search box. There, type ``Terminal`` and press ``Enter``.
@@ -103,7 +103,7 @@ There are multiple ways of installing Python, as well as multiple distributions.
103103
Installing ``pyenv``
104104
^^^^^^^^^^^^^^^^^^^^
105105

106-
`pyenv <https://github.com/pyenv/pyenv>`_ (`pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ for Windows) is a tool that lets you install and manage different python versions. It is small, unobtrusive and self-contained, and it is available for the three operative systems. However, you might want to consider a more fully fledged Python distribution like Anaconda, specially if your work involved non-python packages or a lot of data science and machine learning tools. If that is the case, go to the :ref:`virtual-env-based` section.
106+
`pyenv <https://github.com/pyenv/pyenv>`_ (`pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ for Windows) is a tool that lets you install and manage different python versions. It is small, unobtrusive and self-contained, and it is available for the three operating systems. However, you might want to consider a more fully fledged Python distribution like Anaconda, specially if your work involved non-python packages or a lot of data science and machine learning tools. If that is the case, go to the :ref:`virtual-env-based` section.
107107

108108
To install ``pyenv``, follow these steps:
109109

@@ -199,7 +199,7 @@ Installing ``pipx``
199199

200200
Next we need to install ``pipx``, a Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments. We could skip this step and install MUSE directly, but that will risk to have conflicting dependencies in the future if you install any other application, breaking your MUSE installation, and we do not want that to happen.
201201

202-
The installation instructions for ``pipx`` can be found in the `official webpage <https://pypa.github.io/pipx/installation/>`_ specific for the three operative systems. The following instructions, however, should work for the three cases:
202+
The installation instructions for ``pipx`` can be found in the `official webpage <https://pypa.github.io/pipx/installation/>`_ specific for the three operating systems. The following instructions, however, should work for the three cases:
203203

204204
.. code-block:: bash
205205

docs/installation/virtual-env-based.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ If the :ref:`pipx-based` does not work for you, you don't want to use ``pyenv``
88
Installing Anaconda Python
99
~~~~~~~~~~~~~~~~~~~~~~~~~~
1010

11-
To install Anaconda, just go to the official `Anaconda webpage <https://www.anaconda.com/>`_ and download and install a version appropriate for your operative system. Do not worry about the Python version as ``conda`` will let you choose that when creating a virtual environment.
11+
To install Anaconda, just go to the official `Anaconda webpage <https://www.anaconda.com/>`_ and download and install a version appropriate for your operating system. Do not worry about the Python version as ``conda`` will let you choose that when creating a virtual environment.
1212

1313
The installer should guide you step by step on the process of installing Anaconda and configuring your system to use it as your Python installation.
1414

@@ -26,7 +26,7 @@ Using ``pipx`` ensures that each application it installs has its own virtual env
2626
Creating a ``conda`` virtual environment
2727
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2828

29-
This option is available only if you installed Anaconda Python. Depending on the settings you used when installing Anaconda and your operative system, you might have ``conda`` available in your normal terminal or you might need to use the Anaconda Prompt.
29+
This option is available only if you installed Anaconda Python. Depending on the settings you used when installing Anaconda and your operating system, you might have ``conda`` available in your normal terminal or you might need to use the Anaconda Prompt.
3030

3131
``conda`` not only lets you create a virtual environment but also selecting which python version to use within, independently of the version of Anaconda Python installed, which means it can be an alternative to ``pyenv`` if it happens that you already have Anaconda installed in your system.
3232

0 commit comments

Comments
 (0)