Merge pull request #4385 from conan-io/release/2.25

Sync develop2

Author: czoido

examples/dev_flow/debug/debugging_visual.rst

@@ -104,7 +104,7 @@ The hook makes use of the ``dumpbin`` tool which is included in the Visual Studi
 to get information of a DLL, in this case the path where its associated PDB is located. It will be used for every DLL
 in the package to locate its PDB to copy it to the package folder.
 
-For more information on how PDBs work with Visual and how we used it to create the hook can be found in the
+For more information on how PDBs work with Visual Studio and how we used it to create the hook can be found in the
 `hook readme <https://github.com/conan-io/conan-extensions/blob/main/extensions/hooks/README.md>`_.
 
 Debugging without build files

reference/tools/system/pyenv.rst

@@ -32,7 +32,7 @@ Using a Python package in a recipe
 
 To install a python package or use a tool installed with Python, we have to install it using the ``PyEnv.install()`` method.
 
-When the `py_version`` parameter is defined, Conan will automatically use `UV <https://docs.astral.sh/uv/>` to create and manage a temporary virtual environment
+When the ``py_version`` parameter is defined, Conan will automatically use `UV <https://docs.astral.sh/uv/>`_ to create and manage a temporary virtual environment
 with that specific Python version.
 **UV requires Python 3.8 or higher**, make sure you use a compatible Python version if you want to define the ``py_version``.
 

security/audit.rst

@@ -58,7 +58,7 @@ by leveraging the packages list filtering from the ``conan list`` command. For e
 
 .. seealso::
 
-    - `JFrog Academy Conan 2 Essentials: Scanning C++ packages for Vulnerabilities using Conan Audit <https://academy.jfrog.com/conan-2-essentials/2164300?utm_source=Conan+Docs>`__
+    - `JFrog Academy Conan 2 Essentials Module 1, Lesson 7: Scanning C++ packages for Vulnerabilities using Conan Audit <https://academy.jfrog.com/path/conan-cc-package-manager/conan-2-essentials?utm_source=Conan+Docs>`__
     - For detailed reference documentation on all ``conan audit`` subcommands and their
       options, consult the :ref:`conan audit command reference
       <reference_commands_audit>`.

tutorial/conan_repositories.rst

@@ -35,4 +35,4 @@ the use of a source folder with recipes as a Conan remote repository.
 
    The Conan 2 Essentials training course is available for free at the JFrog Academy,
    which covers the same topics as this documentation but in a more interactive way.
-   You can access it `here <https://academy.jfrog.com/conan-2-essentials?utm_source=Conan+Docs>`__.
+   You can access it `here <https://academy.jfrog.com/path/conan-cc-package-manager?utm_source=Conan+Docs>`__.

tutorial/conan_repositories/setting_up_conan_remotes.rst

@@ -40,4 +40,4 @@ There are several options to set up a Conan repository:
 
 .. seealso::
 
-    - `JFrog Academy Conan 2 Essentials: Working with Conan Repositories <https://academy.jfrog.com/conan-2-essentials/2131740?utm_source=Conan+Docs>`__
+    - `JFrog Academy Conan 2 Essentials Module 2, Lesson 13: Working with Conan Repositories <https://academy.jfrog.com/path/conan-cc-package-manager/conan-2-essentials-module-2-package-creation-and-uploading?utm_source=Conan+Docs>`__

tutorial/conan_repositories/uploading_packages.rst

@@ -60,7 +60,7 @@ You can check whether the package exists on your local computer again with:
 
 .. seealso::
 
-    - `JFrog Academy Conan 2 Essentials: Working with Conan Repositories <https://academy.jfrog.com/conan-2-essentials/2131740?utm_source=Conan+Docs>`__
+    - `JFrog Academy Conan 2 Essentials Module 2, Lesson 13: Working with Conan Repositories <https://academy.jfrog.com/path/conan-cc-package-manager/conan-2-essentials-module-2-package-creation-and-uploading?utm_source=Conan+Docs>`__
     - :ref:`conan upload command reference <reference_commands_upload>`
     - :ref:`conan remote command reference <reference_commands_remote>`
     - :ref:`conan search command reference <reference_commands_search>`

tutorial/consuming_packages.rst

@@ -41,4 +41,4 @@ to lockfiles to achieve reproducibility of the dependency graph.
 
    The Conan 2 Essentials training course is available for free at the JFrog Academy,
    which covers the same topics as this documentation but in a more interactive way.
-   You can access it `here <https://academy.jfrog.com/conan-2-essentials?utm_source=Conan+Docs>`__.
+   You can access it `here <https://academy.jfrog.com/path/conan-cc-package-manager?utm_source=Conan+Docs>`__.

tutorial/consuming_packages/build_simple_cmake_project.rst

@@ -273,7 +273,7 @@ See :ref:`Building with CMake presets<examples-tools-cmake-toolchain-build-proje
 
 .. seealso::
 
-    - `JFrog Academy Conan 2 Essentials: Building A Simple CMake Project From Conan <https://academy.jfrog.com/conan-2-essentials/2131739?utm_source=Conan+Docs>`__
+    - `JFrog Academy Conan 2 Essentials Module 1, Lesson 1: Building A Simple CMake Project From Conan <https://academy.jfrog.com/path/conan-cc-package-manager/conan-2-essentials?utm_source=Conan+Docs>`__
     - :ref:`Building with CMake presets<examples-tools-cmake-toolchain-build-project-presets>`
     - :ref:`Getting started with Autotools<examples_tools_autotools_autotools_toolchain_build_project_autotools_toolchain>`
     - :ref:`Getting started with Meson<examples_tools_meson_toolchain_build_simple_meson_project>`

tutorial/consuming_packages/cross_building_with_conan.rst

@@ -219,7 +219,7 @@ You could check that we built the application for the correct architecture by ru
 
 .. seealso::
 
-    - `JFrog Academy Conan 2 Essentials: Cross-Compiling Your Applications With Conan <https://academy.jfrog.com/conan-2-essentials/2182684?utm_source=Conan+Docs>`__
+    - `JFrog Academy Conan 2 Essentials Module 1, Lesson 5: Cross-Compiling Your Applications With Conan <https://academy.jfrog.com/path/conan-cc-package-manager/conan-2-essentials?utm_source=Conan+Docs>`__
     - :ref:`Creating a Conan package for a toolchain<example_cross_build_toolchain_package>`
     - :ref:`Cross building to Android with the NDK<examples_cross_build_android_ndk>`
     - :ref:`VirtualBuildEnv reference <conan_tools_env_virtualbuildenv>`

tutorial/consuming_packages/different_configurations.rst

@@ -333,7 +333,7 @@ matched our specified configuration.
 
 .. seealso::
 
-    - `JFrog Academy Conan 2 Essentials: Building For Multiple Configurations With Conan And CMake Presets <https://academy.jfrog.com/conan-2-essentials/2131740?utm_source=Conan+Docs>`__
+    - `JFrog Academy Conan 2 Essentials Module 1, Lesson 2: Building For Multiple Configurations With Conan And CMake Presets <https://academy.jfrog.com/path/conan-cc-package-manager/conan-2-essentials?utm_source=Conan+Docs>`__
     - :ref:`VirtualRunEnv reference <conan_tools_env_virtualrunenv>`
     - :ref:`Cross-compiling using --profile:build and --profile:host <consuming_packages_cross_building_with_conan>`
     - :ref:`creating_packages_configure_options_settings`