Merge branch 'master' of https://github.com/bregman-arie/devops-exerc…

…ises

README.md

@@ -521,9 +521,9 @@ You can describe the UI way to add new nodes but better to explain how to do in
 <details>
 <summary>What types of Cloud Computing services are there?</summary><br><b>
 
-IAAS
-PAAS
-SAAS
+IAAS - Infrastructure as a Service
+PAAS - Platform as a Service
+SAAS - Software as a Service
 </b></details>
 
 <details>
@@ -532,6 +532,9 @@ SAAS
   * IAAS
   * PAAS
   * SAAS</summary><br><b>
+  * IAAS - Users have control over complete Operating System and don't need to worry about the physical resources, which is managed by Cloud Service Provider.
+  * PAAS - CLoud Service Provider takes care of Operating System, Middlewares and users only need to focus on our Data and Application.
+  * SAAS - A cloud based method to provide software to users, software logics running on cloud, can be run on-premises or managed by Cloud Service Provider.
 </b></details>
 
 <details>
@@ -546,10 +549,11 @@ SAAS
 <summary>Explain each of the following Cloud Computing Deployments:
 
   * Public
-  * Hybrid
-  * Private</summary><br><b>
-
-  * Hybrid - combination of public and private clouds
+  * Private
+  * Hybrid</summary><br><b>
+  * Public - Cloud services sharing computing resources among multiple customers
+  * Private - Cloud services having computing resources limited to specific customer or organization, managed by third party or organizations itself
+  * Hybrid - Combination of public and private clouds
 </b></details>
 
 <details>

exercises/flask_container_ci/README.md

@@ -13,8 +13,8 @@ If any of the following steps is not working, it is expected from you to fix the
 
 1. Move to `challenges/flask_container_ci` directory, if you are not already there
 1. Run `export FLASK_APP=app/main.py`
-1. To run the app execute `flask run`. If it doesn't works, fix it
-3. Access `http://127.0.0.1:5000`. You should see the following
+1. To run the app execute `flask run`. If it doesn't work, fix it
+3. Access `http://127.0.0.1:5000`. You should see the following:
 
 ```
 {
@@ -31,7 +31,7 @@ If any of the following steps is not working, it is expected from you to fix the
 * /users - all users data 
 * /users/<username> - data on the specific chosen user
 
-5. When accessing /users, the data returned should not include the id of the user, only its name and description. Also, the data should be ordered by users names.
+5. When accessing /users, the data returned should not include the id of the user, only its name and description. Also, the data should be ordered by usernames.
 
 ## Containers