Permalink
Browse files

Merge pull request #922 from whiteinge/cloud-deprecation-docs

Added deprecation notices to the salt-cloud docs
  • Loading branch information...
2 parents 58ab81c + 2ac1c5d commit 5aa829d93be5ce1b163caa4244582c4f71e6dc95 @techhat techhat committed Jan 7, 2015
Showing with 57 additions and 8 deletions.
  1. +22 −8 README.rst
  2. +1 −0 doc
  3. +34 −0 salt_cloud/doc/index.rst
View
@@ -2,18 +2,32 @@
``salt-cloud`` is Now Part of Salt!
===================================
-.. note:: This repository is deprecated.
+The ``salt-cloud`` project `has been merged into the main Salt repository
+as of Salt's 2014.1 release`__.
- All new pull requests and issues should be filed against the `main Salt
- repository`__.
+.. __: http://docs.saltstack.com/en/latest/topics/releases/2014.1.0.html#salt-cloud-merged-into-salt
-The Salt team is excited to report that the ``salt-cloud`` repository has been
-merged into the main Salt repository.
+We recommend installing salt-cloud using a package manager as usual. Some
+distributions (RHEL/Cent) have split packages and so the package name will
+be ``salt-cloud`` and require a separate install. Some distributions do not
+split packages and it will be bundled within the ``salt-master`` package.
-The merge happened on November 8th, 2013 in `pull request #8352`__.
+Verify which version you have installed by running ``salt-cloud
+--version``; if the version number does not start with ``2014`` you are
+running an old release.
-.. __: https://github.com/saltstack/salt
-.. __: https://github.com/saltstack/salt/pull/8352
+No further development will take place in this repository. It will be left
+in the current state for historical purposes. Issues should be filed on the
+Salt repository.
+
+Current documentation now lives within the main Salt documentation.
+
+* `The main salt-cloud Table of Contents
+ <http://docs.saltstack.com/en/latest/topics/cloud/index.html>`_
+* `Full list of cloud modules
+ <http://docs.saltstack.com/en/latest/salt-modindex.html#cap-c>`_
+* `Archived release notes
+ <http://docs.saltstack.com/en/latest/topics/cloud/releases/index.html>`_
Frequently asked questions
--------------------------
View
@@ -2,6 +2,40 @@
.. _contents:
+.. warning:: Outdated documentation
+
+ The ``salt-cloud`` project `has been merged into the main Salt repository
+ as of Salt's 2014.1 release`__.
+
+ .. __: http://docs.saltstack.com/en/latest/topics/releases/2014.1.0.html#salt-cloud-merged-into-salt
+
+ We recommend installing salt-cloud using a package manager as usual. Some
+ distributions (RHEL/Cent) have split packages and so the package name will
+ be ``salt-cloud`` and require a separate install. Some distributions do not
+ split packages and it will be bundled within the ``salt-master`` package.
+
+ Verify which version you have installed by running ``salt-cloud
+ --version``; if the version number does not start with ``2014`` you are
+ running an old release.
+
+ No further development will take place in this repository. It will be left
+ in the current state for historical purposes. Issues should be filed on the
+ Salt repository.
+
+ Current documentation now lives within the main Salt documentation.
+
+ * `The main salt-cloud Table of Contents
+ <http://docs.saltstack.com/en/latest/topics/cloud/index.html>`_
+ * `Full list of cloud modules
+ <http://docs.saltstack.com/en/latest/salt-modindex.html#cap-c>`_
+ * `Archived release notes
+ <http://docs.saltstack.com/en/latest/topics/cloud/releases/index.html>`_
+
+ The documentation for the final salt-cloud release, v0.8.11, is included
+ below.
+
+----------
+
Salt Cloud Documentation
========================

0 comments on commit 5aa829d

Please sign in to comment.