Merge branch 'uj-proposals' into 'master'

Update overview on connected services; remove redundant variants of same

See merge request !3

2110-Helmholtz-AAI-DFN/2110-Helmholtz-AAI-DFN.md

@@ -143,12 +143,12 @@ aka: "SP-IdP-Proxy"
 - Multi Protocol:
     - Identities: SAML, OpenID Connect, X.509
     - Services: OpenID Connect, SAML
-- Examples for integrated services
-  - Gitlab
-  - RocketChat
-  - Storage and Compute Services
-  - Full list: [https://aai.helmholtz.de/services](https://aai.helmholtz.de/services/)
-- Helmholtz Federated IT services (HIFIS, [https://www.hifis.net](https://www.hifis.net)) 
+- Integrated Services:
+  - Gitlab, Sync&Share, Chat, Storage, Compute & more.
+  - High level overview (a.k.a. Helmholtz Cloud Services): [cloud.helmholtz.de/services](https://cloud.helmholtz.de/services)
+  - More pilot services at [documentation pages](https://hifis.net/doc/cloud-services/list-of-services/#pilot-services)
+  - Exhaustive list: [aai.helmholtz.de/services](https://aai.helmholtz.de/services)
+- Helmholtz Federated IT services (HIFIS, [hifis.net](https://hifis.net))
   - Drives development, documentation and service integration
 
 ## **Helmholtz-AAI** <br/>implements<br/> **AARC BPA**
@@ -209,19 +209,10 @@ aka: "SP-IdP-Proxy"
     - Services can provide different levels of access
 
 
-## <small>Interfaces for Service Integration</small>
-- Multiple Protocols:
-    - Identities: SAML, OpenID Connect, X.509
-    - Services: OpenID Connect, SAML
-- Examples for integrated services
-  - Gitlab
-  - RocketChat
-  - OpenStack
-  - Helmholtz Federated IT services (HIFIS, [https://www.hifis.net](https://www.hifis.net)) 
-    - HIFIS Cloud [https://cloud.helmholtz.de](https://cloud.helmholtz.de/#/services)
-    - Drives further development, documentation and service integration
-- More docs at Helmholtz AAI:
-  - [https://aai.helmholtz.de/doc](https://aai.helmholtz.de/doc)
+## <small>Further documentation</small>
+- See further documentation:
+  - <https://aai.helmholtz.de/doc>
+  - <https://hifis.net/doc>
 
 ================
 
@@ -246,33 +237,6 @@ aka: "SP-IdP-Proxy"
 
 ## {data-background-image="images/h-aai-konrad.png" data-background-size="fill"}
 
-# Services
-
-## Service Integration
-- Multi Protocol:
-    - Identities: SAML, OpenID Connect, X.509
-    - Services: OpenID Connect, SAML
-- Examples for integrated services
-  - Gitlab
-  - RocketChat
-  - Storage and Compute Services
-  <!--- Full list: [https://aai.helmholtz.de/services](https://aai.helmholtz.de/services)-->
-  - Full list: [https://login.helmholtz.de/unitygw/VAADIN/files/connected-services.html](https://login.helmholtz.de/unitygw/VAADIN/files/connected-services.html)
-- Helmholtz Federated IT services (HIFIS, [https://www.hifis.net](https://www.hifis.net)) 
-  - Drives development, documentation and service integration
-- Free of charge
-
-## Current status 
-- Pilot Services: [https://hifis.net/doc/service-integration/pilot-services/pilot-services](https://hifis.net/doc/service-integration/pilot-services/pilot-services)
-- Supported Virtual Organisations: [https://hifis.net/doc/backbone-aai/list-of-vos](https://hifis.net/doc/backbone-aai/list-of-vos)
-- Connected Helmholtz Centres: [https://hifis.net/doc/backbone-aai/list-of-connected-centers](https://hifis.net/doc/backbone-aai/list-of-connected-centers)
-- Documentation: [https://hifis.net/doc/backbone-aai/](https://hifis.net/doc/backbone-aai/)
-    - Policies
-    - Attributes
-    - Levels of Assurance
-    - ...
-
-
 # Usage Figures {data-background-image="images/hdf-aai-over-time.png" data-background-size="contain" data-transition="zoom"}
 ## {data-background-image="images/hdf-aai-over-time.png" data-background-size="contain"}