Skip to content

Commit b906301

Browse files
Various minor improvements
Signed-off-by: Ronald Cron <[email protected]>
1 parent 8267196 commit b906301

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

BRANCHES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ At any point in time, we have a number of maintained branches, currently consist
66
this always contains the latest release, including all publicly available
77
security fixes.
88
- The [`development`](https://github.com/Mbed-TLS/mbedtls/tree/development) branch:
9-
this is where the next minor version of Mbed TLS 4 is prepared. It contains
9+
this is where the next minor version of Mbed TLS 4.x is prepared. It contains
1010
new features, bug fixes, and security fixes.
1111
- One or more long-time support (LTS) branches: these only get bug fixes and
1212
security fixes. Currently, the supported LTS branches are:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Configuration options related to X.509 and TLS are available in `include/mbedtls
1010

1111
With the default platform options, Mbed TLS should build out of the box on most systems.
1212

13-
These configuration files can be edited manually, or programmatically using the Python 3 script `scripts/config.py` (run with --help for usage instructions).
13+
These configuration files can be edited manually, or programmatically using the Python script `scripts/config.py` (run with --help for usage instructions).
1414

1515
We provide some non-standard configurations focused on specific use cases in the `configs/` directory. You can read more about those in `configs/README.txt`.
1616

@@ -41,8 +41,8 @@ You need the following tools to build the library from the main branch with the
4141

4242
* CMake 3.20.4 or later.
4343
* A build system like Make or Ninja for which CMake can generate build files.
44-
* A C99 toolchain (compiler, linker, archiver). We actively test with GCC 5.4, Clang 3.8, Arm Compiler 6, IAR 8 and Visual Studio 2017. More recent versions should work. Slightly older versions may work.
45-
* Python 3.8 to generate the test code. Python is also needed to build the development branch (see next section).
44+
* A C99 toolchain (compiler, linker, archiver). We actively test with GCC 5.4, Clang 3.8, Arm Compiler 6, IAR 8, and Visual Studio 2017 Compiler. More recent versions should work. Slightly older versions may work.
45+
* Python 3.8 or later to generate the test code. Python is also needed to build the development branch (see next section).
4646
* Perl to run the tests, and to generate some source files in the development branch.
4747
* Doxygen 1.8.14 or later (if building the documentation; slightly older versions should work).
4848

@@ -69,7 +69,7 @@ The following tools are required:
6969
```
7070
python3 -m pip install --user -r scripts/basic.requirements.txt
7171
```
72-
Depending on your Python installation, you may need to invoke `python` instead of `python3`. To install the packages system-wide, omit the `--user` option.
72+
Depending on your Python installation, you may need to invoke `python` instead of `python3`. To install the packages system-wide or in a virtual environment, omit the `--user` option.
7373
* A C compiler for the host platform, for some test data.
7474
7575
The scripts that generate the configuration-independent files will look for a host C compiler in the following places (in order of preference):

0 commit comments

Comments
 (0)