diff --git a/docs/codingstyle.rst b/docs/codingstyle.rst index 9fc5c6c2ea2..8a467400a2c 100644 --- a/docs/codingstyle.rst +++ b/docs/codingstyle.rst @@ -51,7 +51,7 @@ Add this to your ``.vimrc`` to automatically format any C & C++ file If ``/usr/share/clang/clang-format.py`` doesn't exist, try ``/usr/share/clang/clang-format-$CLANG_VERSION/clang-format.py`` -(replacing ``$CLANG_VERSION`` with your clang version). If your distro +(replacing ``$CLANG_VERSION`` with your clang version). If your distribution has put the file somewhere else, look through the files in the package providing ``clang-format``. @@ -82,8 +82,8 @@ Add this to your ``.emacs`` to automatically format any C & C++ file (add-hook 'c++-mode-hook (lambda () (clang-format-save-hook-for-this-buffer))) If ``/usr/share/clang/clang-format.el`` doesn't exist, look through the -files in the package providing ``clang-format`` in your distro. If you -can't find anything (e.g. on Debian/Ubuntu), refer to `this StackOverflow +files in the package providing ``clang-format`` in your distribution. +If you can't find anything (e.g. on Debian/Ubuntu), refer to `this StackOverflow answer `__ to install clang-format through Emacs instead. diff --git a/docs/faq.rst b/docs/faq.rst index 20780ccbe4d..e9fec60c98b 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -125,8 +125,8 @@ popular and feature-complete. 2.1 What's the easiest way to install Mesa? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you're using a Linux-based system, your distro CD most likely already -has Mesa packages (like RPM or DEB) which you can easily install. +If you're using a Linux-based system, your distribution +most likely already includes Mesa packages. 2.2 I get undefined symbols such as bgnpolygon, v3f, etc... ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/install.rst b/docs/install.rst index 29673a3dfdd..08684cc15dc 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -66,7 +66,7 @@ Check/install the respective development package as prompted by the configure error message. Here are some common ways to retrieve most/all of the dependencies based -on the packaging tool used by your distro. +on the packaging tool used by your distribution. .. code-block:: sh diff --git a/docs/meson.rst b/docs/meson.rst index 219d9892bac..65d1b80de54 100644 --- a/docs/meson.rst +++ b/docs/meson.rst @@ -51,7 +51,7 @@ most of these with just one command. On Fedora and similar, ``sudo dnf builddep mesa`` does the same. .. note:: - All these dependencies are for latest linux distros and is tested on ubuntu-24 only for now. + All these dependencies are for latest Linux distributions and is tested on Ubuntu 24.xx only for now. Also note, some packages below might not be available in your OS with the exact name, in such case you can search for it and install the distribution specific one. diff --git a/docs/submittingpatches.rst b/docs/submittingpatches.rst index d13bffe80fa..4aeeeb28e04 100644 --- a/docs/submittingpatches.rst +++ b/docs/submittingpatches.rst @@ -413,7 +413,7 @@ Our documentation is written as `reStructuredText`_ files in the .. code-block:: sh - # Install dependencies (adapt for your distro) + # Install dependencies (adapt for your distribution) apk add coreutils graphviz py3-clang clang-dev musl-dev linux-headers pip3 install sphinx===5.1.1 mako===1.2.3 hawkmoth===0.16.0