diff --git a/doc/src/Howto_cmake.rst b/doc/src/Howto_cmake.rst index 3aba35dd69..8ac957f554 100644 --- a/doc/src/Howto_cmake.rst +++ b/doc/src/Howto_cmake.rst @@ -46,7 +46,7 @@ This tutorial assumes that you are operating in a command-line environment using a shell like Bash. - Linux: any Terminal window will work -- MacOS X: launch the Terminal application. +- macOS: launch the Terminal application. - Windows 10: install and run the :doc:`Windows Subsystem for Linux ` We also assume that you have downloaded and unpacked a recent LAMMPS source code package diff --git a/doc/src/Install_conda.rst b/doc/src/Install_conda.rst index 34b45fcf8b..df1d64e7da 100644 --- a/doc/src/Install_conda.rst +++ b/doc/src/Install_conda.rst @@ -1,7 +1,8 @@ Download an executable for Linux or Mac via Conda ------------------------------------------------- -Binaries are available for MacOS or Linux via `Conda `_. +Precompiled LAMMPS binaries are available for macOS or Linux via the +`Conda `_ package management system. First, one must setup the Conda package manager on your system. Follow the instructions to install `Miniconda `_, then create a conda diff --git a/doc/src/Python_install.rst b/doc/src/Python_install.rst index 74dc176143..f6b0cba6e0 100644 --- a/doc/src/Python_install.rst +++ b/doc/src/Python_install.rst @@ -54,7 +54,7 @@ folder that the dynamic loader searches or inside of the installed ``-DBUILD_SHARED_LIBS=on``, ``-DLAMMPS_EXCEPTIONS=on`` and ``-DPKG_PYTHON=on`` (The first option is required, the other two are optional by recommended). The exact file name of the shared - library depends on the platform (Unix/Linux, MacOS, Windows) and + library depends on the platform (Unix/Linux, macOS, Windows) and the build configuration being used. The installation base folder is already set by default to the ``$HOME/.local`` directory, but it can be changed to a custom location defined by the @@ -121,7 +121,7 @@ folder that the dynamic loader searches or inside of the installed the folder containing the LAMMPS shared library is either included in a path searched by the shared linker (e.g. like ``/usr/lib64/``) or part of the ``LD_LIBRARY_PATH`` environment - variable (or ``DYLD_LIBRARY_PATH`` on MacOS). Otherwise you will + variable (or ``DYLD_LIBRARY_PATH`` on macOS). Otherwise you will get an error when trying to create a LAMMPS object through the Python module. @@ -130,7 +130,7 @@ folder that the dynamic loader searches or inside of the installed # Unix/Linux export LD_LIBRARY_PATH=$HOME/.local/lib:$LD_LIBRARY_PATH - # MacOS + # macOS export DYLD_LIBRARY_PATH=$HOME/.local/lib:$DYLD_LIBRARY_PATH If you plan to use the LAMMPS executable (e.g., ``lmp``), you may @@ -294,7 +294,7 @@ folder that the dynamic loader searches or inside of the installed script in a similar fashion you need to update your ``$HOME/.bashrc`` file to include the shared library and executable locations in ``LD_LIBRARY_PATH`` (or - ``DYLD_LIBRARY_PATH`` on MacOS) and ``PATH``, respectively. + ``DYLD_LIBRARY_PATH`` on macOS) and ``PATH``, respectively. For example with: @@ -303,7 +303,7 @@ folder that the dynamic loader searches or inside of the installed # Unix/Linux echo 'export LD_LIBRARY_PATH=$VIRTUAL_ENV/lib:$LD_LIBRARY_PATH' >> $HOME/myenv/bin/activate - # MacOS + # macOS echo 'export DYLD_LIBRARY_PATH=$VIRTUAL_ENV/lib:$DYLD_LIBRARY_PATH' >> $HOME/myenv/bin/activate .. tab:: In place usage @@ -313,7 +313,7 @@ folder that the dynamic loader searches or inside of the installed package inside the source/compilation folders. Instead of copying the files where they can be found, you need to set the environment variables ``PYTHONPATH`` (for the Python package) and - ``LD_LIBRARY_PATH`` (or ``DYLD_LIBRARY_PATH`` on MacOS + ``LD_LIBRARY_PATH`` (or ``DYLD_LIBRARY_PATH`` on macOS For Bourne shells (bash, ksh and similar) the commands are: @@ -329,7 +329,7 @@ folder that the dynamic loader searches or inside of the installed setenv PYTHONPATH ${PYTHONPATH}:${HOME}/lammps/python setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${HOME}/lammps/src - On MacOS you may also need to set ``DYLD_LIBRARY_PATH`` accordingly. + On macOS you may also need to set ``DYLD_LIBRARY_PATH`` accordingly. You can make those changes permanent by editing your ``$HOME/.bashrc`` or ``$HOME/.login`` files, respectively. diff --git a/doc/src/dump_image.rst b/doc/src/dump_image.rst index c1c0173e96..01cecf5e87 100644 --- a/doc/src/dump_image.rst +++ b/doc/src/dump_image.rst @@ -679,7 +679,7 @@ Play the movie: a = animate("foo*.jpg") -* d) QuickTime and other Windows- or MacOS-based media players can +* d) QuickTime and other Windows- or macOS-based media players can obviously play movie files directly. Similarly for corresponding tools bundled with Linux desktop environments. However, due to licensing issues with some file formats, the formats may require installing diff --git a/doc/src/fix_halt.rst b/doc/src/fix_halt.rst index 46d5cd89bb..56e86208cd 100644 --- a/doc/src/fix_halt.rst +++ b/doc/src/fix_halt.rst @@ -173,7 +173,7 @@ the :doc:`run ` command. Restrictions """""""""""" -The *diskfree* attribute is currently only supported on Linux, MacOSX, and BSD. +The *diskfree* attribute is currently only supported on Linux, macOS, and \*BSD. Related commands """""""""""""""" diff --git a/doc/utils/sphinx-config/false_positives.txt b/doc/utils/sphinx-config/false_positives.txt index 7cb409d040..647f9adbe4 100644 --- a/doc/utils/sphinx-config/false_positives.txt +++ b/doc/utils/sphinx-config/false_positives.txt @@ -1962,7 +1962,7 @@ machdyn MACHDYN Mackay Mackrodt -MacOS +macOS Macromolecules macroparticle Maday