Revised security guide

get-started/feature-matrix.md

@@ -114,8 +114,7 @@ Following is an index of the features currently covered by CAP, with status and
 | [Arrayed Elements](../cds/cdl#arrayed-types)                                                        | <X/>  |  <X/>   | <X/> |
 | [Streaming & Media Types](../guides/services/media-data)                 | <X/>  |  <X/>   | <X/> |
 | [Conflict Detection through _ETags_](../guides/services/served-ootb#etag)                    | <X/>  |  <X/>   | <X/> |
-| [Authentication via JWT](../guides/security/authorization#prerequisite-authentication)              | <Na/> |  <X/>   | <X/> |
-| [Mocked Authentication](../guides/security/authorization#prerequisite-authentication)               | <Na/> |  <X/>   | <X/> |
+| [Authentication](../guides/security/authentication)                                        | <X/> |  <X/>   | <X/> |
 
 
 <br>

get-started/get-help.md

@@ -292,7 +292,7 @@ A new option `privilegedUser()` can be leveraged when [defining](../java/event-h
 
 |              | Explanation                                                                                                                                                                                            |
 |--------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| _Root Cause_ | You've [explicitly configured a mock](../java/security#explicitly-defined-mock-users) user with a name that is already used by a [preconfigured mock user](../java/security#preconfigured-mock-users). |
+| _Root Cause_ | You've [explicitly configured a mock](../java/security#custom-mock-users) user with a name that is already used by a [preconfigured mock user](../java/security#preconfigured-mock-users). |
 | _Solution_   | Rename the mock user and build your project again.                                                                                                                                                     |
 
 ### Why do I get an "Error on server start"?

guides/deploy/microservices.md

@@ -370,7 +370,7 @@ Note that we use the *--ws-pack* option for some modules. It's important for nod
 
 ### Authentication
 
-Add [security configuration](../security/authorization#xsuaa-configuration) using the command:
+Add [security configuration](../security/authentication) using the command:
 
 ```shell
 cds add xsuaa --for production

guides/deploy/to-cf.md

@@ -150,7 +150,7 @@ cds add xsuaa
 ```
 
 ::: tip This will also generate an `xs-security.json` file
-The roles/scopes are derived from authorization-related annotations in your CDS models. Ensure to rerun `cds compile --to xsuaa`, as documented in the [_Authorization_ guide](../security/authorization#xsuaa-configuration) whenever there are changes to these annotations.
+The roles/scopes are derived from authorization-related annotations in your CDS models. Ensure to rerun `cds compile --to xsuaa`, as documented in the [_Security_ guide](../security/cap-users#xsuaa-roles) whenever there are changes to these annotations.
 :::
 
 [Learn more about SAP Authorization and Trust Management/XSUAA.](https://discovery-center.cloud.sap/serviceCatalog/authorization-and-trust-management-service?region=all){.learn-more}

guides/security/_menu.md

@@ -1,9 +1,13 @@
-# [SAP Product Standards](../../../guides/security/product-standards) <!-- INTERNAL -->
-# [CAP-level Authorization](authorization)
-# [Platform Security](platform)
-# [Data Protection](data-protection)
-# [Data Privacy](data-privacy)
+
+# [Security Overview](overview)
+# [Authentication](authentication)
+# [CAP Users](cap-users)
+# [CAP Authorization](authorization)
+# [Remote Authentication](remote-authentication)
+# [Data Privacy Overview](data-privacy)
 # [Annotating Personal Data](dpp-annotations)
 # [Automatic Audit Logging](dpp-audit-logging)
 # [Personal Data Management](dpp-pdm)
   <!-- ## [Data Retention Management](dpp-drm) -->
+# [Product Security Overview](data-protection)
+# [Product Security Standard](../../../guides/security/product-standards) <!-- INTERNAL -->