Skip to content

Commit

Permalink
Merge pull request conan-io#2805 from conan-io/master
Browse files Browse the repository at this point in the history
Master to develop
  • Loading branch information
czoido authored Nov 7, 2022
2 parents e81adba + 7a32572 commit 4c9d8b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions _themes/conan/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@
<hr/>-->
<!--<div class="admonition important">
<p class="admonition-title">Announcement</p>
<p>JFrog Bintray is being sunset. <a
href=https://blog.conan.io/2021/03/31/Bintray-sunset-timeline.html> Please refer this blog post for more detail.</a>
<p>Conan 2.0 Livestream and Workshop! Join us and get hands on experience upgrading recipes. <a
href=https://blog.conan.io/2022/10/12/cooking-with-conan-cci-v2-livestream.html> Please refer this blog post for more detail.</a>
</div>-->
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
Expand Down
2 changes: 1 addition & 1 deletion introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Introduction
============

Conan is a dependency and package manager for C and C++ languages. It is `free and open-source <https://github.com/conan-io/conan>`_, works in all platforms (Windows, Linux, OSX, FreeBSD, Solaris, etc.), and can be used to develop for all targets including embedded, mobile (iOS, Android), and bare metal. It also integrates with all build systems like CMake, Visual Studio (MSBuild), Makefiles, SCons, etc., including proprietary ones.
Conan is a dependency and package manager for C and C++ languages. It is `free and open-source <https://github.com/conan-io/conan>`_, works on all platforms (Windows, Linux, OSX, FreeBSD, Solaris, etc.), and can be used to develop for all targets including embedded, mobile (iOS, Android), and bare metal. It also integrates with all build systems like CMake, Visual Studio (MSBuild), Makefiles, SCons, etc., including proprietary ones.

It is specifically designed and optimized for accelerating the development and Continuous Integration of C and C++ projects. With full binary management, it can create and reuse any number of different binaries (for different configurations like architectures, compiler versions, etc.) for any number of different versions of a package, using exactly the same process in all platforms. As it is decentralized, it is easy to run your own server to host your own packages and binaries privately, without needing to share them. The free `JFrog Artifactory Community Edition (CE) <https://conan.io/downloads.html>`_ is the recommended Conan server to host your own packages privately under your control.

Expand Down
2 changes: 1 addition & 1 deletion reference/conanfile/tools/gnu/autotoolstoolchain.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ values:
* **configure_args**: Additional arguments to be passed to the configure script.
- By default the following arguments are passed:
* ``--prefix``: With the self.package_folder value.
* ``--prefix``: Takes ``/`` as default value.
* ``--bindir=${prefix}/bin``
* ``--sbindir=${prefix}/bin``
* ``--libdir=${prefix}/lib``
Expand Down

0 comments on commit 4c9d8b0

Please sign in to comment.