From d0b8f2865fb6d2db1c4c3fb7573b7db492f0f7c4 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 18 Jun 2018 17:07:16 +1000 Subject: [PATCH] docs: Switch base URL from esp-idf.readthedocs.io to docs.espressif.com --- README.md | 14 +++++++------- components/bootloader/Kconfig.projbuild | 8 ++++---- components/partition_table/gen_esp32part.py | 2 +- docs/README.md | 14 ++++++-------- docs/en/api-reference/peripherals/adc.rst | 4 ++-- docs/en/contribute/documenting-code.rst | 2 +- docs/issue_template.md | 4 ++-- examples/storage/nvs_rw_blob/README.md | 2 +- examples/storage/nvs_rw_value/README.md | 2 +- examples/system/app_trace_to_host/README.md | 6 +++--- tools/unit-test-app/README.md | 2 +- tools/windows/windows_install_prerequisites.sh | 2 +- 12 files changed, 30 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index df29f2221..e2ed414ff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Espressif IoT Development Framework -[![alt text](https://readthedocs.org/projects/docs/badge/?version=latest "Documentation Status")](https://esp-idf.readthedocs.io/en/latest/?badge=latest) +[![alt text](https://readthedocs.org/projects/docs/badge/?version=latest "Documentation Status")](https://docs.espressif.com/projects/esp-idf/en/latest/?badge=latest) ESP-IDF is the official development framework for the [ESP32](https://espressif.com/en/products/hardware/esp32/overview) chip. @@ -10,9 +10,9 @@ ESP-IDF is the official development framework for the [ESP32](https://espressif. See setup guides for detailed instructions to set up the ESP-IDF: -* [Windows Setup Guide](https://esp-idf.readthedocs.io/en/latest/get-started/windows-setup.html) -* [Mac OS Setup Guide](https://esp-idf.readthedocs.io/en/latest/get-started/macos-setup.html) -* [Linux Setup Guide](https://esp-idf.readthedocs.io/en/latest/get-started/linux-setup.html) +* [Windows Setup Guide](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/windows-setup.html) +* [Mac OS Setup Guide](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/macos-setup.html) +* [Linux Setup Guide](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/linux-setup.html) ## Finding a Project @@ -52,7 +52,7 @@ You don't need to run `make all` before running `make flash`, `make flash` will ## Viewing Serial Output -The `make monitor` target uses the [idf_monitor tool](https://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html) to display serial output from the ESP32. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html). +The `make monitor` target uses the [idf_monitor tool](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html) to display serial output from the ESP32. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html). Exit the monitor by typing Ctrl-]. @@ -106,12 +106,12 @@ This can be combined with other targets, ie `make erase_flash flash` will erase # Resources -* Documentation for the latest version: https://esp-idf.readthedocs.io/. This documentation is built from the [docs directory](docs) of this repository. +* Documentation for the latest version: https://docs.espressif.com/projects/esp-idf/. This documentation is built from the [docs directory](docs) of this repository. * The [esp32.com forum](https://esp32.com/) is a place to ask questions and find community resources. * [Check the Issues section on github](https://github.com/espressif/esp-idf/issues) if you find a bug or have a feature request. Please check existing Issues before opening a new one. -* If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](https://esp-idf.readthedocs.io/en/latest/contribute/index.html). +* If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](https://docs.espressif.com/projects/esp-idf/en/latest/contribute/index.html). diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild index f5394dc27..8af0dc316 100644 --- a/components/bootloader/Kconfig.projbuild +++ b/components/bootloader/Kconfig.projbuild @@ -142,7 +142,7 @@ config SECURE_BOOT_ENABLED When enabling secure boot, JTAG and ROM BASIC Interpreter are permanently disabled by default. - Refer to https://esp-idf.readthedocs.io/en/latest/security/secure-boot.html before enabling. + Refer to https://docs.espressif.com/projects/esp-idf/en/latest/security/secure-boot.html before enabling. choice SECURE_BOOTLOADER_MODE bool "Secure bootloader mode" @@ -206,7 +206,7 @@ config SECURE_BOOT_VERIFICATION_KEY PEM formatted private key using the espsecure.py extract_public_key command. - Refer to https://esp-idf.readthedocs.io/en/latest/security/secure-boot.html before enabling. + Refer to https://docs.espressif.com/projects/esp-idf/en/latest/security/secure-boot.html before enabling. config SECURE_BOOT_INSECURE bool "Allow potentially insecure options" @@ -217,7 +217,7 @@ config SECURE_BOOT_INSECURE Only enable these options if you are very sure. - Refer to https://esp-idf.readthedocs.io/en/latest/security/secure-boot.html before enabling. + Refer to https://docs.espressif.com/projects/esp-idf/en/latest/security/secure-boot.html before enabling. config FLASH_ENCRYPTION_ENABLED bool "Enable flash encryption on boot (READ DOCS FIRST)" @@ -228,7 +228,7 @@ config FLASH_ENCRYPTION_ENABLED Note: After first boot, the system will be permanently encrypted. Re-flashing an encrypted system is complicated and not always possible. - Read https://esp-idf.readthedocs.io/en/latest/security/flash-encryption.html before enabling. + Read https://docs.espressif.com/projects/esp-idf/en/latest/security/flash-encryption.html before enabling. config FLASH_ENCRYPTION_INSECURE bool "Allow potentially insecure options" diff --git a/components/partition_table/gen_esp32part.py b/components/partition_table/gen_esp32part.py index 39f657b0c..86d536293 100755 --- a/components/partition_table/gen_esp32part.py +++ b/components/partition_table/gen_esp32part.py @@ -4,7 +4,7 @@ # # Converts partition tables to/from CSV and binary formats. # -# See http://esp-idf.readthedocs.io/en/latest/api-guides/partition-tables.html +# See https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/partition-tables.html # for explanation of partition table structure and uses. # # Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD diff --git a/docs/README.md b/docs/README.md index f240d9ebb..9119ff162 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,18 +1,16 @@ # Documentation Source Folder -This folder contains source files of **ESP-IDF documentation** available in [English](https://esp-idf.readthedocs.io/en/latest/) and [中文](https://esp-idf.readthedocs.io/zh_CN/latest/). +This folder contains source files of **ESP-IDF documentation** available in [English](https://docs.espressif.com/projects/esp-idf/en/latest/) and [中文](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/). The sources do not render well in GitHub and some information is not visible at all. Use actual documentation generated within about 20 minutes on each commit: -## English +# Hosted Documentation -* Main server: https://esp-idf.readthedocs.io/en/latest/ or http://esp-idf.readthedocs.io/en/latest/ -* Mirror: https://espressif-docs.readthedocs-hosted.com/projects/esp-idf/en/latest/ -* Latest docs mirror: https://dl.espressif.com/doc/esp-idf/latest/ +* English: https://docs.espressif.com/projects/esp-idf/en/latest/ +* 中文: https://docs.espressif.com/projects/esp-idf/zh_CN/latest/ + +The above URLs are all for the master branch latest version. Click the drop-down in the bottom left to choose a stable version or to download a PDF. -## 中文 -* Main server: https://esp-idf.readthedocs.io/zh_CN/latest/ or http://esp-idf.readthedocs.io/zh_CN/latest/ -* Mirror: https://espressif-docs.readthedocs-hosted.com/projects/esp-idf/zh_CN/latest/ diff --git a/docs/en/api-reference/peripherals/adc.rst b/docs/en/api-reference/peripherals/adc.rst index 6b17048dc..ee6f98a6d 100644 --- a/docs/en/api-reference/peripherals/adc.rst +++ b/docs/en/api-reference/peripherals/adc.rst @@ -12,8 +12,8 @@ However, there're some restrictions for the application to use ADC2: 1. The application can use ADC2 only when Wi-Fi driver is not started, since the ADC is also used by the Wi-Fi driver, which has higher priority. 2. Some of the ADC2 pins are used as strapping pins (GPIO 0, 2, 15), so they cannot be used freely. For examples, for official Develop Kits: - - `ESP32 Core Board V2 / ESP32 DevKitC `_: GPIO 0 cannot be used due to external auto program circuits. - - `ESP-WROVER-KIT V3 `_: GPIO 0, 2, 4 and 15 cannot be used due to external connections for different purposes. + - :ref:`ESP32 Core Board V2 / ESP32 DevKitC `: GPIO 0 cannot be used due to external auto program circuits. + - :ref:`ESP-WROVER-KIT V3 `: GPIO 0, 2, 4 and 15 cannot be used due to external connections for different purposes. Configuration and Reading ADC ----------------------------- diff --git a/docs/en/contribute/documenting-code.rst b/docs/en/contribute/documenting-code.rst index 80cbe1cf7..fd7d93866 100644 --- a/docs/en/contribute/documenting-code.rst +++ b/docs/en/contribute/documenting-code.rst @@ -247,7 +247,7 @@ You can setup environment to build documentation locally on your PC by installin 5. Blockdiag - http://blockdiag.com/en/index.html 6. Recommonmark - https://github.com/rtfd/recommonmark -The package "sphinx_rtd_theme" is added to have the same "look and feel" of `ESP32 Programming Guide `_ documentation like on the "Read the Docs" hosting site. +The package "sphinx_rtd_theme" is added to have the same "look and feel" of `ESP32 Programming Guide `_ documentation like on the "Read the Docs" hosting site. Do not worry about being confronted with several packages to install. Besides Doxygen, all remaining packages are written in Python. Therefore installation of all of them is combined into one simple step. diff --git a/docs/issue_template.md b/docs/issue_template.md index 2273fe3fd..7f7576572 100644 --- a/docs/issue_template.md +++ b/docs/issue_template.md @@ -7,7 +7,7 @@ INSTRUCTIONS Before submitting a new issue, please follow the checklist and try to find the answer. -- [ ] I have read the documentation [ESP-IDF Programming Guide](http://esp-idf.readthedocs.io/en/latest/) and the issue is not addressed there. +- [ ] I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there. - [ ] I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there. - [ ] I have searched the issue tracker for a similar issue and not found a similar issue. @@ -15,7 +15,7 @@ If the issue cannot be solved after the steps before, please follow these instru 1. Fill in all the fields under **Environment** marked with [ ] by picking the correct option for you in each case and deleting the others. 2. Describe your problem. -3. Include [debug logs on the monitor](http://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html#automatically-decoding-addresses) or the [coredump](http://esp-idf.readthedocs.io/en/latest/api-guides/core_dump.html). +3. Include [debug logs on the monitor](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html#automatically-decoding-addresses) or the [coredump](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/core_dump.html). 4. Provide more items under **Other items if possible** can help us better locate your problem. 5. Use markup (buttons above) and the Preview tab to check what the issue will look like. 6. Delete these instructions from the above to the below marker lines before submitting this issue. diff --git a/examples/storage/nvs_rw_blob/README.md b/examples/storage/nvs_rw_blob/README.md index 8fe7f30d8..134cb41ed 100644 --- a/examples/storage/nvs_rw_blob/README.md +++ b/examples/storage/nvs_rw_blob/README.md @@ -9,6 +9,6 @@ Example also shows how to implement diagnostics if read / write operation was su If not done already, consider checking simpler example *storage/nvs_rw_value*, that has been used as a starting point for preparing this one. -Detailed functional description of NVS and API is provided in [documentation](https://esp-idf.readthedocs.io/en/latest/api-reference/storage/nvs_flash.html). +Detailed functional description of NVS and API is provided in [documentation](https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/storage/nvs_flash.html). See the README.md file in the upper level 'examples' directory for more information about examples. diff --git a/examples/storage/nvs_rw_value/README.md b/examples/storage/nvs_rw_value/README.md index 4cdee4a40..89c673470 100644 --- a/examples/storage/nvs_rw_value/README.md +++ b/examples/storage/nvs_rw_value/README.md @@ -8,6 +8,6 @@ Example also shows how to check if read / write operation was successful, or cer Check another example *storage/nvs_rw_blob*, that shows how to read and write variable length binary data (blob). -Detailed functional description of NVS and API is provided in [documentation](https://esp-idf.readthedocs.io/en/latest/api-reference/storage/nvs_flash.html). +Detailed functional description of NVS and API is provided in [documentation](https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/storage/nvs_flash.html). See the README.md file in the upper level 'examples' directory for more information about examples. diff --git a/examples/system/app_trace_to_host/README.md b/examples/system/app_trace_to_host/README.md index 67f6bcb4a..62d067bd8 100644 --- a/examples/system/app_trace_to_host/README.md +++ b/examples/system/app_trace_to_host/README.md @@ -2,7 +2,7 @@ This test code shows how to perform high speed logging by redirecting the log messages to a host instead of UART. -For description of [logging to a host](https://esp-idf.readthedocs.io/en/latest/api-guides/app_trace.html#logging-to-host) please refer to **ESP32 Programming Guide**, section **Application Level Tracing library**. The following example provides practical implementation of this functionality. +For description of [logging to a host](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/app_trace.html#logging-to-host) please refer to **ESP32 Programming Guide**, section **Application Level Tracing library**. The following example provides practical implementation of this functionality. ## Use Case @@ -85,9 +85,9 @@ I (4329) example: Collected 5 samples in 20 ms. To run the example and retrieve the log from the host, do the following: -1. Connect JTAG interface to ESP32 board, power up both JTAG and ESP32. For details how to setup JTAG interface see [JTAG Debugging](https://esp-idf.readthedocs.io/en/latest/api-guides/jtag-debugging/index.html). +1. Connect JTAG interface to ESP32 board, power up both JTAG and ESP32. For details how to setup JTAG interface see [JTAG Debugging](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/jtag-debugging/index.html). -2. [Run OpenOCD](https://esp-idf.readthedocs.io/en/latest/api-guides/jtag-debugging/index.html#run-openocd). If you are using the [binary distribution of OpenOCD](https://esp-idf.readthedocs.io/en/latest/api-guides/jtag-debugging/index.html#jtag-debugging-setup-openocd) and one of versions of [ESP-WROVER-KIT](https://esp-idf.readthedocs.io/en/latest/hw-reference/modules-and-boards.html#esp-wrover-kit-v3), respective command line will look as follows: +2. [Run OpenOCD](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/jtag-debugging/index.html#run-openocd). If you are using the [binary distribution of OpenOCD](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/jtag-debugging/index.html#jtag-debugging-setup-openocd) and one of versions of [ESP-WROVER-KIT](https://docs.espressif.com/projects/esp-idf/en/latest/hw-reference/modules-and-boards.html#esp-wrover-kit-v3), respective command line will look as follows: ``` cd ~/esp/openocd-esp32 diff --git a/tools/unit-test-app/README.md b/tools/unit-test-app/README.md index 4edcdc2bb..7c06ad7a6 100644 --- a/tools/unit-test-app/README.md +++ b/tools/unit-test-app/README.md @@ -103,7 +103,7 @@ If you want to reproduce locally, you need to: 2. Check the following print in CI job to get the config name: `Running unit test for config: config_name`. Then flash the binary of this config to your board. 3. Run the failed case on your board (refer to Running Unit Tests section). * There're some special UT cases (multiple stages case, multiple devices cases) which requires user interaction: - * You can refer to [unit test document](https://esp-idf.readthedocs.io/en/latest/api-guides/unit-tests.html#running-unit-tests) to run test manually. + * You can refer to [unit test document](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/unit-tests.html#running-unit-tests) to run test manually. * Or, you can use `tools/unit-test-app/unit_test.py` to run the test cases: * read document of tiny-test-fw, set correct `TEST_FW_PATH` and `IDF_PATH` * modify `unit_test.py`, pass the test cases need to test as parameter (refer to test function doc string for supported parameter format) to test functions. diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh index 66ee2236d..0960f4a17 100644 --- a/tools/windows/windows_install_prerequisites.sh +++ b/tools/windows/windows_install_prerequisites.sh @@ -5,7 +5,7 @@ # Use of this script is optional, there is also a prebuilt MSYS2 environment available # which can be downloaded and used as-is. # -# See http://esp-idf.readthedocs.io/en/latest/windows-setup.html for full details. +# See https://docs.espressif.com/projects/esp-idf/en/latest/get-started/windows-setup.html for full details. if [ "$OSTYPE" != "msys" ]; then echo "This setup script expects to be run from an MSYS2 environment on Windows."