Merge branch '34-finalize-you-and-hifis-page' into 'master'

Resolve "Finalize You and HIFIS page"

Closes #34

See merge request hifis/hifis.net!41

you-and-hifis/index.md

@@ -24,16 +24,11 @@ To this aim, since summer 2019, we are setting up the HIFIS platform, that is bu
 ### Helmholtz Cloud
 The cloud team is currently preparing the Initial Service Portfolio.
 In interviews with different groups of scientists and with IT specialists of all centers a list of over 100 potential IT services was compiled.
-Based on an evaluation matrix with a list of selection criteria, approximately 20 of 25 services will be compiled as an Initial Service Portfolio.
-{% comment %}
-TODO: Add link
-{% endcomment %}
-You can find more information here.
+Based on an evaluation matrix with a list of selection criteria, approximately 20 of 25 services will be compiled as an Initial Service Portfolio. 
 
-The most promising candidates so far are:
-List of Top 50 Services or examples
+The most promising candidates so far are e.g. JypyterHub, OpenStack, GitLab, Storage on demand, Sync&Share, Kubernetes, Redmine, LimeSurvey, Mattermost, Rocket.Chat, Zammad, Singularity, etc.
 
-The first IT services are expected to be technically available by the end of 2020. Please contact us if you are interested in using them.
+The first IT services are expected to be technically available by the end of 2020. Please [contact us](mailto:office@hifis.net) if you are interested in using them.
 
 #### Becoming Service Provider for a new Service
 You have a new IT service, application or program and you would like to provide it to other users via the Helmholtz Cloud, e.g. another Helmholtz Centre or a European partner organization?
@@ -41,16 +36,15 @@ You have a new IT service, application or program and you would like to provide
 Please get in touch with us. The portfolio of the Helmholtz Cloud will be continuously expanded and updated.
 
 #### Your feedback about the service portfolio
-Your contribution is very valuable to us. We would like to exchange views with our users on a regular basis in order optimize the composition of the service portfolio continuously. Please write to us if we may contact you.
+Your contribution is very valuable to us. We would like to exchange views with our users on a regular basis in order optimize the composition of the service portfolio continuously. [Please write to us](mailto:office@hifis.net) if we may contact you.
 
-#### Service Portfolio
+#### Helmholtz Cloud Service Portfolio
 The Helmholtz Cloud will appear as a federated cloud. All services are hosted by one of the 19 Helmholtz centers. There will be some services that are available for all Helmholtz employees. But in many cases, it will be unavoidable to sign an additional agreement between the providing center and the using organization. So, the services you can use will depend if the agreements between your organization and the providing Helmholtz center exists.
 
 All services in the Helmholtz Cloud are for free.
 
 #### International Connectivity
-The Helmholtz Cloud is accessible for international users via “EGI”, “AAI”. You will be able to use your XXX Account to login.
-
+The Helmholtz Cloud is accessible for international users via the Helmholtz AAI. Helmholtz AAI is a member of <a href="https://edugain.org/" target="_blank">eduGAIN</a>, so if your institution participates in eduGAIN you will be able to authenticate with your home institution credentials. We are also planning to provide social logins, like GitHub or OrcID, in case your institution does not participate in eduGAIN.
 ### Software Services
 HIFIS Software Services' mission is to empower scientists of any domain to implement and to
 perpetuate modern scientific software development principles in order to make research software engineering more sustainable.