Skip to content

Commit

Permalink
Merge branch 'main' into doc-ff
Browse files Browse the repository at this point in the history
  • Loading branch information
johannes-vogel authored Nov 21, 2023
2 parents 96920ab + b3411c7 commit 305c4e4
Show file tree
Hide file tree
Showing 38 changed files with 1,918 additions and 1,064 deletions.
4 changes: 2 additions & 2 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ if (!siteURL.pathname.endsWith('/')) siteURL.pathname += '/'
const redirectLinks: Record<string, string> = {}

const latestVersions = {
java_services: '2.3.0',
java_cds4j: '2.3.1'
java_services: '2.4.0',
java_cds4j: '2.4.0'
}

const localSearchOptions = {
Expand Down
4 changes: 2 additions & 2 deletions about/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ Following is an index of the features currently covered by CAP, with status and

| CLI commands | |
|---------------------------------------------------------------------------------|----------------------------|
| [Jump-start cds-based projects](../get-started/in-a-nutshell#start-a-project) | `cds init <project>` |
| [Jump-start cds-based projects](../get-started/in-a-nutshell#jumpstart) | `cds init <project>` |
| Add a feature to an existing project | `cds add <facets>` |
| [Add models from external sources](../guides/using-services#local-mocking) | `cds import <api>` |
| [Compile cds models to different outputs](../node.js/cds-compile) | `cds compile <models>` |
| [Run your services in local server](../node.js/cds-serve) | `cds serve <services>` |
| [Run and restart on file changes](../get-started/in-a-nutshell#start-a-project) | `cds watch` |
| [Run and restart on file changes](../get-started/in-a-nutshell#jumpstart) | `cds watch` |
| [Read-eval-event loop](../node.js/cds-env#cli) <!-- TODO --> | `cds repl` |
| Inspect effective configuration | `cds env` |
| Prepare for deployment | `cds build` |
Expand Down
4 changes: 2 additions & 2 deletions advanced/hybrid-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cds bind -2 my-hana:my-hana-key
Binds your local CAP application to the service key `my-hana-key` of the service instance `my-hana`, using your currently targeted Cloud Foundry space. The service instance `my-hana` is a _managed_ service.
cds bind also supports Cloud Foundry _user-provided_ services.

[Got errors? See our troubleshooting for connection issues with SAP HANA Cloud.](../get-started/troubleshooting#deployment-fails-—-connection-failed-rte-89008-socket-closed-by-peer){.learn-more}
[Got errors? See our troubleshooting for connection issues with SAP HANA Cloud.](../get-started/troubleshooting#connection-failed-89008){.learn-more}
[Learn how to bind to user-provided services on Cloud Foundry.](#binding-user-provided-services){.learn-more}

Output:
Expand Down Expand Up @@ -222,7 +222,7 @@ cds env get requires.db.credentials --profile hybrid --resolve-bindings

Example output:

```json
```js
{
url: 'jdbc:sap://BDB9AC0F20CB46B494E6742047C4F99A.hana.eu10.hanacloud.ondemand.com:443?encrypt=true&validateCertificate=true&currentschema=BDB9AC0F20CB46B494E6742047C4F99A',
host: 'bdb9ac0f20cb46b494e6742047c4f99a.hana.eu10.hanacloud.ondemand.com',
Expand Down
2 changes: 1 addition & 1 deletion cds/cdl.md
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ aspect OrderItems {

#### Default Target Cardinality

If not otherwise specified, a managed composition of an aspect has the default target cardinality *to many*.
If not otherwise specified, a managed composition of an aspect has the default target cardinality *to-one*.

#### For Many-to-many Relationships

Expand Down
272 changes: 0 additions & 272 deletions get-started/-using-mock-servers.md

This file was deleted.

Loading

0 comments on commit 305c4e4

Please sign in to comment.