From 577ff4d94945f18f7f4a5f9e4a0f4c75ae436a46 Mon Sep 17 00:00:00 2001
From: John R Barker <john@johnrbarker.com>
Date: Thu, 15 Feb 2018 07:29:15 +0000
Subject: [PATCH] Add stub porting_guide_2.6.rst (#36190)

* Add stub porting_guide_2.6.rst

* Typo fix
---
 CHANGELOG.md                                  |  4 ++
 .../rst/porting_guides/porting_guide_2.6.rst  | 65 +++++++++++++++++++
 .../rst/porting_guides/porting_guides.rst     |  1 +
 3 files changed, 70 insertions(+)
 create mode 100644 docs/docsite/rst/porting_guides/porting_guide_2.6.rst

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 869cf66c88..bab574ddcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,14 @@ Ansible Changes By Release
 
 ## 2.6 "Heartbreaker" - ACTIVE DEVELOPMENT
 
+[Porting Guide](http://docs.ansible.com/ansible/devel/porting_guides/porting_guides.html)
+
 ### Major Changes
 
 ### Deprecations (to be removed in 2.10)
 
+See [Porting Guide](http://docs.ansible.com/ansible/devel/porting_guides/porting_guides.html) for more information
+
 ### Minor Changes
 
 #### Removed modules (previously deprecated)
diff --git a/docs/docsite/rst/porting_guides/porting_guide_2.6.rst b/docs/docsite/rst/porting_guides/porting_guide_2.6.rst
new file mode 100644
index 0000000000..8a23845d34
--- /dev/null
+++ b/docs/docsite/rst/porting_guides/porting_guide_2.6.rst
@@ -0,0 +1,65 @@
+.. _porting_2.6_guide:
+
+*************************
+Ansible 2.6 Porting Guide
+*************************
+
+This section discusses the behavioral changes between Ansible 2.5 and Ansible 2.6.
+
+It is intended to assist in updating your playbooks, plugins and other parts of your Ansible infrastructure so they will work with this version of Ansible.
+
+We suggest you read this page along with `Ansible Changelog <https://github.com/ansible/ansible/blob/devel/CHANGELOG.md#2.6>`_ to understand what updates you may need to make.
+
+This document is part of a collection on porting. The complete list of porting guides can be found at :ref:`porting guides <porting_guides>`.
+
+.. contents:: Topics
+
+Playbook
+========
+
+No notable changes.
+
+Deprecated
+==========
+
+No notable changes.
+
+Modules
+=======
+
+Major changes in popular modules are detailed here
+
+
+
+Modules removed
+---------------
+
+The following modules no longer exist:
+
+
+Deprecation notices
+-------------------
+
+The following modules will be removed in Ansible 2.10. Please update update your playbooks accordingly.
+
+
+Noteworthy module changes
+-------------------------
+
+No notable changes.
+
+Plugins
+=======
+
+No notable changes.
+
+Porting custom scripts
+======================
+
+No notable changes.
+
+Networking
+==========
+
+No notable changes.
+
diff --git a/docs/docsite/rst/porting_guides/porting_guides.rst b/docs/docsite/rst/porting_guides/porting_guides.rst
index c0b038f788..6fb1f21545 100644
--- a/docs/docsite/rst/porting_guides/porting_guides.rst
+++ b/docs/docsite/rst/porting_guides/porting_guides.rst
@@ -13,3 +13,4 @@ This section lists porting guides that can help you playbooks, plugins and other
    porting_guide_2.3
    porting_guide_2.4
    porting_guide_2.5
+   porting_guide_2.6