update docs

conan-io · Feb 23, 2023 · 6f1a090 · 6f1a090
1 parent e5fba3c
commit 6f1a090
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 84 deletions.
diff --git a/conan_v2.rst b/conan_v2.rst
@@ -4,12 +4,12 @@
 Conan migration guide to 2.0
 ============================
 
-Conan 2.0-beta `is already released <https://pypi.org/project/conan/#history>`_, you can install the latest Conan Alpha
-version from PyPI doing:
+Conan 2.0.0 `is already released <https://pypi.org/project/conan/#history>`_, you can
+install the latest Conan version from PyPI doing:
 
     .. code-block:: bash
 
-        $ pip install conan --pre
+        $ pip install conan
 
 
 If you want to migrate to 2.0, there are several things you will need to change:

diff --git a/images/artifactory/conan-artifactory_create_account.png b/images/artifactory/conan-artifactory_create_account.png
diff --git a/images/artifactory/conan-artifactory_setme_up.png b/images/artifactory/conan-artifactory_setme_up.png
diff --git a/uploading_packages/artifactory/artifactory_cloud.rst b/uploading_packages/artifactory/artifactory_cloud.rst
diff --git a/uploading_packages/remotes.rst b/uploading_packages/remotes.rst
@@ -12,8 +12,6 @@ The remotes are just servers used as binary repositories that store packages by
 
 There are several possibilities when uploading packages to a server:
 
-For private development:
-
 - **Artifactory Community Edition for C/C++**: Artifactory Community Edition (CE) for C/C++ is a
   completely free Artifactory server that implements both Conan and generic repositories. It is
   the recommended server for companies and teams wanting to host their own private repository.
@@ -27,13 +25,6 @@ For private development:
 - **Conan server**: Simple, free and open source, MIT licensed server that comes bundled with the Conan client.
   Check :ref:`running_your_server` for more information.
 
-For distribution:
-
-- **Artifactory Cloud-hosted instance**: Artifactory Cloud, where JFrog manages, maintains and scales
-  the infrastructure and provides automated server backups with free updates and guaranteed uptime.
-  It's offered with a free tier designed for individual with reduced usage.
-  Check :ref:`artifactory_cloud` for more information.
-
 .. _conan_center:
 
 conancenter

diff --git a/uploading_packages/using_artifactory.rst b/uploading_packages/using_artifactory.rst
@@ -3,16 +3,11 @@
 Using Artifactory
 -----------------
 
-In Artifactory, you can create and manage as many free, personal Conan repositories as you like.
-On an `Free-Tier`_ account, all packages you upload are public, and anyone can use them by simply adding your
-repository to their Conan remotes. You still can create private repositories using :ref:`Artifatory CE<artifactory_ce>`
-or Artifactory Cloud Premium account.
+With :ref:`Artifatory CE<artifactory_ce>`, you can create and manage as many free,
+personal Conan repositories as you like. 
 
 .. toctree::
    :maxdepth: 2
 
-   artifactory/artifactory_cloud
    artifactory/artifactory_ce
    artifactory/conan_center_guide
-
-.. _Free-Tier: https://jfrog.com/community/start-free/