Skip to content

Commit 57b0a8a

Browse files
authored
Merge pull request #4155 from conan-io/release/2.18
Sync develop2 branch
2 parents 2cef576 + 2051a8c commit 57b0a8a

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

changelog.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ Changelog
33

44
For a more detailed description of the major changes that Conan 2 brings, compared with Conan 1.X, please read :ref:`whatsnew`
55

6+
2.18.1 (04-Jul-2025)
7+
--------------------
8+
9+
- Bugfix: Revert remote caching for missing packages `#18586 <https://github.com/conan-io/conan/pull/18586>`_
10+
611
2.18.0 (30-Jun-2025)
712
--------------------
813

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
# The short X.Y version.
6868
version = "2.18"
6969
# The full version, including alpha/beta/rc tags.
70-
release = u'2.18.0'
70+
release = u'2.18.1'
7171

7272
dir_path = os.path.dirname(os.path.realpath(__file__))
7373
if not os.path.exists(os.path.join(dir_path, "versions.json")):

introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Installation of packages from servers is also very efficient. Only the necessary
5656
All platforms, all build systems and compilers
5757
----------------------------------------------
5858

59-
Conan works on Windows, Linux (Ubuntu, Debian, RedHat, ArchLinux, Raspbian), OSX, FreeBSD, and SunOS, and, as it is portable, it might work in any other platform that can run
59+
Conan works on Windows, Linux (Ubuntu, Debian, Red Hat, ArchLinux, Raspbian), OSX, FreeBSD, and SunOS, and, as it is portable, it might work in any other platform that can run
6060
Python. It can target any existing platform: ranging from bare metal to desktop, mobile, embedded, servers, and cross-building.
6161

6262
Conan works with any build system too. There are built-in integrations to support the most popular ones like CMake, Visual Studio (MSBuild), Autotools and Makefiles, Meson, SCons, etc., but it is not a requirement to use any of them. It is not even necessary that all packages use the same build system: each package can use their own build system, and depend on other packages using different build systems. It is also possible to integrate with any build system, including proprietary ones.

reference/commands.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Commands
44
========
55

6-
This section describe the Conan built-in commands, like ``conan install`` or ``conan search``.
6+
This section describes the Conan built-in commands, like ``conan install`` or ``conan search``.
77

88
It is also possible to create user custom commands, visit :ref:`custom commands reference <reference_commands_custom_commands>`
99
and these :ref:`custom command examples <examples_extensions_custom_commands>`

0 commit comments

Comments
 (0)