Merge branch 'master' into 3.8.fp8

usharesoft · Nov 13, 2018 · 9739507 · 9739507
2 parents 772bd1b + 7ecc662
commit 9739507
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/changelog.rst b/changelog.rst
@@ -10,8 +10,13 @@ Release Date: 2018-12-24
 
 New Features
 ~~~~~~~~~~~~
-* Ability to generate a software component to a Docker image. The user can select any version of CentOS or Debian as a "Base OS".
+* Ability to generate a software component to a Docker image. The user can select any Linux distribution as a "Base OS".
+* Support of hotkey Escape (ESC) to cancel/close a popup window.
 
+Enhancements
+~~~~~~~~~~~~
+* UForge Microsoft Azure images now use the Azure agent version 2.2.14-1 for Debian 8 (Jessie)
+* UForge Microsoft Azure images now use the Azure agent version 2.2.18-3 for Debian 9 (Stretch)
 
 3.8.fp8
 -------

diff --git a/end-user/en/source/pages/generating/image-generate.rst b/end-user/en/source/pages/generating/image-generate.rst
@@ -82,9 +82,6 @@ To generate a machine image from a software component:
 		.. image:: /images/docker-sw-generate.png
 
 	#. Select the distribution and click ``generate``.
-
-		.. note:: Currently, only CentOS and Debian are supported.
-
 	#. Enter the Docker entrypoint in exec form. For example ``["/usr/sbin/httpd", "-DFOREGROUND"]``.
 	#. Click the ``generate`` button to launch a generation in UForge for this appliance template. 
 	#. Once the generation is complete, the Docker image will be listed on the ``Dashboard`` under ``Generations``. You can now publish or download your image.

diff --git a/end-user/en/source/pages/generating/supported-image-type.rst b/end-user/en/source/pages/generating/supported-image-type.rst
@@ -67,7 +67,6 @@ With UForge you can create machine images in the following formats.
 | Container                           | Additional information                                |
 +=====================================+=======================================================+
 | Docker                              | not supported for a Windows-based appliance           |
-|                                     | possible from MySoftware for CentOS and Debian        |
 +-------------------------------------+-------------------------------------------------------+
 | LXC                                 | not supported for a Windows-based appliance           |
 +-------------------------------------+-------------------------------------------------------+

diff --git a/end-user/en/source/pages/getting-started.rst b/end-user/en/source/pages/getting-started.rst
@@ -60,6 +60,19 @@ The UForge UI is accessible in different languages. You can select the language
 .. note:: The language choice is saved at the level of the browser and not of the user account. 
 
 
+.. _uforge-keyboard-actions:
+
+Keyboard Actions
+----------------
+
+.. _uforge-escape-key:
+
+Escape Key
+~~~~~~~~~~
+
+The UForge UI uses the Escape (ESC) key as a hotkey to cancel or close a popup window without saving or executing any actions. However, in some cases, using the hotkey ESC will redirect you to a different page from the one from which the popup was opened.
+
+
 .. _uforge-basic-concepts:
 
 Basic Concepts