Merge branch 'main' into add-troubleshooting-431

Author: mariayord

cds/assets/cxl/expr.drawio.svg

@@ -240,9 +240,6 @@ This syntax diagram describes the possible expressions:
   ]
   ```
 
-  Compared to the previous example, we now use the expression directly in the query
-  to calculate the total value of all books in stock.
-
   ```sql [SQL]
   SELECT
     Books.title,
@@ -254,6 +251,8 @@ This syntax diagram describes the possible expressions:
   ```
   :::
 
+Compared to the previous example, we now use the expression directly in the query
+to calculate the total value of all books in stock.
 
 
 ## Path Expressions (`ref`) 

cds/assets/cxl/function.drawio.svg

@@ -56,7 +56,7 @@ npm install
 
 ## Mocked Out of the Box
 
-Within the context of application service integration and microservice architecture, we'd need to mock remote services in a consuming app to reach inner loop. CAP greatly does that for us, based on: 
+Within the context of application service integration and microservice architecture, we'd need to mock remote services in a consuming app to reach an inner loop. CAP handles this automatically for us, based on: 
 
 - A CDS service definition is all we need to serve a fully functional OData service
 - APIs imported via `cds export` and `cds import` are CDS service definition
@@ -138,11 +138,11 @@ We can also use `cds mock` to mock remote services in separate processes, which
 
 > [!tip] Decoupled Development → Contracts First
 >
-> Local inner loops allow promote decoupled development of separate parts / applications / microservices in larger solution projects. Each team can focus on their local domain and functionality with the required remote services mocked for them based on imported APIs. These APIs are the contracts between the individual teams.
+> Local inner loops allow promoting decoupled development of separate parts / applications / microservices in larger solution projects. Each team can focus on their local domain and functionality with the required remote services mocked for them based on imported APIs. These APIs are the contracts between the individual teams.
 
 > [!tip] Fast-track Inner-Loop Development → Spawning Parallel Tracks
 >
-> The mocked-out-of-the-box capabilities of CAP, with remoted services mocked in-process and a shared in-memory database, allows us to greatly speed up development and time to market. For real remote operations there is additional investment required, of course. But the agnostic nature of CAP-level Service Integration also allows you to spawn two working tracks running in parallel: One team to focus on domain and functionality, and another one to work on the integration logic under the hood.
+> The mocked-out-of-the-box capabilities of CAP, with remote services mocked in-process and a shared in-memory database, allows us to greatly speed up development and time to market. For real remote operations there is additional investment required, of course. But the agnostic nature of CAP-level Service Integration also allows you to spawn two working tracks running in parallel: One team to focus on domain and functionality, and another one to work on the integration logic under the hood.
 
 
 
@@ -323,7 +323,7 @@ cds.User.default = cds.User.privileged
 
 ## Using `npm` Workspaces
 
-So far we assumed we mainly wirked within the *xtravels* project, and we consumed thte APIs from xflights via `npm publish` / `npm install` . There might be situations where we would want to shortcut this process. For example, we might want to consume a very latest version of the xflights API, which is not yet published to the *npm* registry. Or we might even want to work on both projects simultaneously, and test our latest changes to *xflights* in *xtravels* in close loops. 
+So far we assumed we mainly worked within the *xtravels* project, and we consumed the API from xflights via `npm publish` / `npm install`. There might be situations where we would want to shortcut this process. For example, we might want to consume a very latest version of the xflights API, which is not yet published to the *npm* registry. Or we might even want to work on both projects simultaneously, and test our latest changes to *xflights* in *xtravels* in close loops. 
 
 So, in essence, instead of exercising a workflow like that again and again:
 
@@ -338,7 +338,7 @@ git clone https://github.com/capire/xtravels
 echo '{"workspaces":["xflights","xtravels"]}' > package.json
 ```
 
-Add a link to the local `@capire/xflights-data` API package, enclosed with the cloned xflights sources:
+Add a link to the local `@capire/xflights-data` API package, included with the cloned xflights sources:
 
 ```shell
 npm add ./xflights/apis/data-service
@@ -397,7 +397,7 @@ The usage of *npm workspaces* technique as described above streamlined our workf
 - Before: ( *develop* → *export* → *publish* ) → *npmjs.com* → ( *update* → *consume* )
 - After: ( *develop* → *export* ) → ( *consume* )
 
-We can even more streamline that by eliminating the export step as follows...
+We can streamline that even more by eliminating the export step as follows...
 
 Create a new subfolder `xflights-api-shortcut`  in which we add two files as follows:
 
@@ -416,15 +416,15 @@ Add a `package.json` file in there with that content:
 }
 ```
 
-And an `index.cds` file with that content:
+And an `index.cds` file with this content:
 
 ```cds
 using from '@capire/xflights/srv/data-service';
 ```
 
 <details> <summary> Using the shell's "here document" technique </summary>
 
-  You can also create those two files from the command line as follows:
+  You can also create these two files from the command line as follows:
   ```shell
   cat > xflights-api-shortcut/package.json << EOF
   {

cds/assets/cxl/infix-filter.drawio.svg

@@ -938,6 +938,12 @@ INSERT.into (Books) .columns (
    [ 252, 'Eleonora', 150, 234 ]
 )
 ```
+
+::: tip In Essence:
+
+[Managed fields](../guides/domain/index#managed-data) and [UUIDs](../guides/domain/index#prefer-uuids-for-keys) are automatically filled with `INSERT.entries()`, but not when using `INSERT.columns().values()` or `INSERT.columns().rows()`.
+:::
+
 ### from() {.method #from}
 
 

cds/assets/cxl/operators.drawio.svg

@@ -297,12 +297,11 @@ In [VS Code](./cds-editors#vscode), use the command _Generate HTTP Requests_ to
 
 #### Authentication / Authorization
 
-##### To local applications
+##### -> To local applications
 
-<div class="impl node">
-
-By default, an authorization header with a [local mock user](../node.js/authentication#mock-users) is written to the `http` file, and `localhost` is the target host.
+By default, an authorization header with a local mock user is written to the `http` file, and `localhost` is the target host.
 
+::: code-group
 ```http [Node.js]
 @server = http://localhost:4004
 @auth = Authorization: Basic alice:
@@ -312,32 +311,31 @@ GET {{server}}/odata/v4/admin/Books
 {{auth}}
 ...
 ```
-</div>
-
-<div class="impl java">
-
-By default, an authorization header with a [local mock user](../java/security#mock-users) is written to the `http` file, and `localhost` is the target host.
-
 ```http [Java]
 @server = http://localhost:8080
 
 ### CatalogService.Books
 GET {{server}}/odata/v4/admin/Books
-{{auth}}
+
 ...
 ```
-</div>
+:::
+
+[Learn more about mock users in Node.js.](../node.js/authentication#mock-users){.learn-more}
+[Learn more about mock users in Java.](../java/security#mock-users){.learn-more}
+
+
 
 
-##### To remote applications
+##### -> To remote applications
 
 Use `--for-app <cf-appname>` to use a JWT token of a remote application.  For example:
 
 ```sh
 cds add http --for-app bookshop
 ```
 
-assumes a remote app named `bookshop` on CloudFoundry and a JWT token for this app is written to the request file:
+This assumes a remote app named `bookshop` on CloudFoundry and a JWT token for this app is written to the request file:
 
 ```http
 @server = https://...