From 52d888a68bdfa3584d329649ee7dda165a9d6c44 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 23 Mar 2020 10:27:51 +1100 Subject: [PATCH] docs: Fix broken URLs & permanent redirects --- CONTRIBUTING.rst | 4 ++-- docs/Doxyfile | 2 +- docs/en/COPYRIGHT.rst | 4 ++-- docs/en/api-guides/app_trace.rst | 2 +- docs/en/api-guides/build-system.rst | 4 ++-- docs/en/api-guides/error-handling.rst | 2 +- .../esp-ble-mesh/ble-mesh-index.rst | 12 +++++------ .../esp-ble-mesh/ble-mesh-terminology.rst | 2 +- docs/en/api-guides/freertos-smp.rst | 2 +- .../jtag-debugging/configure-wrover.rst | 6 +++--- .../jtag-debugging/debugging-examples.rst | 2 +- docs/en/contribute/documenting-code.rst | 20 ++++++++++--------- docs/en/contribute/style-guide.rst | 2 +- .../establish-serial-connection.rst | 4 ++-- .../windows-setup-scratch.rst | 2 +- docs/en/get-started-legacy/windows-setup.rst | 2 +- .../establish-serial-connection.rst | 4 ++-- docs/en/get-started/windows-setup-scratch.rst | 2 +- docs/en/get-started/windows-setup.rst | 2 +- .../esp32/inc/modules-and-boards-esp32.rst | 4 ++-- .../inc/modules-and-boards-esp32s2.rst | 4 ++-- .../modules-and-boards-previous.rst | 2 +- docs/en/resources.rst | 2 +- docs/zh_CN/api-guides/build-system.rst | 4 ++-- docs/zh_CN/api-guides/error-handling.rst | 2 +- .../esp-ble-mesh/ble-mesh-index.rst | 12 +++++------ .../jtag-debugging/configure-wrover.rst | 4 ++-- .../jtag-debugging/debugging-examples.rst | 2 +- docs/zh_CN/contribute/documenting-code.rst | 14 +++++++------ .../establish-serial-connection.rst | 6 +++--- .../windows-setup-scratch.rst | 2 +- .../get-started-legacy/windows-setup.rst | 2 +- .../establish-serial-connection.rst | 6 +++--- .../get-started/windows-setup-scratch.rst | 2 +- docs/zh_CN/get-started/windows-setup.rst | 2 +- .../esp32/inc/modules-and-boards-esp32.rst | 2 +- .../modules-and-boards-previous.rst | 2 +- docs/zh_CN/resources.rst | 4 ++-- 38 files changed, 81 insertions(+), 77 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index e9ba5d779..e2112a00a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -6,7 +6,7 @@ We welcome contributions to the esp-idf project! How to Contribute ----------------- -Contributions to esp-idf - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests `_. +Contributions to esp-idf - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests `_. Before Contributing ------------------- @@ -27,7 +27,7 @@ Before sending us a Pull Request, please consider this list of points: * Example contributions are also welcome. Please check the :doc:`creating-examples` guide for these. -* If the contribution contains multiple commits, are they grouped together into logical changes (one major change per pull request)? Are any commits with names like "fixed typo" `squashed into previous commits `_? +* If the contribution contains multiple commits, are they grouped together into logical changes (one major change per pull request)? Are any commits with names like "fixed typo" `squashed into previous commits `_? * If you're unsure about any of these points, please open the Pull Request anyhow and then ask us for feedback. diff --git a/docs/Doxyfile b/docs/Doxyfile index adc136469..84269c282 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -10,7 +10,7 @@ # Make sure that correct warnings are generated to flag issues with documented code # # For the complete list of configuration statements see: -# https://www.stack.nl/~dimitri/doxygen/manual/config.html +# http://doxygen.nl/manual/config.html PROJECT_NAME = "ESP32 Programming Guide" diff --git a/docs/en/COPYRIGHT.rst b/docs/en/COPYRIGHT.rst index 07baa1201..928c1b8a7 100644 --- a/docs/en/COPYRIGHT.rst +++ b/docs/en/COPYRIGHT.rst @@ -150,7 +150,7 @@ Copyright (C) 2011, ChaN, all right reserved. .. _Newlib: https://sourceware.org/newlib/ -.. _FreeRTOS: http://freertos.org/ +.. _FreeRTOS: https://freertos.org/ .. _esptool.py: https://github.com/espressif/esptool .. _LWIP: https://savannah.nongnu.org/projects/lwip/ .. _TinyBasic: https://github.com/BleuLlama/TinyBasicPlus @@ -158,7 +158,7 @@ Copyright (C) 2011, ChaN, all right reserved. .. _wpa_supplicant: https://w1.fi/wpa_supplicant/ .. _FreeBSD net80211: https://github.com/freebsd/freebsd/tree/master/sys/net80211 .. _TJpgDec: http://elm-chan.org/fsw/tjpgd/00index.html -.. _JSMN: http://zserge.com/jsmn.html +.. _JSMN: https://zserge.com/jsmn.html .. _argtable3: https://github.com/argtable/argtable3 .. _linenoise: https://github.com/antirez/linenoise .. _libcoap: https://github.com/obgm/libcoap diff --git a/docs/en/api-guides/app_trace.rst b/docs/en/api-guides/app_trace.rst index dd95b985b..b2bb75de3 100644 --- a/docs/en/api-guides/app_trace.rst +++ b/docs/en/api-guides/app_trace.rst @@ -430,7 +430,7 @@ After installing Impulse and ensuring that it can successfully load trace files 6. Double-click on created port. View for this port should open. 7. Click Start/Stop Streaming button. Data should be loaded. 8. Use 'Zoom Out', 'Zoom In' and 'Zoom Fit' button to inspect data. -9. For settings measurement cursors and other features please see `Impulse documentation `_). +9. For settings measurement cursors and other features please see `Impulse documentation `_). .. note:: diff --git a/docs/en/api-guides/build-system.rst b/docs/en/api-guides/build-system.rst index f783f8e27..0a949aae6 100644 --- a/docs/en/api-guides/build-system.rst +++ b/docs/en/api-guides/build-system.rst @@ -1543,7 +1543,7 @@ Flashing from make .. _cmake project: https://cmake.org/cmake/help/v3.5/command/project.html .. _cmake set: https://cmake.org/cmake/help/v3.5/command/set.html .. _cmake string: https://cmake.org/cmake/help/v3.5/command/string.html -.. _cmake faq generated files: https://cmake.org/Wiki/CMake_FAQ#How_can_I_generate_a_source_file_during_the_build.3F +.. _cmake faq generated files: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#how-can-i-generate-a-source-file-during-the-build .. _ADDITIONAL_MAKE_CLEAN_FILES: https://cmake.org/cmake/help/v3.5/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.html .. _ExternalProject: https://cmake.org/cmake/help/v3.5/module/ExternalProject.html .. _cmake language variables: https://cmake.org/cmake/help/v3.5/manual/cmake-variables.7.html#variables-for-languages @@ -1552,6 +1552,6 @@ Flashing from make .. _target_link_libraries: https://cmake.org/cmake/help/v3.5/command/target_link_libraries.html#command:target_link_libraries .. _cmake_toolchain_file: https://cmake.org/cmake/help/v3.5/variable/CMAKE_TOOLCHAIN_FILE.html .. _quirc: https://github.com/dlbeer/quirc -.. _pyenv: https://github.com/pyenv/pyenv#README +.. _pyenv: https://github.com/pyenv/pyenv#readme .. _virtualenv: https://virtualenv.pypa.io/en/stable/ .. _CCache: https://ccache.dev/ diff --git a/docs/en/api-guides/error-handling.rst b/docs/en/api-guides/error-handling.rst index bd908de75..86277266b 100644 --- a/docs/en/api-guides/error-handling.rst +++ b/docs/en/api-guides/error-handling.rst @@ -39,7 +39,7 @@ Converting error codes to error messages For each error code defined in ESP-IDF components, :cpp:type:`esp_err_t` value can be converted to an error code name using :cpp:func:`esp_err_to_name` or :cpp:func:`esp_err_to_name_r` functions. For example, passing ``0x101`` to :cpp:func:`esp_err_to_name` will return "ESP_ERR_NO_MEM" string. Such strings can be used in log output to make it easier to understand which error has happened. -Additionally, :cpp:func:`esp_err_to_name_r` function will attempt to interpret the error code as a `standard POSIX error code `_, if no matching ``ESP_ERR_`` value is found. This is done using ``strerror_r`` function. POSIX error codes (such as ``ENOENT``, ``ENOMEM``) are defined in ``errno.h`` and are typically obtained from ``errno`` variable. In ESP-IDF this variable is thread-local: multiple FreeRTOS tasks have their own copies of ``errno``. Functions which set ``errno`` only modify its value for the task they run in. +Additionally, :cpp:func:`esp_err_to_name_r` function will attempt to interpret the error code as a `standard POSIX error code `_, if no matching ``ESP_ERR_`` value is found. This is done using ``strerror_r`` function. POSIX error codes (such as ``ENOENT``, ``ENOMEM``) are defined in ``errno.h`` and are typically obtained from ``errno`` variable. In ESP-IDF this variable is thread-local: multiple FreeRTOS tasks have their own copies of ``errno``. Functions which set ``errno`` only modify its value for the task they run in. This feature is enabled by default, but can be disabled to reduce application binary size. See :ref:`CONFIG_ESP_ERR_TO_NAME_LOOKUP`. When this feature is disabled, :cpp:func:`esp_err_to_name` and :cpp:func:`esp_err_to_name_r` are still defined and can be called. In this case, :cpp:func:`esp_err_to_name` will return ``UNKNOWN ERROR``, and :cpp:func:`esp_err_to_name_r` will return ``Unknown error 0xXXXX(YYYYY)``, where ``0xXXXX`` and ``YYYYY`` are the hexadecimal and decimal representations of the error code, respectively. diff --git a/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst b/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst index 4a13c682a..275a2058c 100644 --- a/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst +++ b/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst @@ -264,12 +264,12 @@ Bluetooth SIG Documentation - `BLE Mesh Core Specification `_ - `BLE Mesh Model Specification `_ -- `An Intro to Bluetooth Mesh Part 1 `_ / `Part 2 `__ -- `The Fundamental Concepts of Bluetooth Mesh Networking, Part 1 `_ / `Part 2 `__ -- `Bluetooth Mesh Networking: Friendship `_ -- `Management of Devices in a Bluetooth Mesh Network `_ -- `Bluetooth Mesh Security Overview `_ -- `Provisioning a Bluetooth Mesh Network Part 1 `_ / `Part 2 `__ +- `An Intro to Bluetooth Mesh Part 1 `_ / `Part 2 `__ +- `The Fundamental Concepts of Bluetooth Mesh Networking, Part 1 `_ / `Part 2 `__ +- `Bluetooth Mesh Networking: Friendship `_ +- `Management of Devices in a Bluetooth Mesh Network `_ +- `Bluetooth Mesh Security Overview `_ +- `Provisioning a Bluetooth Mesh Network Part 1 `_ / `Part 2 `__ .. _ESP32-DevKitC: https://www.espressif.com/en/products/hardware/esp32-devkitc/overview diff --git a/docs/en/api-guides/esp-ble-mesh/ble-mesh-terminology.rst b/docs/en/api-guides/esp-ble-mesh/ble-mesh-terminology.rst index ee6ce6150..ad6ca0fae 100644 --- a/docs/en/api-guides/esp-ble-mesh/ble-mesh-terminology.rst +++ b/docs/en/api-guides/esp-ble-mesh/ble-mesh-terminology.rst @@ -215,7 +215,7 @@ ESP-BLE-MESH Terminology - A node can also use an IV Update procedure to signal to peer nodes that it is updating the IV Index. - The IV Update procedure is used to update the value of ESP-BLE-MESH network's IV Index. This value is related to the random number required for message encryption. To ensure that the value of the random number is not repeated, this value is periodically incremented. IV Index is a 32-bit value and a shared network resource. For example, all nodes in a mesh network share the same IV Index value. Starting from 0x00000000, the IV Index increments during the IV Update procedure and maintained by a specific process, ensuring the IV Index shared in the mesh network is the same. This can be done when the node believes that it has the risk of exhausting its sequence number, or when it determines that another node is nearly exhausting its sequence number. Note: The update time must not be less than 96 hours. It can be triggered when a secure network beacon is received, or when the node determines that its sequence number is greater than a certain value. -For more terms, please see: `ESP-BLE-MESH Glossary of Terms `_. +For more terms, please see: `ESP-BLE-MESH Glossary of Terms `_. diff --git a/docs/en/api-guides/freertos-smp.rst b/docs/en/api-guides/freertos-smp.rst index cb5e71c4e..a0dd96d22 100644 --- a/docs/en/api-guides/freertos-smp.rst +++ b/docs/en/api-guides/freertos-smp.rst @@ -16,7 +16,7 @@ The ESP-IDF FreeRTOS is a modified version of vanilla FreeRTOS which supports symmetric multiprocessing (SMP). ESP-IDF FreeRTOS is based on the Xtensa port of FreeRTOS v8.2.0. This guide outlines the major differences between vanilla FreeRTOS and ESP-IDF FreeRTOS. The API reference for vanilla FreeRTOS can be -found via http://www.freertos.org/a00106.html +found via https://www.freertos.org/a00106.html For information regarding features that are exclusive to ESP-IDF FreeRTOS, see :doc:`ESP-IDF FreeRTOS Additions<../api-reference/system/freertos_additions>`. diff --git a/docs/en/api-guides/jtag-debugging/configure-wrover.rst b/docs/en/api-guides/jtag-debugging/configure-wrover.rst index 93d08179a..441c31b08 100644 --- a/docs/en/api-guides/jtag-debugging/configure-wrover.rst +++ b/docs/en/api-guides/jtag-debugging/configure-wrover.rst @@ -40,9 +40,9 @@ Windows 1. Using standard USB A / micro USB B cable connect ESP-WROVER-KIT to the computer. Switch the WROVER KIT on. -2. Wait until USB ports of WROVER KIT are recognized by Windows and drives are installed. If they do not install automatically, then download them from http://www.ftdichip.com/Drivers/D2XX.htm and install manually. +2. Wait until USB ports of WROVER KIT are recognized by Windows and drives are installed. If they do not install automatically, then download them from https://www.ftdichip.com/Drivers/D2XX.htm and install manually. -3. Download Zadig tool (Zadig_X.X.exe) from http://zadig.akeo.ie/ and run it. +3. Download Zadig tool (Zadig_X.X.exe) from https://zadig.akeo.ie/ and run it. 4. In Zadig tool go to "Options" and check "List All Devices". @@ -109,7 +109,7 @@ On macOS, using FT2232 for JTAG and serial port at the same time needs some addi Manually unloading the driver ............................. -1. Install FTDI driver from http://www.ftdichip.com/Drivers/VCP.htm +1. Install FTDI driver from https://www.ftdichip.com/Drivers/VCP.htm 2. Connect USB cable to the WROVER KIT. diff --git a/docs/en/api-guides/jtag-debugging/debugging-examples.rst b/docs/en/api-guides/jtag-debugging/debugging-examples.rst index 9448f412d..7b8885b9c 100644 --- a/docs/en/api-guides/jtag-debugging/debugging-examples.rst +++ b/docs/en/api-guides/jtag-debugging/debugging-examples.rst @@ -640,7 +640,7 @@ Commands presented so for should provide are very basis and intended to let you the call, in effect treating it as a single source line. (gdb) -By typing just ``help``, you will get top level list of command classes, to aid you drilling down to more details. Optionally refer to available GDB cheat sheets, for instance http://darkdust.net/files/GDB%20Cheat%20Sheet.pdf. Good to have as a reference (even if not all commands are applicable in an embedded environment). +By typing just ``help``, you will get top level list of command classes, to aid you drilling down to more details. Optionally refer to available GDB cheat sheets, for instance https://darkdust.net/files/GDB%20Cheat%20Sheet.pdf. Good to have as a reference (even if not all commands are applicable in an embedded environment). Ending debugger session diff --git a/docs/en/contribute/documenting-code.rst b/docs/en/contribute/documenting-code.rst index 6721611ca..3f0246aa9 100644 --- a/docs/en/contribute/documenting-code.rst +++ b/docs/en/contribute/documenting-code.rst @@ -9,7 +9,7 @@ The purpose of this description is to provide quick summary on documentation sty Introduction ------------ -When documenting code for this repository, please follow `Doxygen style `_. You are doing it by inserting special commands, for instance ``@param``, into standard comments blocks, for example: :: +When documenting code for this repository, please follow `Doxygen style `_. You are doing it by inserting special commands, for instance ``@param``, into standard comments blocks, for example: :: /** * @param ratio this is oxygen to air ratio @@ -23,13 +23,13 @@ Typical comment block, that contains documentation of a function, looks like bel :align: center :alt: Sample inline code documentation -Doxygen supports couple of formatting styles. It also gives you great flexibility on level of details to include in documentation. To get familiar with available features, please check data rich and very well organized `Doxygen Manual `_. +Doxygen supports couple of formatting styles. It also gives you great flexibility on level of details to include in documentation. To get familiar with available features, please check data rich and very well organized `Doxygen Manual `_. Why we need it? --------------- -The ultimate goal is to ensure that all the code is consistently documented, so we can use tools like `Sphinx `_ and `Breathe `_ to aid preparation and automatic updates of API documentation when the code changes. +The ultimate goal is to ensure that all the code is consistently documented, so we can use tools like `Sphinx`_ and `Breathe`_ to aid preparation and automatic updates of API documentation when the code changes. With these tools the above piece of code renders like below: @@ -335,13 +335,13 @@ Once documentation is ready, follow instruction in :doc:`../api-reference/templa OK, but I am new to Sphinx! --------------------------- -1. No worries. All the software you need is well documented. It is also open source and free. Start by checking `Sphinx `_ documentation. If you are not clear how to write using rst markup language, see `reStructuredText Primer `_. You can also use markdown (.md) files, and find out about more about the specific markdown syntax that we use on`Recommonmark parser's documentation page `_. +1. No worries. All the software you need is well documented. It is also open source and free. Start by checking `Sphinx`_ documentation. If you are not clear how to write using rst markup language, see `reStructuredText Primer `_. You can also use markdown (.md) files, and find out about more about the specific markdown syntax that we use on`Recommonmark parser's documentation page `_. 2. Check the source files of this documentation to understand what is behind of what you see now on the screen. Sources are maintained on GitHub in `espressif/esp-idf`_ repository in :idf:`docs` folder. You can go directly to the source file of this page by scrolling up and clicking the link in the top right corner. When on GitHub, see what's really inside, open source files by clicking ``Raw`` button. 3. You will likely want to see how documentation builds and looks like before posting it on the GitHub. There are two options to do so: - * Install `Sphinx `_, `Breathe `_, `Blockdiag `_ and `Doxygen `_ to build it locally, see chapter below. + * Install `Sphinx`_, `Breathe`_, `Blockdiag `_ and `Doxygen `_ to build it locally, see chapter below. * Set up an account on `Read the Docs `_ and build documentation in the cloud. Read the Docs provides document building and hosting for free and their service works really quick and great. @@ -358,15 +358,15 @@ Install Dependencies You can setup environment to build documentation locally on your PC by installing: -1. Doxygen - https://www.stack.nl/~dimitri/doxygen/ +1. Doxygen - http://doxygen.nl/ 2. Sphinx - https://github.com/sphinx-doc/sphinx/#readme-for-sphinx 3. Breathe - https://github.com/michaeljones/breathe#breathe -4. Document theme "sphinx_idf_theme" - https://github.com/rtfd/sphinx_idf_theme -5. Custom 404 page "sphinx-notfound-page" - https://github.com/rtfd/sphinx-notfound-page +4. Document theme "sphinx_idf_theme" - https://github.com/espressif/sphinx_idf_theme +5. Custom 404 page "sphinx-notfound-page" - https://github.com/readthedocs/sphinx-notfound-page 6. Blockdiag - http://blockdiag.com/en/index.html 7. Recommonmark - https://github.com/rtfd/recommonmark -The package "sphinx_idf_theme" is added to have the same "look and feel" of `ESP32 Programming Guide `_. +The package "sphinx_idf_theme" is added to have the same "look and feel" of `ESP32 Programming Guide `_. Do not worry about being confronted with several packages to install. Besides Doxygen and sphinx_idf_theme, all remaining packages are written in pure Python. Therefore installation of all of them is combined into one simple step. @@ -490,3 +490,5 @@ Related Documents .. _interactive shell: http://interactive.blockdiag.com/?compression=deflate&src=eJxlUMFOwzAMvecrrO3aITYQQirlAIIzEseJQ5q4TUSIq8TVGIh_J2m7jbKc7Ge_5_dSO1Lv2soWvoVYgieNoMh7VGzJR9FJtugZ7lYQ0UcKEbYNOY36rRQHZHUPT68vV5tceGLbWCUzPfeaFFMoBZzecVc56vWwJFnWMmJ59CCZg617xpOFbTSyw0pmvT_HJ7hxtFNGBr6wvuu5SCkchcrZ1vAeXZomznh5YgTqfcpR02cBO6vZVDeXBRjMjKEcFRbLh8f18-Z2UUBDnqP9wmp9ncRmSSfND2ldGo2h_zse407g0Mxc1q7HzJ3-4jzYYTJjtQH3iSV-fgFzx50J +.. _Sphinx: https://www.sphinx-doc.org/ +.. _Breathe: https://breathe.readthedocs.io diff --git a/docs/en/contribute/style-guide.rst b/docs/en/contribute/style-guide.rst index f3f04dfad..eb01cc2c0 100644 --- a/docs/en/contribute/style-guide.rst +++ b/docs/en/contribute/style-guide.rst @@ -333,7 +333,7 @@ Configuring the Code Style for a Project Using EditorConfig EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readable and they work nicely with version control systems. -For more information, see `EditorConfig `_ Website. +For more information, see `EditorConfig `_ Website. Documenting Code diff --git a/docs/en/get-started-legacy/establish-serial-connection.rst b/docs/en/get-started-legacy/establish-serial-connection.rst index d52ab57b0..e44bf73d2 100644 --- a/docs/en/get-started-legacy/establish-serial-connection.rst +++ b/docs/en/get-started-legacy/establish-serial-connection.rst @@ -30,11 +30,11 @@ Below are the links to drivers for ESP32 and other boards produced by Espressif: `ESP32-Sense Kit `_, n/a, Use with `ESP-Prog`_ .. _CP210x: https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers -.. _FTDI: http://www.ftdichip.com/Drivers/VCP.htm +.. _FTDI: https://www.ftdichip.com/Drivers/VCP.htm .. _ESP-Prog: https://github.com/espressif/esp-iot-solution/blob/master/documents/evaluation_boards/ESP-Prog_guide_en.md#introduction-to-the-esp-prog-board * CP210x: `CP210x USB to UART Bridge VCP Drivers `_ -* FTDI: `FTDI Virtual COM Port Drivers `_ +* FTDI: `FTDI Virtual COM Port Drivers `_ The drivers above are primarily for reference. Under normal circumstances, the drivers should be bundled with and operating system and automatically installed upon connecting one of the listed boards to the PC. diff --git a/docs/en/get-started-legacy/windows-setup-scratch.rst b/docs/en/get-started-legacy/windows-setup-scratch.rst index 5128e5c35..14d525ee3 100644 --- a/docs/en/get-started-legacy/windows-setup-scratch.rst +++ b/docs/en/get-started-legacy/windows-setup-scratch.rst @@ -114,6 +114,6 @@ The script to update MSYS2 may also fail with the same errors mentioned under Tr If you need to support multiple IDF versions concurrently, you can have different independent MSYS2 environments in different directories. Alternatively you can download multiple toolchains and unzip these to different directories, then use the PATH environment variable to set which one is the default. -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ .. _MSYS2-packages issues list: https://github.com/Alexpux/MSYS2-packages/issues/ .. _raise an IDF issue: https://github.com/espressif/esp-idf/issues/new diff --git a/docs/en/get-started-legacy/windows-setup.rst b/docs/en/get-started-legacy/windows-setup.rst index c372b8796..eb6b28922 100644 --- a/docs/en/get-started-legacy/windows-setup.rst +++ b/docs/en/get-started-legacy/windows-setup.rst @@ -73,4 +73,4 @@ Related Documents windows-setup-scratch -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ diff --git a/docs/en/get-started/establish-serial-connection.rst b/docs/en/get-started/establish-serial-connection.rst index 903cdea1e..2282acfc0 100644 --- a/docs/en/get-started/establish-serial-connection.rst +++ b/docs/en/get-started/establish-serial-connection.rst @@ -30,11 +30,11 @@ Below are the links to drivers for {IDF_TARGET_NAME} boards produced by Espressi `ESP32-Sense Kit `_, n/a, Use with `ESP-Prog`_ .. _CP210x: https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers - .. _FTDI: http://www.ftdichip.com/Drivers/VCP.htm + .. _FTDI: https://www.ftdichip.com/Drivers/VCP.htm .. _ESP-Prog: https://github.com/espressif/esp-iot-solution/blob/master/documents/evaluation_boards/ESP-Prog_guide_en.md#introduction-to-the-esp-prog-board * CP210x: `CP210x USB to UART Bridge VCP Drivers `_ -* FTDI: `FTDI Virtual COM Port Drivers `_ +* FTDI: `FTDI Virtual COM Port Drivers `_ The drivers above are primarily for reference. Under normal circumstances, the drivers should be bundled with and operating system and automatically installed upon connecting one of the listed boards to the PC. diff --git a/docs/en/get-started/windows-setup-scratch.rst b/docs/en/get-started/windows-setup-scratch.rst index 40235d986..b1d622265 100644 --- a/docs/en/get-started/windows-setup-scratch.rst +++ b/docs/en/get-started/windows-setup-scratch.rst @@ -110,7 +110,7 @@ To carry on with development environment setup, proceed to :ref:`get-started-get .. _ninja: https://ninja-build.org/ .. _ninja-dl: https://github.com/ninja-build/ninja/releases .. _Python: https://www.python.org/downloads/windows/ -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ .. _kconfig-frontends releases page: https://github.com/espressif/kconfig-frontends/releases .. _Stable version: https://docs.espressif.com/projects/esp-idf/en/stable/ diff --git a/docs/en/get-started/windows-setup.rst b/docs/en/get-started/windows-setup.rst index 601a9a03e..4ab49399a 100644 --- a/docs/en/get-started/windows-setup.rst +++ b/docs/en/get-started/windows-setup.rst @@ -63,7 +63,7 @@ For advanced users who want to customize the install process: windows-setup-scratch windows-setup-update -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ .. _cmake: https://cmake.org/download/ .. _ninja: https://ninja-build.org/ .. _Python: https://www.python.org/downloads/windows/ diff --git a/docs/en/hw-reference/esp32/inc/modules-and-boards-esp32.rst b/docs/en/hw-reference/esp32/inc/modules-and-boards-esp32.rst index fc18de334..0352694a4 100644 --- a/docs/en/hw-reference/esp32/inc/modules-and-boards-esp32.rst +++ b/docs/en/hw-reference/esp32/inc/modules-and-boards-esp32.rst @@ -285,5 +285,5 @@ Previous Versions * :ref:`esp-modules-and-boards-esp-wrover-kit-v1` -.. _FTDI Virtual COM Port Drivers: http://www.ftdichip.com/Drivers/VCP.htm -.. _Espressif Products Ordering Information: https://www.espressif.com/sites/default/files/documentation/espressif_products_ordering_information_en.pdf \ No newline at end of file +.. _FTDI Virtual COM Port Drivers: https://www.ftdichip.com/Drivers/VCP.htm +.. _Espressif Products Ordering Information: https://www.espressif.com/sites/default/files/documentation/espressif_products_ordering_information_en.pdf diff --git a/docs/en/hw-reference/esp32s2/inc/modules-and-boards-esp32s2.rst b/docs/en/hw-reference/esp32s2/inc/modules-and-boards-esp32s2.rst index c5e67936a..8ed23bb5c 100644 --- a/docs/en/hw-reference/esp32s2/inc/modules-and-boards-esp32s2.rst +++ b/docs/en/hw-reference/esp32s2/inc/modules-and-boards-esp32s2.rst @@ -17,5 +17,5 @@ ESP32-S2-WROOM-32 ESP32-S2 2 N/A MIFA 16 x 23 x 3 * U.FL - U.FL / IPEX antenna connector -.. _FTDI Virtual COM Port Drivers: http://www.ftdichip.com/Drivers/VCP.htm -.. _Espressif Products Ordering Information: https://www.espressif.com/sites/default/files/documentation/espressif_products_ordering_information_en.pdf \ No newline at end of file +.. _FTDI Virtual COM Port Drivers: https://www.ftdichip.com/Drivers/VCP.htm +.. _Espressif Products Ordering Information: https://www.espressif.com/sites/default/files/documentation/espressif_products_ordering_information_en.pdf diff --git a/docs/en/hw-reference/modules-and-boards-previous.rst b/docs/en/hw-reference/modules-and-boards-previous.rst index ce44b57f4..92aa2d673 100644 --- a/docs/en/hw-reference/modules-and-boards-previous.rst +++ b/docs/en/hw-reference/modules-and-boards-previous.rst @@ -21,4 +21,4 @@ Related Documents * :doc:`modules-and-boards` -.. _FTDI Virtual COM Port Drivers: http://www.ftdichip.com/Drivers/VCP.htm +.. _FTDI Virtual COM Port Drivers: https://www.ftdichip.com/Drivers/VCP.htm diff --git a/docs/en/resources.rst b/docs/en/resources.rst index 20d6a7705..02a61cca1 100644 --- a/docs/en/resources.rst +++ b/docs/en/resources.rst @@ -9,7 +9,7 @@ Resources * A comprehensive collection of `solutions `_, `practical applications `_, `components and drivers `_ based on ESP-IDF is available in `ESP32 IoT Solution `_ repository. In most of cases descriptions are provided both in English and in 中文. -* To develop applications using Arduino platform, refer to `Arduino core for ESP32 WiFi chip `_. +* To develop applications using Arduino platform, refer to `Arduino core for ESP32 WiFi chip `_. * Several `books `_ have been written about ESP32 and they are listed on `Espressif `__ web site. diff --git a/docs/zh_CN/api-guides/build-system.rst b/docs/zh_CN/api-guides/build-system.rst index 6b6b35275..2ac0152a5 100644 --- a/docs/zh_CN/api-guides/build-system.rst +++ b/docs/zh_CN/api-guides/build-system.rst @@ -1015,7 +1015,7 @@ CMake 中不可用的功能 .. _cmake project: https://cmake.org/cmake/help/v3.5/command/project.html .. _cmake set: https://cmake.org/cmake/help/v3.5/command/set.html .. _cmake string: https://cmake.org/cmake/help/v3.5/command/string.html -.. _cmake faq generated files: https://cmake.org/Wiki/CMake_FAQ#How_can_I_generate_a_source_file_during_the_build.3F +.. _cmake faq generated files: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#how-can-i-generate-a-source-file-during-the-build .. _ADDITIONAL_MAKE_CLEAN_FILES: https://cmake.org/cmake/help/v3.5/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.html .. _ExternalProject: https://cmake.org/cmake/help/v3.5/module/ExternalProject.html .. _cmake language variables: https://cmake.org/cmake/help/v3.5/manual/cmake-variables.7.html#variables-for-languages @@ -1024,5 +1024,5 @@ CMake 中不可用的功能 .. _target_link_libraries: https://cmake.org/cmake/help/v3.5/command/target_link_libraries.html#command:target_link_libraries .. _cmake_toolchain_file: https://cmake.org/cmake/help/v3.5/variable/CMAKE_TOOLCHAIN_FILE.html .. _quirc: https://github.com/dlbeer/quirc -.. _pyenv: https://github.com/pyenv/pyenv#README +.. _pyenv: https://github.com/pyenv/pyenv#readme .. _virtualenv: https://virtualenv.pypa.io/en/stable/ diff --git a/docs/zh_CN/api-guides/error-handling.rst b/docs/zh_CN/api-guides/error-handling.rst index 025d3695a..827b878f0 100644 --- a/docs/zh_CN/api-guides/error-handling.rst +++ b/docs/zh_CN/api-guides/error-handling.rst @@ -38,7 +38,7 @@ ESP-IDF 中大多数函数会返回 :cpp:type:`esp_err_t` 类型的错误码， 错误代码并不直观，因此 ESP-IDF 还可以使用 :cpp:func:`esp_err_to_name` 或者 :cpp:func:`esp_err_to_name_r` 函数，将错误代码转换为具体的错误消息。例如，我们可以向 :cpp:func:`esp_err_to_name` 函数传递错误代码 ``0x101``，可以得到返回字符串 “ESP_ERR_NO_MEM”。这样一来，我们可以在日志中输出更加直观的错误消息，而不是简单的错误码，从而帮助研发人员更快理解发生了何种错误。 -此外，如果出现找不到匹配的 ``ESP_ERR_`` 值的情况，函数 :cpp:func:`esp_err_to_name_r` 则会尝试将错误码作为一种 `标准 POSIX 错误代码 `_ 进行解释。具体过程为：POSIX 错误代码（例如 ``ENOENT``， ``ENOMEM``）定义在 ``errno.h`` 文件中，可以通过 ``errno`` 变量获得，进而调用 ``strerror_r`` 函数实现。在 ESP-IDF 中，``errno`` 是一个基于线程的局部变量，即每个 FreeRTOS 任务都有自己的 ``errno`` 副本，通过函数修改 ``errno`` 也只会作用于当前任务中的 ``errno`` 变量值。 +此外，如果出现找不到匹配的 ``ESP_ERR_`` 值的情况，函数 :cpp:func:`esp_err_to_name_r` 则会尝试将错误码作为一种 `标准 POSIX 错误代码 `_ 进行解释。具体过程为：POSIX 错误代码（例如 ``ENOENT``， ``ENOMEM``）定义在 ``errno.h`` 文件中，可以通过 ``errno`` 变量获得，进而调用 ``strerror_r`` 函数实现。在 ESP-IDF 中，``errno`` 是一个基于线程的局部变量，即每个 FreeRTOS 任务都有自己的 ``errno`` 副本，通过函数修改 ``errno`` 也只会作用于当前任务中的 ``errno`` 变量值。 该功能（即在无法匹配 ``ESP_ERR_`` 值时，尝试用标准 POSIX 解释错误码）默认启用。用户也可以禁用该功能，从而减小应用程序的二进制文件大小，详情可见 :ref:`CONFIG_ESP_ERR_TO_NAME_LOOKUP`。注意，该功能对禁用并不影响 :cpp:func:`esp_err_to_name` 和 :cpp:func:`esp_err_to_name_r` 函数的定义，用户仍可调用这两个函数转化错误码。在这种情况下， :cpp:func:`esp_err_to_name` 函数在遇到无法匹配错误码的情况会返回 ``UNKNOWN ERROR``，而 :cpp:func:`esp_err_to_name_r` 函数会返回 ``Unknown error 0xXXXX(YYYYY)``，其中 ``0xXXXX`` 和 ``YYYYY`` 分别代表错误代码的十六进制和十进制表示。 diff --git a/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst b/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst index 0865d3529..6f91aece7 100644 --- a/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst +++ b/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst @@ -264,12 +264,12 @@ ESP-BLE-MESH 常见问题手册 - `BLE Mesh Profile Specification `_ - `BLE Mesh Model Specification `_ -- `An Intro to Bluetooth Mesh Part 1 `_ / `Part 2 `__ -- `The Fundamental Concepts of Bluetooth Mesh Networking, Part 1 `_ / `Part 2 `__ -- `Bluetooth Mesh Networking: Friendship `_ -- `Management of Devices in a Bluetooth Mesh Network `_ -- `Bluetooth Mesh Security Overview `_ -- `Provisioning a Bluetooth Mesh Network Part 1 `_ / `Part 2 `__ +- `An Intro to Bluetooth Mesh Part 1 `_ / `Part 2 `__ +- `The Fundamental Concepts of Bluetooth Mesh Networking, Part 1 `_ / `Part 2 `__ +- `Bluetooth Mesh Networking: Friendship `_ +- `Management of Devices in a Bluetooth Mesh Network `_ +- `Bluetooth Mesh Security Overview `_ +- `Provisioning a Bluetooth Mesh Network Part 1 `_ / `Part 2 `__ .. _ESP32-DevKitC: https://www.espressif.com/en/products/hardware/esp32-devkitc/overview diff --git a/docs/zh_CN/api-guides/jtag-debugging/configure-wrover.rst b/docs/zh_CN/api-guides/jtag-debugging/configure-wrover.rst index 7553bd23a..842561c48 100644 --- a/docs/zh_CN/api-guides/jtag-debugging/configure-wrover.rst +++ b/docs/zh_CN/api-guides/jtag-debugging/configure-wrover.rst @@ -40,7 +40,7 @@ Windows 1. 使用标准 USB A / micro USB B 线将 ESP-WROVER-KIT 与计算机相连接，并打开板子的电源。 -2. 等待 Windows 识别出 ESP-WROVER-KIT 并且为其安装驱动。如果驱动没有被自动安装，请前往 `官网 `_ 下载并手动安装。 +2. 等待 Windows 识别出 ESP-WROVER-KIT 并且为其安装驱动。如果驱动没有被自动安装，请前往 `官网 `_ 下载并手动安装。 3. 从 `Zadig 官网 `_ 下载 Zadig 工具（Zadig_X.X.exe）并运行。 @@ -109,7 +109,7 @@ MacOS 手动卸载驱动程序 ................ -1. 从 `FTDI 官网 `_ 安装驱动。 +1. 从 `FTDI 官网 `_ 安装驱动。 2. 使用 USB 线连接 ESP-WROVER-KIT。 diff --git a/docs/zh_CN/api-guides/jtag-debugging/debugging-examples.rst b/docs/zh_CN/api-guides/jtag-debugging/debugging-examples.rst index 411919d1e..68b7725fe 100644 --- a/docs/zh_CN/api-guides/jtag-debugging/debugging-examples.rst +++ b/docs/zh_CN/api-guides/jtag-debugging/debugging-examples.rst @@ -638,7 +638,7 @@ the call, in effect treating it as a single source line. (gdb) -只需输入 ``help`` 命令，即可获得高级命令列表，帮助你了解更多详细信息。此外，还可以参考一些 GDB 命令速查表，比如 http://darkdust.net/files/GDB%20Cheat%20Sheet.pdf。虽然不是所有命令都适用于嵌入式环境，但还是会有所裨益。 +只需输入 ``help`` 命令，即可获得高级命令列表，帮助你了解更多详细信息。此外，还可以参考一些 GDB 命令速查表，比如 https://darkdust.net/files/GDB%20Cheat%20Sheet.pdf。虽然不是所有命令都适用于嵌入式环境，但还是会有所裨益。 结束调试会话 diff --git a/docs/zh_CN/contribute/documenting-code.rst b/docs/zh_CN/contribute/documenting-code.rst index 9998566da..bdba48f8f 100644 --- a/docs/zh_CN/contribute/documenting-code.rst +++ b/docs/zh_CN/contribute/documenting-code.rst @@ -8,7 +8,7 @@ 概述 ---- -在项目库内编写代码文档时，请遵循 `Doxygen 代码注释风格 `_。要采用这一风格，您可以将 ``@param`` 等特殊命令插入到标准注释块中，比如： :: +在项目库内编写代码文档时，请遵循 `Doxygen 代码注释风格 `_。要采用这一风格，您可以将 ``@param`` 等特殊命令插入到标准注释块中，比如： :: /** * @param ratio this is oxygen to air ratio @@ -22,13 +22,13 @@ Doxygen 会解析代码，提取命令和后续文本，生成代码文档。 :align: center :alt: 内联代码样本文档 -Doxygen 支持多种排版风格，对于文档中可以包含的细节非常灵活。请参考数据丰富、条理清晰的 `Doxygen 手册 `_ 熟悉 Doxygen 特性。 +Doxygen 支持多种排版风格，对于文档中可以包含的细节非常灵活。请参考数据丰富、条理清晰的 `Doxygen 手册 `_ 熟悉 Doxygen 特性。 为什么需要 Doxygen? -------------------- -使用 Doxygen 的最终目的是确保所有代码编写风格一致，以便在代码变更时使用 `Sphinx `_ 和 `Breathe `_ 等工具协助筹备、自动更新 API 文档。 +使用 Doxygen 的最终目的是确保所有代码编写风格一致，以便在代码变更时使用 `Sphinx`_ 和 `Breathe`_ 等工具协助筹备、自动更新 API 文档。 使用这类工具时，上文代码渲染后呈现效果如下： @@ -255,13 +255,13 @@ CI build 脚本中添加了检查功能，查找 RST 文件中的硬编码链接 Sphinx 新手怎么办 ------------------ -1. 不要担心。所有需要的软件均有详细文档，并且开源、免费。您可以先查看 `Sphinx `_ 文档。如果您不清楚如何用 rst markup 语言写作，请查看 `reStructuredText Primer `_。您也可以使用 markdown (.md) 文件，查找更多在 `Recommonmark parser' 文档页面 `_ 使用的特定 markdown 句法信息。 +1. 不要担心。所有需要的软件均有详细文档，并且开源、免费。您可以先查看 `Sphinx`_ 文档。如果您不清楚如何用 rst markup 语言写作，请查看 `reStructuredText Primer `_。您也可以使用 markdown (.md) 文件，查找更多在 `Recommonmark parser' 文档页面 `_ 使用的特定 markdown 句法信息。 2. 查看本文档的源文件，了解本文档使用的代码。源文件存储于 GitHub `espressif/esp-idf`_ 项目库的 :idf:`docs` 文件夹下。您可以滑动到页面上方，点击右上角的链接，直接查看本页面的源文件。您也可以通过点击 ``Raw`` 按键打开源文件，在 GitHub 上查看文件的代码。 3. 想要查看在上传至 GitHub 前文档如何生成、呈现，有两种方式： - * 安装`Sphinx `_、 `Breathe `_、 `Blockdiag `_ 和 `Doxygen `_ 本地生成文档，具体可查看下文。 + * 安装`Sphinx`_、 `Breathe`_、 `Blockdiag `_ 和 `Doxygen `_ 本地生成文档，具体可查看下文。 * 在 `Read the Docs `_ 建立账号，在云端生成文档。 Read the Docs 免费提供文档生成和存储，且速度快、质量高。 @@ -275,7 +275,7 @@ Sphinx 新手怎么办 您可以安装下列包，通过搭建环境在电脑上本地生成文档： -1. Doxygen - https://www.stack.nl/~dimitri/doxygen/ +1. Doxygen - http://doxygen.nl/ 2. Sphinx - https://github.com/sphinx-doc/sphinx/#readme-for-sphinx 3. Breathe - https://github.com/michaeljones/breathe#breathe 4. Document theme "sphinx_rtd_theme" - https://github.com/rtfd/sphinx_rtd_theme @@ -371,3 +371,5 @@ Doxygen 的安装取决于操作系统： .. _interactive shell: http://interactive.blockdiag.com/?compression=deflate&src=eJxlUMFOwzAMvecrrO3aITYQQirlAIIzEseJQ5q4TUSIq8TVGIh_J2m7jbKc7Ge_5_dSO1Lv2soWvoVYgieNoMh7VGzJR9FJtugZ7lYQ0UcKEbYNOY36rRQHZHUPT68vV5tceGLbWCUzPfeaFFMoBZzecVc56vWwJFnWMmJ59CCZg617xpOFbTSyw0pmvT_HJ7hxtFNGBr6wvuu5SCkchcrZ1vAeXZomznh5YgTqfcpR02cBO6vZVDeXBRjMjKEcFRbLh8f18-Z2UUBDnqP9wmp9ncRmSSfND2ldGo2h_zse407g0Mxc1q7HzJ3-4jzYYTJjtQH3iSV-fgFzx50J +.. _Sphinx: http://www.sphinx-doc.org/ +.. _Breathe: https://breathe.readthedocs.io diff --git a/docs/zh_CN/get-started-legacy/establish-serial-connection.rst b/docs/zh_CN/get-started-legacy/establish-serial-connection.rst index 544680665..b7cdba676 100644 --- a/docs/zh_CN/get-started-legacy/establish-serial-connection.rst +++ b/docs/zh_CN/get-started-legacy/establish-serial-connection.rst @@ -30,11 +30,11 @@ `ESP32-Sense Kit `_, n/a, 搭配 `ESP-Prog`_ 使用 .. _CP210x: https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers -.. _FTDI: http://www.ftdichip.com/Drivers/VCP.htm +.. _FTDI: https://www.ftdichip.com/Drivers/VCP.htm .. _ESP-Prog: https://github.com/espressif/esp-iot-solution/blob/master/documents/evaluation_boards/ESP-Prog_guide_en.md#introduction-to-the-esp-prog-board * CP210x: `CP210x USB to UART Bridge VCP Drivers `_ -* FTDI: `FTDI Virtual COM Port Drivers `_ +* FTDI: `FTDI Virtual COM Port Drivers `_ 以上驱动仅用作参考。正常情况下，当上述任一 ESP32 开发板与 PC 连接时，打包在操作系统中的驱动程序将会开始自动安装。 @@ -93,7 +93,7 @@ MacOS :: 确认串口连接 ------------- -现在，请使用串口终端程序，验证串口连接是否可用。在本示例中，我们将使用 `PuTTY SSH Client `_ 进行验证。该工具同时适用于 Windows 和 Linux 操作系统。您也可以使用其他串口程序，设置通信参数如下。 +现在，请使用串口终端程序，验证串口连接是否可用。在本示例中，我们将使用 `PuTTY SSH Client `_ 进行验证。该工具同时适用于 Windows 和 Linux 操作系统。您也可以使用其他串口程序，设置通信参数如下。 运行终端，配置串口：波特率 = 115200，数据位 = 8，停止位 = 1，奇偶校验 = N。在 Windows 和 Linux 中配置串口和通信参数（如 115200-8-1-N）的截图如下。注意，这里一定要选择在上述步骤中确认的串口进行配置。 diff --git a/docs/zh_CN/get-started-legacy/windows-setup-scratch.rst b/docs/zh_CN/get-started-legacy/windows-setup-scratch.rst index c7c6df8d5..45c96b1d4 100644 --- a/docs/zh_CN/get-started-legacy/windows-setup-scratch.rst +++ b/docs/zh_CN/get-started-legacy/windows-setup-scratch.rst @@ -116,7 +116,7 @@ HTTP 代理 如需要同时支持多个 IDF 版本，您可以在不同的目录下配置独立的 MSYS2 环境。或者，您还可以下载多个工具链，并将其解压缩到不同的目录下，然后使用 PATH 环境变量指定默认工具链。 -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ .. _MSYS2-packages 问题列表: https://github.com/Alexpux/MSYS2-packages/issues/ .. _提交一个 IDF Issue: https://github.com/espressif/esp-idf/issues/new diff --git a/docs/zh_CN/get-started-legacy/windows-setup.rst b/docs/zh_CN/get-started-legacy/windows-setup.rst index 9eb1a4877..853bfdb62 100644 --- a/docs/zh_CN/get-started-legacy/windows-setup.rst +++ b/docs/zh_CN/get-started-legacy/windows-setup.rst @@ -69,5 +69,5 @@ https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20190611 windows-setup-scratch -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ diff --git a/docs/zh_CN/get-started/establish-serial-connection.rst b/docs/zh_CN/get-started/establish-serial-connection.rst index 3995ee28d..f469bbbd5 100644 --- a/docs/zh_CN/get-started/establish-serial-connection.rst +++ b/docs/zh_CN/get-started/establish-serial-connection.rst @@ -30,11 +30,11 @@ `ESP32-Sense Kit `_, n/a, 搭配 `ESP-Prog`_ 使用 .. _CP210x: https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers -.. _FTDI: http://www.ftdichip.com/Drivers/VCP.htm +.. _FTDI: https://www.ftdichip.com/Drivers/VCP.htm .. _ESP-Prog: https://github.com/espressif/esp-iot-solution/blob/master/documents/evaluation_boards/ESP-Prog_guide_en.md#introduction-to-the-esp-prog-board * CP210x: `CP210x USB 至 UART 桥 VCP 驱动程序 `_ -* FTDI: `FTDI 虚拟 COM 端口驱动程序 `_ +* FTDI: `FTDI 虚拟 COM 端口驱动程序 `_ 以上驱动仅用于参考。一般情况下，当上述任一 {IDF_TARGET_NAME} 开发板与 PC 连接时，对应驱动程序应该已经被打包在操作系统中，并已经自动安装。 @@ -96,7 +96,7 @@ MacOS :: 确认串口连接 ------------------------ -现在，请使用串口终端程序，验证串口连接是否可用。在本示例中，我们将使用 `PuTTY SSH Client `_， `PuTTY SSH Client `_ 既可用于 Windows 也可用于 Linux。你也可以使用其他串口程序并设置如下的通信参数。 +现在，请使用串口终端程序，验证串口连接是否可用。在本示例中，我们将使用 `PuTTY SSH Client `_， `PuTTY SSH Client `_ 既可用于 Windows 也可用于 Linux。你也可以使用其他串口程序并设置如下的通信参数。 运行终端，配置串口：波特率 = 115200，数据位 = 8，停止位 = 1，奇偶校验 = N。以下截屏分别展示了在 Windows 和 Linux 中配置串口和上述通信参数（如 115200-8-1-N）。注意，这里一定要选择在上述步骤中确认的串口进行配置。 diff --git a/docs/zh_CN/get-started/windows-setup-scratch.rst b/docs/zh_CN/get-started/windows-setup-scratch.rst index e8251b815..1020e50b8 100644 --- a/docs/zh_CN/get-started/windows-setup-scratch.rst +++ b/docs/zh_CN/get-started/windows-setup-scratch.rst @@ -117,7 +117,7 @@ Python 安装完成后，从 Windows 开始菜单中打开“命令提示符” .. _ninja: https://ninja-build.org/ .. _ninja-dl: https://github.com/ninja-build/ninja/releases .. _Python: https://www.python.org/downloads/windows/ -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ .. _kconfig-frontends releases page: https://github.com/espressif/kconfig-frontends/releases .. _Stable version: https://docs.espressif.com/projects/esp-idf/zh_CN/stable/ diff --git a/docs/zh_CN/get-started/windows-setup.rst b/docs/zh_CN/get-started/windows-setup.rst index ffabf8aea..1a28dbba9 100644 --- a/docs/zh_CN/get-started/windows-setup.rst +++ b/docs/zh_CN/get-started/windows-setup.rst @@ -63,7 +63,7 @@ ESP-IDF 工具安装器可在“开始”菜单中，创建一个打开 ESP-IDF windows-setup-scratch windows-setup-update -.. _MSYS2: https://msys2.github.io/ +.. _MSYS2: https://www.msys2.org/ .. _cmake: https://cmake.org/download/ .. _ninja: https://ninja-build.org/ .. _Python: https://www.python.org/downloads/windows/ diff --git a/docs/zh_CN/hw-reference/esp32/inc/modules-and-boards-esp32.rst b/docs/zh_CN/hw-reference/esp32/inc/modules-and-boards-esp32.rst index e5c5b56bb..7dd0caf1d 100644 --- a/docs/zh_CN/hw-reference/esp32/inc/modules-and-boards-esp32.rst +++ b/docs/zh_CN/hw-reference/esp32/inc/modules-and-boards-esp32.rst @@ -290,5 +290,5 @@ ESP-WROVER-KIT V4.1 开发板集成了 ESP-WROVER-B 模组，该模组集成了 * :doc:`modules-and-boards-previous` -.. _FTDI 虚拟 COM 端口驱动: http://www.ftdichip.com/Drivers/VCP.htm +.. _FTDI 虚拟 COM 端口驱动: https://www.ftdichip.com/Drivers/VCP.htm .. _乐鑫产品订购信息: https://www.espressif.com/sites/default/files/documentation/espressif_products_ordering_information_cn.pdf diff --git a/docs/zh_CN/hw-reference/modules-and-boards-previous.rst b/docs/zh_CN/hw-reference/modules-and-boards-previous.rst index 844cdaa9c..2913502bc 100644 --- a/docs/zh_CN/hw-reference/modules-and-boards-previous.rst +++ b/docs/zh_CN/hw-reference/modules-and-boards-previous.rst @@ -21,4 +21,4 @@ This sections contains overview and links to documentation of previous version { * :doc:`modules-and-boards` -.. _FTDI Virtual COM Port Drivers: http://www.ftdichip.com/Drivers/VCP.htm \ No newline at end of file +.. _FTDI Virtual COM Port Drivers: https://www.ftdichip.com/Drivers/VCP.htm diff --git a/docs/zh_CN/resources.rst b/docs/zh_CN/resources.rst index a02507e5e..509a66f93 100644 --- a/docs/zh_CN/resources.rst +++ b/docs/zh_CN/resources.rst @@ -9,7 +9,7 @@ * 您可以在 `ESP32 IoT Solution `_ 库中找到基于 ESP-IDF 的 `解决方案 `_、`应用实例 `_、`组件和驱动 `_ 等内容。 -* 通过 Arduino 平台开发应用，请参考 `ESP32 Wi-Fi 芯片的 Arduino 内核 `_。 +* 通过 Arduino 平台开发应用，请参考 `ESP32 Wi-Fi 芯片的 Arduino 内核 `_。 * 关于 ESP32 的书籍列表，请查看 `乐鑫 `_ 网站。 @@ -17,4 +17,4 @@ * 关于 ESP32 的其它信息，请查看官网 `文档 `_ 版块。 -* 关于本文档的 PDF 和 HTML 格式下载（最新版本和早期版本），请点击 `下载 `_。 \ No newline at end of file +* 关于本文档的 PDF 和 HTML 格式下载（最新版本和早期版本），请点击 `下载 `_。