alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-30 19:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'docs/update_cn_trans_for_2_files' into 'master'

Browse Source 
docs: Update cn trans and provide proper indentation for 2 files

See merge request espressif/esp-idf!32087
This commit is contained in:
Zhang Shu Xian
2024-07-22 12:06:33 +08:00
parent 794c9a2e36 348d834f97
commit 4703390853
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docs/en/contribute/install-pre-commit-hook.rst
View File

@@ -6,7 +6,7 @@ Install Pre-commit Hook for ESP-IDF Project
Install ``pre-commit``
----------------------
Run ``pip install pre-commit``
Run ``pip install pre-commit``.
Install ``pre-commit`` Hook
---------------------------
@@ -20,10 +20,10 @@ Install ``pre-commit`` Hook
Uninstall ``pre-commit`` Hook
-----------------------------
Run ``pre-commit uninstall``
Run ``pre-commit uninstall``.
What Is More?
-------------
Related Documents
-------------------
For detailed usage, please refer to the documentation of pre-commit_.
@@ -34,17 +34,17 @@ Common Problems For Windows Users
``/usr/bin/env: python: Permission denied.``
If you are in Git Bash, please check the python executable location by run ``which python``.
If you are in Git Bash, please check the python executable location by run ``which python``.
If the executable is under ``~/AppData/Local/Microsoft/WindowsApps/``, then it is a link to Windows AppStore, not a real one.
If the executable is under ``~/AppData/Local/Microsoft/WindowsApps/``, then it is a link to Windows AppStore, not a real one.
Please install Python manually and update this in your ``PATH`` environment variable.
Please install Python manually and update this in your ``PATH`` environment variable.
Your ``USERPROFILE`` contains non-ASCII characters
``pre-commit`` may fail when initializing an environment for a particular hook when the path of ``pre-commit``'s cache contains non-ASCII characters. The solution is to set ``PRE_COMMIT_HOME`` to a path containing only standard characters before running pre-commit.
``pre-commit`` may fail when initializing an environment for a particular hook when the path of ``pre-commit``'s cache contains non-ASCII characters. The solution is to set ``PRE_COMMIT_HOME`` to a path containing only standard characters before running pre-commit.
- CMD: ``set PRE_COMMIT_HOME=C:\somepath\pre-commit``
- PowerShell: ``$Env:PRE_COMMIT_HOME = "C:\somepath\pre-commit"``
- git bash: ``export PRE_COMMIT_HOME="/c/somepath/pre-commit"``
- CMD: ``set PRE_COMMIT_HOME=C:\somepath\pre-commit``
- PowerShell: ``$Env:PRE_COMMIT_HOME = "C:\somepath\pre-commit"``
- git bash: ``export PRE_COMMIT_HOME="/c/somepath/pre-commit"``

7
docs/en/migration-guides/release-5.x/5.4/system.rst
View File

@@ -9,9 +9,8 @@ Log
- `esp_log_buffer_hex` is deprecated, use `ESP_LOG_BUFFER_HEX` instead.
- `esp_log_buffer_char` is deprecated, use `ESP_LOG_BUFFER_CHAR` instead.
ESP rom
---
ESP ROM
---------
- All target-specific header files has been moved from `components/esp_rom/include/{target}/` to `/esp_rom/{target}/include/{target}/`, and `components/esp_rom/CMakeLists.txt` has been modified accordingly. If you encounter an error indicating a missing header file, such as ``fatal error: esp32s3/rom/efuse.h: No such file or directory``, try removing the leading relative path from the header file include statement. In your current and future development, when including any header files from the components/esp_rom folder, directly include the header file name without the target-specific relative folder path.
- All target-specific header files has been moved from `components/esp_rom/include/{target}/` to `/esp_rom/{target}/include/{target}/`, and `components/esp_rom/CMakeLists.txt` has been modified accordingly. If you encounter an error indicating a missing header file, such as ``fatal error: esp32s3/rom/efuse.h: No such file or directory``, try removing the leading relative path from the header file include command. In your current and future development, when including any header files located in `components/esp_rom` path, directly use the header file name without the chip-specific relative folder path.
- All target-specific `rom/miniz.h` files are removed because they are deprecated.