Merge pull request #65 from nmaas-platform/43-update-the-about-page-with-more-information

Updated content of the about page and the home page

docs/about.md

-**NMaaS** is a **[GÉANT](https://www.geant.org)** project from the 
-**[GÉANT fourth programme](https://www.geant.org/Projects/GEANT_Project_GN4-3)** (GN4-3)
+**NMaaS Platform** is actively developed and maintained as part of the [GÉANT GN5-1](https://geant.org/gn5-1/) project co-funded by the European Union.
+
+NMaaS components are open-source licensed under the Apache 2.0 Licence.
 
 ## Useful links
 
@@ -8,4 +9,8 @@
 
 ## Project members
 
-Work in progress
+- [Frederic Loui](https://github.com/frederic-loui) (RENATER, France)
+- [Lukasz Lopatowski](https://github.com/llopat) (Poznan Supercomputing and Network Center, Poland)
+- [Vojdan Kjorveziroski](https://github.com/korvoj) (Ss. Cyril and Methodius University in Skopje, North Macedonia)
+
+Follow the information on the [contact](./contact.md) page to reach us! 

docs/faq.md

@@ -33,7 +33,7 @@ More information about the NMaaS sandbox is available at [NMaaS Playground page]
 ## How can I start monitoring my infrastructure with NMaaS?
 The GÉANT NMaaS production service is available at https://nmaas.eu where users have the possibility to log in with their eduGAIN accounts.
 
-However in order to be able to deploy network management applications user needs to be assigned to a domain. 
+However, in order to be able to deploy network management applications user needs to be assigned to a domain. 
 
 In order to request new dedicated domain creation refer to question <i>"How can I request creation of new NMaaS domain for my NREN/Institution/Project?"</i>
 
@@ -140,4 +140,4 @@ Before the client-access profile can be created, the following information is ne
 <div style="margin-left: 20px">
 <li>a list of individuals that need access to the applications deployed in the new NMaaS domain, including their full names and email addresses.</li>
 </div>
-</details>
+</details>
\ No newline at end of file

docs/index.md

@@ -2,26 +2,16 @@
 
 ## **Overview**
 
-The cost and complexity of developing and integrating in-house network management may be too high for many NRENs,  
-Institutions, projects or teams. Off-the-shelf solutions might not be suitable and might be costly. 
+The cost and complexity of developing and integrating in-house network management may be too high for many NRENs (National Research and Education Networks), institutions, projects or teams. Off-the-shelf solutions might not be suitable and might be costly. 
 
-Network Management as a Service (NMaaS) aims to support these users in providing an effective, efficient network 
-and service management platform. NMaaS enables management and monitoring of user networks through on-demand deployment 
-of network management tools in a Kubernetes-based cloud infrastructure. Using a multi-tenant approach and software based
-VPNs, each NREN or Institution has private access to their network management systems and services from a highly 
-available cloud based platform.
+Network Management as a Service (NMaaS) aims to support these users in providing an effective, efficient network and service management platform. NMaaS enables management and monitoring of user networks through on-demand deployment of network management tools in a Kubernetes-based cloud infrastructure. Using a multi-tenant approach and software based VPNs, each NREN or institution has private access to their network management systems and services from a highly available cloud based platform.
 
-NMaaS is meant for smaller and emerging NRENs, campuses, small organisations or distributed research projects that may 
-have limited resources to develop and/or maintain their own NMS infrastructure or planned to outsource these activities.
-By using a shared and supported platform, Institutions can focus solely on the monitoring and management of their 
-service components. It is also suitable for use in those NRENs which provide campus network management service (CNaaS)
-to their institutions. Using NMaaS, NRENs can easily provide per-campus network management software instances.
+NMaaS is meant for smaller and emerging NRENs, campuses, small organisations or distributed research projects that may have limited resources to develop and/or maintain their own NMS infrastructure or planned to outsource these activities. By using a shared and supported platform, institutions can focus solely on the monitoring and management of their service components. It is also suitable for use in those NRENs which provide campus network management service (CNaaS) to their institutions. Using NMaaS, NRENs can easily provide per-campus network management software instances.
 
-NMaaS (https://nmaas.eu) is offered within the GÉANT project as a production service since December 2018. Currently, 
-the portfolio of tools offered by NMaaS consists of 28 applications including Oxidized, LibreNMS, Prometheus, Grafana, 
-Zabbix, NetBox and others.
+## Managed NMaaS
 
-## **Reference documentation**
+NMaaS (https://nmaas.eu) is offered within the GÉANT project as a [managed service](https://docs.nmaas.eu/managed-nmaas/introduction/) since December 2018. Currently, the portfolio of tools offered by NMaaS consists of over 30 applications including Oxidized, LibreNMS, Prometheus, Grafana, Zabbix, NetBox and others.
 
-This page is still being populated with up to date NMaaS news and documentation. For additional information visit our
-GÉANT project [website](https://wiki.geant.org/display/NMAAS).
+## Self-hosted NMaaS
+
\ No newline at end of file
+NMaaS [self-hosting](https://docs.nmaas.eu/self-hosted-nmaas/introduction/) options are also available for users having access to an existing Kubernetes infrastructure.

docs/managed-nmaas/introduction.md

-# Introduction to Managed NMaaS
+# Introduction to Managed NMaaS
\ No newline at end of file
+
+Work in progress. Content will be provided soon!

docs/nmaas-applications/application-list.md

 # List of Supported Applications
 
-This is a continously updated list of currently supported applications on NMaaS. Note that not all applications are supported across all environments, some are supported only on the managed server, while others can only be supported on self-hosted installations.
+This is a continuously updated list of currently supported applications on NMaaS. Note that not all applications are supported across all environments, some are supported only on the managed server, while others can only be supported on self-hosted installations.
 
 | No |           Application name           |             Helm chart name             |                                             App Version (Helm chart version given in brackets)                                             | Environment           |
 |:--:|:------------------------------------:|:---------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------:|-----------------------|
@@ -36,4 +36,4 @@ This is a continously updated list of currently supported applications on NMaaS.
 | 30 | CTFd                                 | nmaas-ctfd                              | 3.5.1 (1.0.1);                                                                                                                             | :warning: Self-Hosted |
 | 31 | JuiceShop                            | nmaas-juiceshop                         | 14.5.1 (1.0.0);                                                                                                                            | :warning: Self-Hosted |
 | 32 | Adminer                              | nmaas-adminer                           | 4.8.1 (3.0.0);                                                                                                                             | Managed + Self-Hosted |
-| 33 | Changedetection.io                   | nmaas-changedetection                   | 0.44.1 (1.0.2);                                                                                                                            | Managed + Self-Hosted |
+| 33 | Changedetection.io                   | nmaas-changedetection                   | 0.44.1 (1.0.2);                                                                                                                            | Managed + Self-Hosted |
\ No newline at end of file

mkdocs.yml

@@ -62,11 +62,11 @@ nav:
       - MailDev: 'nmaas-applications/tutorials/maildev.md'
       - ChangeDetection.io: 'nmaas-applications/tutorials/changedetectionio.md'
       - GP4L Orchestrator: 'nmaas-applications/tutorials/gp4l-orchestrator.md'
-  - NMaaS Presentations: 'nmaas-presentations.md'
   - Blog:
     - NMaaS-101 - "Hello NMaaS !": 'blog/blog1/nmaas-101-1.md'
     - NMaaS-101 - "I can help! But... Please could you open these two doors?": 'blog/blog2/nmaas-101-2.md'
     - NMaaS-101 - "My name is Oxidized and I'm a nifty configuration management tool": 'blog/blog3/nmaas-101-3.md'
+  - NMaaS Presentations: 'nmaas-presentations.md'
   - FAQ: faq.md
   - Contact: contact.md
   - About: about.md