Skip to content

Commit 575952b

Browse files
committed
Merge branch 'docs/fix-grammar' into 'main'
docs: improve grammar and clarity in documentation and code comments Closes PACMAN-1047 See merge request espressif/idf-component-manager!497
2 parents 74d96cb + 4a1f329 commit 575952b

24 files changed

+496
-465
lines changed

docs/README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22

33
To build documentation locally, run these command from the root of the project
44

5-
Install dependencies:
5+
1. Install dependencies:
66

77
```sh
88
pip install .[docs]
99
```
1010

11-
Build the docs:
11+
Install the project in **development mode**:
12+
13+
```sh
14+
$ pip install -e .
15+
```
16+
17+
More details on development mode can be found here:
18+
https://setuptools.pypa.io/en/latest/userguide/development_mode.html
19+
20+
2. Build the docs:
1221

1322
```sh
1423
sphinx-build docs/en docs/html_output
1524
```
1625

17-
Preview in the browser:
26+
3. Preview in the browser:
1827

1928
```sh
2029
python -m webbrowser -t "file://$(pwd)/docs/html_output/index.html"

docs/en/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
compote_cli = initialize_cli()
1313

1414
project = 'IDF Component Management'
15-
copyright = '2023, Espressif Systems (Shanghai) Co., Ltd.'
15+
copyright = '2023-2025, Espressif Systems (Shanghai) Co., Ltd.'
1616
language = 'en'

docs/en/getting_started/index.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
Getting Started
33
#################
44

5-
The IDF Component Manager is included and enabled by default in all `supported ESP-IDF <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html>`_ versions.
5+
The IDF Component Manager comes pre-installed and enabled by default in all `supported ESP-IDF versions <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html>`_.
66

77
********************************************
88
Checking the IDF Component Manager Version
99
********************************************
1010

11-
If you are unsure which version of the IDF Component Manager is included in your ESP-IDF installation, you can find out by running a CLI command.
11+
If you're unsure which version of the IDF Component Manager is included in your ESP-IDF installation, you can check it using a CLI command.
1212

1313
First, activate the `ESP-IDF environment <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html#installation>`_, then run the help command:
1414

@@ -18,7 +18,7 @@ First, activate the `ESP-IDF environment <https://docs.espressif.com/projects/es
1818

1919
Windows
2020

21-
Run ``ESP-IDF PowerShell Environment`` or ``ESP-IDF Command Prompt (cmd.exe)`` from the Start menu and run the following command:
21+
Open ``ESP-IDF PowerShell Environment`` or ``ESP-IDF Command Prompt (cmd.exe)`` from the Start menu and run the following command:
2222

2323
.. code:: powershell
2424
@@ -42,4 +42,4 @@ First, activate the `ESP-IDF environment <https://docs.espressif.com/projects/es
4242
$ . $IDF_PATH/export.fish
4343
$ compote version
4444
45-
Older versions of the component manager may not include the ``compote version`` command. If the command is not available in your IDF Component Manager, please consider upgrading it to the latest version. See `Upgrading the IDF Component Manager <#installing-and-upgrading-the-idf-component-manager>`_.
45+
If you're using an older version of the Component Manager, the ``compote version`` command might not be available. In that case, consider upgrading to the latest version. For details, see `Upgrading the IDF Component Manager <#installing-and-upgrading-the-idf-component-manager>`_.

docs/en/guides/packaging_components.rst

Lines changed: 54 additions & 48 deletions
Large diffs are not rendered by default.

docs/en/guides/partial_mirror.rst

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
This feature is available in version 2.1 and later.
88

9-
A partial mirror contains only a subset of the components available in the main mirror. This can be useful when you have limited network connectivity or bandwidth, or when you want to restrict the versions of components available to your developers.
9+
A partial mirror contains only a subset of the components available in the main mirror. This is useful when you have limited network connectivity or bandwidth, or when you want to restrict which versions of components are available to your developers.
1010

1111
******************************
1212
Sync from Component Registry
@@ -18,68 +18,68 @@ To sync from the component registry, use the following command:
1818
1919
compote registry sync --component <component> /path/to/mirror
2020
21-
For example, to sync the ``example/cmp`` component, use the following command:
21+
For example, to sync the ``example/cmp`` component, use the command:
2222

2323
.. code:: shell
2424
2525
compote registry sync --component example/cmp /path/to/mirror
2626
27-
Sync with Version Range
28-
=======================
27+
Sync with a Version Range
28+
=========================
2929

30-
This command will download all versions of the ``example/cmp`` component to the specified path.
30+
This command downloads all versions of the ``example/cmp`` component to the specified path.
3131

32-
To sync only specific versions of the component, specify the version range in the command:
32+
To sync only specific versions of the component, provide a version range:
3333

3434
.. code:: shell
3535
3636
compote registry sync --component "example/cmp>=1.0.0,<4.0.0" /path/to/mirror
3737
38-
You can find the detailed version range syntax in the :ref:`version-range-specifications` section.
38+
You can find detailed version range syntax in the :ref:`version-range-specifications` section.
3939

4040
Sync Only the Latest Version
4141
============================
4242

43-
To minimize the size of the mirror, you can sync only the latest version of the component:
43+
To minimize the mirror size, you can sync only the latest version of the component:
4444

4545
.. code:: shell
4646
4747
compote registry sync --component "example/cmp" --resolution latest /path/to/mirror
4848
49-
This command will download only the latest version of the ``example/cmp`` component to the specified path.
49+
This command downloads only the most recent version of the ``example/cmp`` component to the specified path.
5050

51-
Sync all Components Required by Project
52-
=======================================
51+
Sync All Components Required by a Project
52+
=========================================
5353

54-
To sync all components required by a project, specify the project directory instead of the components:
54+
To sync all components required by a project, specify the project directory instead of individual components:
5555

5656
.. code:: shell
5757
5858
compote registry sync --project-dir /path/to/project /path/to/mirror
5959
60-
To go through all the projects in the directory and sync the components required by each project, use the ``--recursive`` option:
60+
To scan all projects in a directory and sync the components required by each one, use the ``--recursive`` option:
6161

6262
.. code:: shell
6363
6464
compote registry sync --project-dir /path/to/parent_directory --recursive /path/to/mirror
6565
66-
You can also use it with the ``--resolution latest`` option to sync only the latest versions of the components:
66+
You can also use it with the ``--resolution latest`` option to sync only the latest versions of each component:
6767

6868
.. code:: shell
6969
7070
compote registry sync --project-dir /path/to/parent_directory --recursive --resolution latest /path/to/mirror
7171
7272
.. note::
7373

74-
You don't have to worry about components with different versions required by different projects when you're using ``--resolution latest``. The version solver will find the versions that satisfy the requirements of all the projects.
74+
You don’t need to worry about components required in different versions by different projects when using ``--resolution latest``. The version solver will find versions that satisfy all project requirements.
7575

76-
For example, if project A requires ``example/cmp<3.1``, and project B requires ``example/cmp<4``, both versions ``3.0.3`` and ``3.3.9~1`` will be downloaded to the mirror to satisfy the requirements of both projects.
76+
For example, if project A requires ``example/cmp<3.1`` and project B requires ``example/cmp<4``, then both versions ``3.0.3`` and ``3.3.9~1`` will be downloaded to the mirror to fulfill the dependencies.
7777

7878
***********************************************************
7979
Apply to Configuration File ``idf_component_manager.yml``
8080
***********************************************************
8181

82-
After the partial mirror is created, you can apply it to a profile in the :doc:`../reference/config_file` by adding the mirror URL to the ``local_storage_url`` field. For example, if your mirror is located at ``/opt/compote-mirror``, add the following to the configuration file:
82+
After creating the partial mirror, apply it to a profile in the :doc:`../reference/config_file` by adding the mirror URL to the ``local_storage_url`` field. For example, if your mirror is located at ``/opt/compote-mirror``, update the configuration file like this:
8383

8484
.. code:: yaml
8585
@@ -88,9 +88,9 @@ After the partial mirror is created, you can apply it to a profile in the :doc:`
8888
local_storage_url:
8989
- file:///opt/compote-mirror
9090
91-
The version solver will look for the versions in the partial mirror before looking in the main mirror. For more information, see :ref:`url_precedence`.
91+
The version solver will check the versions in the partial mirror before looking in the main mirror. For more information, see :ref:`url_precedence`.
9292

93-
You may also run a file server to serve the mirror. For example, to serve the mirror at ``http://localhost:9004``, add the following to the configuration file:
93+
You can also serve the mirror using a file server. For example, to serve it at ``http://localhost:9004``, update the configuration file as follows:
9494

9595
.. code:: yaml
9696

docs/en/guides/roles.rst

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,83 @@ Users can authenticate into the ESP Component Registry using their GitHub accoun
66

77
- Upload and manage components in the registry
88
- Access the registry's API
9-
- Manage various access and permission settings
9+
- Manage access and permission settings
1010

11-
Roles are used to control access in the ESP Component Registry. They can be assigned at two levels:
11+
Roles are used to control access within the ESP Component Registry. They can be assigned at two levels:
1212

13-
#. **Namespace Level** - Grants access and permissions within a particular namespace.
14-
#. **Component Level** - Grants more fine-grained control for individual components.
13+
#. **Namespace Level** Grants access and permissions within a specific namespace.
14+
#. **Component Level** – Provides more fine-grained control over individual components.
1515

1616
.. _what_is_namespace:
1717

1818
**********************
1919
What Is a Namespace?
2020
**********************
2121

22-
A *namespace* in the ESP Component Registry is a logical container for your components. By default, when you first log in using GitHub, you automatically get a namespace that matches your GitHub username. For example, if your GitHub username is `jdoe`, you will have a namespace named `jdoe` in the registry.
22+
A *namespace* in the ESP Component Registry is a logical container for your components. By default, when you first log in with GitHub, a namespace matching your GitHub username is automatically created. For example, if your GitHub username is `jdoe`, your namespace will be `jdoe`.
2323

24-
- **Why use namespaces?** Namespaces keep your components organized and prevent naming collisions with components of other users. If two users want to create a component named `wifi-utilities`, having separate namespaces ensures that the components don't conflict.
25-
- **How to find or create namespaces?** The default namespace for each user is created automatically. Organizations or teams can request or create additional namespaces (for example, an organization might have a `my-company` namespace). See :ref:`namespace_requests` for more details on creating additional namespaces.
24+
- **Why use namespaces?** Namespaces keep components organized and prevent naming collisions between different users. For instance, if two users create a component called `wifi-utilities`, namespaces ensure they don't conflict.
25+
- **How to find or create namespaces?** Each user gets a default namespace automatically. Organizations or teams can request additional namespaces (e.g., a `my-company` namespace). See :ref:`namespace_requests` for more information.
2626

2727
*****************
2828
Namespace Roles
2929
*****************
3030

31-
When a user logs into the ESP Component Registry, they automatically gain access to the namespace that corresponds to their GitHub username. This means they can start uploading components and managing them under that namespace.
31+
When a user logs into the ESP Component Registry, they automatically gain access to their personal namespace (matching their GitHub username), allowing them to upload and manage components.
3232

33-
If you want to grant access to your namespace to other users (e.g., collaborators), you can assign one of the following roles:
33+
To grant access to your namespace to other users (e.g., collaborators), assign them one of the following roles:
3434

35-
- **owner** - Automatically assigned to the user who created the namespace. - Can manage components in the namespace - upload new component versions, yank and delete existing component versions - Can manage namespace roles for other users (assign, modify or revoke their roles).
36-
- **member** - Can manage components in the namespace - upload new component versions, yank and delete component versions
35+
- **owner** Automatically assigned to the creator of the namespace. - Can manage all components in the namespace. - Can upload new versions, yank, or delete components. - Can manage namespace roles for other users (assign, modify or revoke their roles).
36+
- **member** Can manage components in the namespace: - Can upload new versions, yank, and delete components.
3737

3838
.. note::
3939

40-
Only a user with the **owner** role can assign or revoke roles from others at the namespace level.
40+
Only a user with the **owner** role can assign or revoke roles at the namespace level.
4141

4242
*****************
4343
Component Roles
4444
*****************
4545

46-
While namespace roles apply to all components under a namespace, sometimes you need more granular control over a specific component. That's where **component roles** come in. By assigning roles at the component level, you can let others collaborate on a single component without giving them control over all components in your namespace.
46+
While namespace roles apply to all components within a namespace, component roles offer more granular control over individual components. That's where component roles come in. Assigning roles at the component level allows collaboration on specific components without granting broader access.
4747

48-
The following component-level roles are available:
48+
Available component-level roles:
4949

50-
- **maintainer** - Can manage all aspects of a single component - upload new versions, yank and delete existing versions - Managing component roles for other users - Useful when you want someone else to help maintain a component but not all components in your namespace.
51-
- **developer** - Can perform actions needed to develop a component - upload new versions, yank and delete existing versions
50+
- **maintainer** – Full control over a single component. - Can upload, yank, or delete versions. - Can manage component roles for other users. - Useful for delegating control over a specific component.
51+
- **developer** – Limited control. - Can upload new versions, yank, and delete existing versions.
5252

5353
***************************************
5454
Managing Roles in the Permissions Tab
5555
***************************************
5656

57-
You can manage roles for both your namespaces and components through the ESP Component Registry web interface. Navigate to the dropdown, and click on the **Permissions** tab. Here, you can:
57+
You can manage roles for both namespaces and components using the ESP Component Registry web interface. To access role management:
58+
59+
#. Open the dropdown menu
60+
#. Click on the **Permissions** tab
61+
62+
Here, you can:
5863

5964
- Create a request for a new namespace (see :ref:`namespace_requests`)
6065
- View a list of all namespaces you have access to
6166

62-
Clicking on a namespace name will lead you to the namespace's permissions page, where you can:
67+
Clicking a namespace name opens its permissions page, where you can:
6368

6469
- View a list of all users with roles in the namespace
6570
- Assign or revoke roles for users in the namespace
6671
- View a list of all components in the namespace
67-
- Click on a component name to view its permissions page
72+
- Click a component name to open its permissions page
6873

6974
On the component permissions page, you can:
7075

71-
- View a list of all users with roles for the component
72-
- Assign or revoke roles for users for the component
76+
- View a list of users and their roles for the component
77+
- Assign or revoke roles for users at the component level
7378

7479
.. _namespace_requests:
7580

7681
Namespace Requests
7782
==================
7883

79-
If you need a namespace, which is not your default namespace (e.g., you want a namespace for your organization), you can request one by following these steps:
84+
If you need a namespace other than your default (e.g., for an organization), request one by following these steps:
8085

8186
#. **Log in** to the ESP Component Registry using your GitHub account.
82-
#. **Navigate** to the **Permissions** tab.
83-
#. Fill in the **Request a new namespace** form with the name you want for your new namespace.
87+
#. **Go to** the **Permissions** tab.
88+
#. Fill out the **Request a new namespace** form with your desired namespace name.

docs/en/guides/updating_component_manager.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ To update the IDF Component Manager to the latest version, run the following com
66

77
.. note::
88

9-
If your version of ESP-IDF doesn't come with the IDF Component Manager, you can install it using the same commands.
9+
If your version of ESP-IDF does not include the IDF Component Manager, you can install it using the same commands.
1010

1111
.. tabs::
1212

1313
.. group-tab::
1414

1515
Windows
1616

17-
Run ``ESP-IDF PowerShell Environment`` or ``ESP-IDF Command Prompt (cmd.exe)`` from the Start menu and run the following command:
17+
Open the ``ESP-IDF PowerShell Environment`` or ``ESP-IDF Command Prompt (cmd.exe)`` from the Start menu, then run:
1818

1919
.. code:: powershell
2020

0 commit comments

Comments
 (0)