Merge branch 'master' into feature/cmake

This commit is contained in:
Angus Gratton
2018-08-16 15:01:43 +10:00
committed by Angus Gratton
1085 changed files with 86220 additions and 78268 deletions

View File

@@ -1,4 +1,4 @@
*************************************
*************************************
Standard Setup of Toolchain for Linux
*************************************
:link_to_translation:`zh_CN:[中文]`
@@ -56,7 +56,7 @@ ESP32 toolchain for Linux is available for download from Espressif website:
.. note::
If you have ``/bin/bash`` set as login shell, and both ``.bash_profile`` and ``.profile`` exist, then update ``.bash_profile`` instead.
If you have ``/bin/bash`` set as login shell, and both ``.bash_profile`` and ``.profile`` exist, then update ``.bash_profile`` instead. In CentOS, ``alias`` should set in ``.bashrc``.
3. Log off and log in back to make the ``.profile`` changes effective. Run the following command to verify if ``PATH`` is correctly set::