add warning re: Ohai 6 vs. 7, current version

chef-boneyard · Mar 12, 2014 · 948f3db · 948f3db
1 parent e03b41d
commit 948f3db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/chef_master/source/index.rst b/chef_master/source/index.rst
@@ -17,7 +17,9 @@ Getting Started
 
 .. include:: ../../includes_chef/includes_chef_index_learnchef.rst
 
-**Docs for Current Versions:** `chef-client <http://docs.opscode.com/client/>`__ | `Open Source Chef Server <http://docs.opscode.com/open_source/>`_ | `Enterprise Chef Server <http://docs.opscode.com/enterprise/>`_ | :doc:`Ohai 7 </ohai>` | :doc:`Release Notes for chef-client 11.10 </release_notes>`
+**Docs for Current Versions:** `chef-client <http://docs.opscode.com/client/>`__ | `Open Source Chef Server <http://docs.opscode.com/open_source/>`_ | `Enterprise Chef Server <http://docs.opscode.com/enterprise/>`_ | `Ohai 6 <http://docs.opscode.com/release/ohai-6/>`_ | :doc:`Release Notes for chef-client 11.10 </release_notes>`
+
+.. warning:: `Ohai 7 <http://docs.opscode.com/release/ohai-7/>`_ is planned to be fully integrated into the |chef client| starting with the 11.12.0 release (~April 2014).
 
 **Docs for Older Versions:** `chef-client 11.8 <http://docs.opscode.com/release/11-8/>`_ | `chef-client 11.6 <http://docs.opscode.com/release/11-6/>`_ | `chef-client 11.4 <http://docs.opscode.com/release/11-4/>`_ | `chef-client 11.2 <http://docs.opscode.com/release/11-2/>`_ | `chef-client 11.0 <http://docs.opscode.com/release/11-0/>`_ | `chef-client 10.latest <http://docs.opscode.com/release/10/>`_ | `Private Chef 1.4.x <http://docs.opscode.com/server/>`_ | :doc:`Documentation Feedback </feedback>`
 

diff --git a/chef_master/source/ohai.rst b/chef_master/source/ohai.rst
@@ -6,6 +6,8 @@ About |ohai|
 
 .. include:: ../../includes_ohai/includes_ohai_platforms.rst
 
+.. warning:: `Ohai 7 <http://docs.opscode.com/release/ohai-7/>`_ is planned to be fully integrated into the |chef client| starting with the 11.12.0 release (~April 2014). The current version is `Ohai 6 <http://docs.opscode.com/release/ohai-6/>`_.
+
 Automatic Attributes
 =====================================================
 .. include:: ../../includes_ohai/includes_ohai_automatic_attribute.rst

diff --git a/release_ohai_6/source/index.rst b/release_ohai_6/source/index.rst
@@ -8,6 +8,8 @@ Docs for |ohai 6|
 
 View the :doc:`release notes </release_notes>` for |ohai 6|.
 
+.. warning:: `Ohai 7 <http://docs.opscode.com/release/ohai-7/>`_ is planned to be fully integrated into the |chef client| starting with the 11.12.0 release (~April 2014).
+
 Automatic Attributes
 =====================================================
 .. include:: ../../includes_ohai/includes_ohai_automatic_attribute.rst