From 8414cea58fbb24504af4ae40dbbcf0dcb540d2a0 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 8 Apr 2019 19:41:45 +0200
Subject: [PATCH 1/2] Fix formatting, add upgrade notes entry for
 https://github.com/StackStorm/st2/pull/4623.

---
 docs/source/upgrade_notes.rst | 41 ++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/docs/source/upgrade_notes.rst b/docs/source/upgrade_notes.rst
index 9c585b9e7..d45adf0ae 100644
--- a/docs/source/upgrade_notes.rst
+++ b/docs/source/upgrade_notes.rst
@@ -34,32 +34,39 @@ Upgrade Notes
 * If you are using |EWC| with RBAC you need to update your ``/etc/st2/st2.conf`` config file for RBAC
   to work after the upgrade.
 
-Before:
+  Before:
 
-  .. code-block:: bash
+    .. code-block:: bash
 
-    [rbac]
-    enable = True
+      [rbac]
+      enable = True
 
-After:
+  After:
 
-  .. code-block:: bash
+    .. code-block:: bash
+
+      [rbac]
+      enable = True
+      backend = enterprise
 
-    [rbac]
-    enable = True
-    backend = enterprise
+  After you do that, you need to restart st2api service for changes to take affect- ``sudo st2ctl
+  restart-service st2api``.
 
-After you do that, you need to restart st2api service for changes to take affect- ``sudo st2ctl
-restart-service st2api``.
+  If you get error similar to the one below after updating the config and restarting the services
+  it means you don't have ``bwc-enterprise`` and / or ``st2-rbac-backend`` debian / rpm package
+  installed.
 
-If you get error similar to the one below after updating the config and restarting the services
-it means you don't have ``bwc-enterprise`` and / or ``st2-rbac-backend`` debian / rpm package
-installed.
+  ::
 
-::
+    ValueError: "enterprise" RBAC backend is not available. Make sure "bwc-enterprise" and
+    "st2-rbac-backend" system packages are installed.
+* In this release remote command and shell script runner has been fixed so new line characters
+  produced by the commands and scripts which use sudo are not automatically converted from ``\n``
+  to ``\r\n``.
 
-  ValueError: "enterprise" RBAC backend is not available. Make sure "bwc-enterprise" and
-  "st2-rbac-backend" system packages are installed.
+  In the past, if you had an action which output ``hello\nworld`` to stdout, ``stdout`` attribute
+  in execution result field would contain ``hello\r\nworld``, but now it will correctly contain
+  ``hello\nworld```.
 
 .. _ref-upgrade-notes-v2-10:
 

From 8a2a83ad25d108ec04d36c8b473ee64055ec5248 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 8 Apr 2019 19:44:11 +0200
Subject: [PATCH 2/2] Fix formatting.

---
 docs/source/upgrade_notes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/upgrade_notes.rst b/docs/source/upgrade_notes.rst
index d45adf0ae..85f2be576 100644
--- a/docs/source/upgrade_notes.rst
+++ b/docs/source/upgrade_notes.rst
@@ -66,7 +66,7 @@ Upgrade Notes
 
   In the past, if you had an action which output ``hello\nworld`` to stdout, ``stdout`` attribute
   in execution result field would contain ``hello\r\nworld``, but now it will correctly contain
-  ``hello\nworld```.
+  ``hello\nworld``.
 
 .. _ref-upgrade-notes-v2-10: