Skip to content

Commit 27bf3ce

Browse files
authored
Fix some typos across the docs (#4265)
1 parent 0edbe4e commit 27bf3ce

File tree

19 files changed

+27
-27
lines changed

19 files changed

+27
-27
lines changed

changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ This page lists the changes made to Conan in each version, with links to each pu
12421242
- Fix: Fix ``AutotoolsToolchain`` definition of ``tools.build:compiler_executable`` for Windows subsystems `#13867 <https://github.com/conan-io/conan/pull/13867>`_
12431243
- Fix: Speed up the CMakeDeps generation `#13857 <https://github.com/conan-io/conan/pull/13857>`_
12441244
- Fix: Fix imported library config suffix. `#13841 <https://github.com/conan-io/conan/pull/13841>`_
1245-
- Fix: Fail when defining an unkown conf `#13832 <https://github.com/conan-io/conan/pull/13832>`_
1245+
- Fix: Fail when defining an unknown conf `#13832 <https://github.com/conan-io/conan/pull/13832>`_
12461246
- Fix: Fix incorrect printing of "skipped" binaries in the ``conan install/create`` commands, when they are used by some other dependencies. `#13778 <https://github.com/conan-io/conan/pull/13778>`_
12471247
- Fix: Renaming the cache "deploy" folder to "deployers" and allow ``-d, --deployer`` cli arg. ("deploy" folder will not break but will warn as deprecated). `#13740 <https://github.com/conan-io/conan/pull/13740>`_ . Docs `here <https://github.com/conan-io/docs/pull/3209>`__
12481248
- Fix: Omit ``-L`` libpaths in ``CMakeDeps`` for header-only libraries. `#13704 <https://github.com/conan-io/conan/pull/13704>`_

ci_tutorial/products_pipeline/full_pipeline.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,15 @@ The focus of this CI tutorial is to introduce some important concepts, good prac
298298
- How large dependency graphs can be built efficiently in CI with the ``conan graph build-order``, and how build-orders for different configurations and products can be merged together.
299299
- Why ``lockfiles`` are necessary in CI when there are concurrent CI builds.
300300
- The importance of versioning, and the role of ``package_id`` to re-build only what is necessary in large dependency graphs.
301-
- Not using ``user/channel`` as variable and dynamic qualifiers of packages that change accross the CI pipeline, but using instead different server repositories.
302-
- Running package promotions (copies) accross server repositories when new package versions are validated.
301+
- Not using ``user/channel`` as variable and dynamic qualifiers of packages that change across the CI pipeline, but using instead different server repositories.
302+
- Running package promotions (copies) across server repositories when new package versions are validated.
303303

304304

305305
There are still many implementation details, strategies, use cases, and error scenarios that are not covered in this tutorial yet:
306306

307307
- How to integrate breaking changes of a package that requires a new breaking major version.
308308
- Different versioning strategies, using pre-releases, using versions or relying on recipe revisions in certain cases.
309-
- How lockfiles can be stored and used accross different builds, if it is good to persist them and where.
309+
- How lockfiles can be stored and used across different builds, if it is good to persist them and where.
310310
- Different branching and merging strategies, nightly builds, releases flows.
311311

312312
We plan to extend this CI tutorial, including more examples and use cases. If you have any question or feedback, please create a ticket in https://github.com/conan-io/conan/issues.

devops/metadata.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ you can copy it after the ``conan export-pkg`` using the paths reported by ``con
102102

103103
Creating metadata with hooks
104104
----------------------------
105-
If there is some common metadata accross recipes, it is possible to capture it without modifying the recipes, using hooks.
105+
If there is some common metadata across recipes, it is possible to capture it without modifying the recipes, using hooks.
106106
Let's say that we have a simpler recipe:
107107

108108
.. code-block:: python
@@ -270,7 +270,7 @@ Removing metadata
270270
-----------------
271271
At the moment it is not possible to remove metadata from the server side using Conan, as the metadata are "additive", it is possible to add new data, but not to remove it (otherwise it would not be possible to add new metadata without downloading first all the previous metadata, and that can be quite inefficient and more error prone, specially sensitive to possible race conditions).
272272

273-
The recommendation to remove metatada from the server side would be to use the tools, web interface or APIs that the server might provide.
273+
The recommendation to remove metadata from the server side would be to use the tools, web interface or APIs that the server might provide.
274274

275275
.. note::
276276

@@ -279,7 +279,7 @@ The recommendation to remove metatada from the server side would be to use the t
279279
- Metadata shouldn't be necessary for using packages. It should be possible to consume recipes and packages without downloading their
280280
metadata. If metadata is mandatory for a package to be used, then it is not metadata and should be packaged as headers and binaries.
281281
- Metadata reading access should not be a frequent operation, or something that developers have to do. Metadata read is intended for
282-
excepcional cases, when some build logs need to be recovered for compliance, or some test executables might be needed for debugging or
282+
exceptional cases, when some build logs need to be recovered for compliance, or some test executables might be needed for debugging or
283283
re-checking a crash.
284284
- Conan does not do any compression or decompression of the metadata files. If there are a lot of metadata files, consider zipping them yourself, otherwise the upload of those many files can take a lot of time. If you need to handle different types of metadata (logs, tests, reports), zipping the files under each category might be better to be able to filter with the ``--metadata=xxx`` argument.
285285

devops/package_promotions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ example we could have two different server package repositories called "testing"
3232

3333
- Using different ``user/channel`` to try to denote maturity is strongly discouraged. It was described in the early
3434
Conan 1 days years ago, before the possibility of having multiple repositories, but it shouldn't be used anymore.
35-
- Packages should be completely immutable accross pipelines and stages, a package cannot rename or change its ``user/channel``,
35+
- Packages should be completely immutable across pipelines and stages, a package cannot rename or change its ``user/channel``,
3636
and re-building it from source to have a new ``user/channel`` is also a strongly discourage devops practice.
3737

3838

devops/save_restore.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Save and restore packages from/to the cache
77

88
With the ``conan cache save`` and ``conan cache restore`` commands, it is possible to create a .tgz from one or several packages from a Conan cache and later restore those packages into another Conan cache. There are some scenarios this can be useful:
99

10-
- In Continuous Integration, specially if doing distributed builds, it might be very convenient to be able to move temporary packages recently built. Most CI systems have the capability of transferring files between jobs for this purpose. The Conan cache is not concurrent, sometimes for paralllel jobs different caches have to be used.
10+
- In Continuous Integration, specially if doing distributed builds, it might be very convenient to be able to move temporary packages recently built. Most CI systems have the capability of transferring files between jobs for this purpose. The Conan cache is not concurrent, sometimes for parallel jobs different caches have to be used.
1111
- For air-gapped setups, in which packages can only be transferred via client side.
1212
- Developers directly sharing some packages with other developers for testing or inspection.
1313

examples/tools/cmake/cmake_toolchain/use_package_config_cmake.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ Important considerations
127127

128128
The presented approach has one limitation, it doesn't work for multi-configuration IDEs.
129129
Implementing this approach won't allow developers to directly switch from IDEs like Visual Studio from Release to Debug
130-
and viceversa, and it will require a ``conan install`` to change. It is not an issue at all for single-config setups,
130+
and vice versa, and it will require a ``conan install`` to change. It is not an issue at all for single-config setups,
131131
but for VS developers it can be a bit inconvenient. The team is working on the VS plugin that might help to mitigate this.
132132
The reason is a CMake limitation, ``find_package()`` can only find one configuration, and with ``CMakeDeps`` being dropped
133133
here, there is nothing that Conan can do to avoid this limitation.
134134

135135
It is important to know that it is also the package author and the package ``CMakeLists.txt`` responsibility to correctly
136136
manage transitivity to other dependencies, and this is not trivial in some cases. There are risks that if not done
137137
correctly the in-package ``xxx-config.cmake`` file can locate its transitive dependencies elsewhere, like in the system,
138-
but not in the transtive Conan package dependencies.
138+
but not in the transitive Conan package dependencies.
139139

140140
Finally, recall that these packages won't be usable by other build systems rather than CMake.

incubating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This generator is designed as a replacement of the current ``CMakeDeps`` generat
1919
- Definition of IMPORTED_LOCATION and IMPORTED_IMPLIB for library targets.
2020
- Definition of LINK_LANGUAGES based on the recipe ``languages`` and ``cpp_info/component`` ``languages`` properties.
2121
- All these allows better propagation of linkage requirement and visibility, avoiding some linkage error of transitive shared libraries in Linux.
22-
- Better definition of ``requires`` relationships accross components inside the same package and with respect to other packages.
22+
- Better definition of ``requires`` relationships across components inside the same package and with respect to other packages.
2323
- It doesn't need any ``build_context_activated`` or ``build_context_suffix`` to use ``tool_requires`` dependencies.
2424
- Definition of ``cpp_info/component.exe`` information (should include the ``.location`` definition too), to define EXECUTABLE targets that can be run.
2525
- Executables from ``requires`` can also be used in non cross-build scenarios. When a ``tool_requires`` to the same depependency exists, then those executables will have priority.

integrations/visual_studio.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Conan extension for Visual Studio
3737

3838
There's an extension `available in the VisualStudio Marketplace
3939
<https://marketplace.visualstudio.com/items?itemName=conan-io.conan-vs-extension>`_ that's
40-
compatible begining from Visual Studio version *2022*. With this extension, you can
40+
compatible beginning from Visual Studio version *2022*. With this extension, you can
4141
browse Conan packages available in `Conan Center <https://conan.io/center>`_, add them to
4242
your project, and they will be automatically installed before building your projects.
4343

reference/binary_model/extending.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ It is possible to add new settings or subsettings in the *settings.yml* file, s
1818
1919
Where the ``null`` value allows leaving the setting undefined in profiles. If not including, it will be mandatory that profiles define a value for them.
2020

21-
The custom settings will be used explicitly or implictly in recipes and packages:
21+
The custom settings will be used explicitly or implicitly in recipes and packages:
2222

2323
.. code-block:: python
2424
2525
class Pkg(ConanFile):
26-
# If we explicilty want this package binaries to vary according to 'new_root_setting'
26+
# If we explicitly want this package binaries to vary according to 'new_root_setting'
2727
settings = "os", "compiler", "build_type", "arch", "new_root_setting"
2828
# While all packages with 'os=Windows' will implicitly vary according to 'new_subsetting'
2929

reference/binary_model/settings_and_options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If we generate a package from this recipe for Linux we will get the following pa
4646
settings
4747
os: Linux
4848
49-
If we do the same thing with Windows, now the package ID will be diffent:
49+
If we do the same thing with Windows, now the package ID will be different:
5050

5151
.. code-block:: bash
5252
:emphasize-lines: 3, 12, 16

0 commit comments

Comments
 (0)