Skip to content

Commit c8a1afe

Browse files
committed
Merge branch 'main' into microservices/shared-db/java
2 parents 55c9ed6 + 061211c commit c8a1afe

83 files changed

Lines changed: 2136 additions & 1766 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ai-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
- Use U.S. English spelling and punctuation.
2929
- Check for spelling errors and provide corrections.
3030
- Identify and correct grammatical errors and incorrect punctuation.
31-
- Provide suggestions for improving the clarity and conciseness of the text to make it more understandable. Restrict yourself to the 5 most important findings and create suggestions for them.
31+
- Provide suggestions for improving the clarity and conciseness of the text to make it more understandable. Use the comments to create real suggestions and include all proposals that target the same line into one suggestions. Do not create multiple suggestions for the same line or paragraph.
3232
- Consider the guidelines that can be found in .github/workflows/assets/editor.md and apply them.
3333
- Ensure that the tone is appropriate for technical documentation, maintaining a professional and informative style.
3434
- Verify that the structure of the document is logical and that headings and subheadings are used effectively.
3535
- Check for consistency in terminology and style throughout the document.
3636
- Use active voice instead of passive voice
37-
- Use present tense and **avoid future tense**!
37+
- Use present tense and **avoid future tense**!

.github/workflows/assets/editor.md

Lines changed: 60 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
description: Reviews code for quality and best practices
3+
mode: subagent
34
temperature: 0.1
45
prompt: Do a detailed edit as outlined in the following.
56
---
@@ -9,10 +10,57 @@ prompt: Do a detailed edit as outlined in the following.
910
You are a helpful editor for a technical writer. Your task is to review and improve the text while ensuring that it adheres to a structured set of writing rules. All categories are of equal priority—no rule should be prioritized over another.
1011

1112
## TASK
12-
Perform a structured review of the text, checking compliance with the following rules:
13+
Perform a structured review of the text, checking compliance with the following categories:
14+
15+
1. Grammar & Style
16+
17+
- Use U.S. English spelling and punctuation.
18+
- Prefer active voice and present tense.
19+
- Allow passive voice only when explaining a system process.
20+
- Use common contractions, but avoid them in warnings or important messages.
21+
- Use colons, parentheses, question marks, and intensifiers judiciously.
22+
- Avoid exclamation marks, and abbreviations.
23+
- Use a colon (:) to introduce information. If the colon is followed by an incomplete sentence, begin the first word after the colon with a lowercase letter.
24+
- Spell out numbers one through nine in full. Use numerals for 10 and higher.
25+
- Search for semicolons (;) and replace them with a period (.) For example: Instead of "This isn't needed; the system does this for you" write "This isn't needed. The system does this for you."
26+
- Ensure lists are parallel.
27+
- Avoid wordy constructions.
28+
29+
2. Clarity & Readability
30+
31+
- Write clear, concise, and short sentences that are easy to understand.
32+
- Avoid jargon, colloquialisms, dialect, clipped words, and unnecessary complexity.
33+
- Avoid hyperbole.
34+
- Use positive formulations.
35+
- Do NOT edit phrases that contain "the following". Only give a warning if it doesn't introduce a table, code snippet, graphic, list, or example.
36+
- Do not remove markdown-specific formatting like _document URLs_.
37+
- Do not edit code samples, not even whitespace.
38+
- Do not touch <Config> tags, as these have a special meaning and need to be preserved.
39+
40+
3. Consistency & Tone
41+
42+
- Use the personal pronoun “you” and make sure the user is the center of the narrative.
43+
- Use "please" when the user is asked to do something extra due to software error or if the situation is already troubling for the user. Avoid "please" when the user is asked to do something that is standard procedure.
44+
45+
4. Inclusivity & Ethical Considerations
46+
47+
- Avoid stereotypes, discrimination, and biases.
48+
- Check for stopwords, including: abort, execute, grandfather, terminate, kill, disable, whitelist, blacklist, slave, master)
49+
- Output the detected stopwords as a Python list and explain why they must be replaced or avoided. If no stopwords are found, output: "Language checked."
50+
- Check for potentially sensitive topics, including: personal ability, mobility, status, gender (e.g., "him", "her", "man", "woman", "girl", "boy"), sexist language, appearance, type, culture, ethnicity, language, age, economic background, religion, sexual orientation.
51+
- Output the detected topics as a Python list. If no topics are found, output: "Language checked."
52+
- Be mindful of verbs related to senses (e.g., see, hear, watch, listen) as they may exclude people with disabilities. Consider more inclusive alternatives where appropriate, such as:
53+
Instead of "See the highlighted section," → Use "Note the highlighted sections."
54+
Instead of "Did you hear the announcement?" → Use "Did you receive the announcement?"
55+
Note: "See" is ok when used to mean "refer to" → "For more information, see Troubleshooting."
56+
57+
5. Formality & Suitability
1358

59+
- Avoid emoticons and emojis.
60+
- Do NOT remove TODO markers at all.
61+
- Do NOT remove tip, warning or danger notes indicated by `::: tip` or similar constructs.
1462

15-
1. Guidelines
63+
6. Guidelines
1664
For this repository you should consider the following guideline:
1765

1866
To have a consistent look and feel throughout capire, use the following semantic when formatting your text.
@@ -41,11 +89,7 @@ There are a couple of aspects that are easy to consider when writing w/o digging
4189

4290
This sound easier than it is, but if you can put it in simpler words, it gets automatically clearer and more helpful.
4391

44-
- Use present tense and **avoid future tense**!
45-
- Avoid emoticons and emojis.
46-
- Do NOT remove TODO markers at all.
47-
- Do NOT remove tip, warning or danger notes indicated by `... tip` or similar constructs.
48-
92+
Use present and avoid future tense!
4993

5094
The documentation should follow the here described style guidance so that it keeps a consistent external and internal appearance:
5195

@@ -80,4 +124,12 @@ The documentation should follow the here described style guidance so that it kee
80124
<sup>1</sup> Avoid latin abbreviations.<br>
81125
<sup>2</sup> Use the not recommended spelling only if you're clearly referring to some technical entity or process.
82126

83-
To improve readability and translatability, avoid using modal verbs in your content.
127+
> Always use proper **product names**. For an overview of product names out of the SAP BTP space, check out the naming request and subordinate approved names.
128+
129+
To improve readability and translatability, avoid using modal verbs in your content.
130+
131+
## FINAL STEPS
132+
Provide a report summarizing how well the text adheres to the writing rules, highlighting issues found in each category.
133+
Rewrite the text to align with all guidelines while maintaining clarity, accuracy, and user focus.
134+
Explain each change by displaying every sentence of the revised text along with a justification for what was modified or retained.
135+
Finally, output the revised text in its entirety.

.vitepress/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ config.rewrites = rewrites
106106
// Add custom capire info to the theme config
107107
config.themeConfig.capire = {
108108
versions: {
109-
java_services: '4.4.1',
110-
java_cds4j: '4.4.1'
109+
java_services: '4.6.0',
110+
java_cds4j: '4.6.0'
111111
},
112112
gotoLinks: []
113113
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<Badge
3-
type="warning"
4-
text="alpha"
2+
<StatusBadge
3+
type="danger"
4+
text="Alpha"
55
title="Alpha features are experimental. They may never be generally available. If released subsequently, the APIs and behavior might change."
66
/>
77
</template>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<Badge
2+
<StatusBadge
33
type="warning"
4-
text="beta"
4+
text="Beta"
55
title="Beta features are planned to be generally available in subsequent releases, however, APIs and their behavior are not final and may change in the general release."
66
/>
77
</template>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<Badge
3-
type="warning"
4-
text="concept"
2+
<StatusBadge
3+
type="info"
4+
text="Concept"
55
title="Concept features are ideas for potential future enhancements and an opportunity for you to give feedback. This is not a commitment to implement the feature though."
66
/>
77
</template>

.vitepress/theme/components/ConfigInspect.vue

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@
3636
import FloatingVue from 'floating-vue'
3737
import yaml from 'yaml'
3838
39-
const { java, keyOnly, filesOnly, showPrivate, label:labelProp } = defineProps<{
39+
const { java, keyOnly, filesOnly, showPrivate, label:labelProp, keyDelim } = defineProps<{
4040
java?: boolean,
4141
keyOnly?: boolean,
4242
filesOnly?: boolean,
4343
showPrivate?: boolean,
44-
label?: string
44+
label?: string,
45+
keyDelim?: string
4546
}>()
4647
4748
// sub component that renders code blocks similar to the markdown `::: code-block` syntax
@@ -85,6 +86,7 @@
8586
8687
const [key, val] = slotVal.split(/\s*[:=]\s*(.*)/) // split on first `:` or `=`
8788
const label = labelProp || `${keyOnly ? key: slotVal}`
89+
const keyDel = keyDelim ?? '.'
8890
8991
const cfgKey = ref()
9092
const popperVisible = ref(false)
@@ -114,25 +116,25 @@
114116
115117
let jsonVal
116118
if (typeof value === 'string' && value.trim().match(/^[[{].*[\]}]$/)) { try { jsonVal = JSON.parse(value) } catch {/*ignore*/ } }
117-
const pkg = toJson(key, jsonVal ?? value)
119+
const pkg = toJson(key, jsonVal ?? value, keyDel)
118120
119121
pkgStr.value = JSON.stringify(pkg, null, 2)
120122
rcJsonStr.value = JSON.stringify(pkg.cds??{}, null, 2)
121123
rcJsStr.value = 'module.exports = ' + rcJsonStr.value.replace(/"(\w*?)":/g, '$1:')
122124
rcYmlStr.value = yaml.stringify(pkg.cds)
123-
propStr.value = `${key}=${jsonVal ? JSON.stringify(jsonVal) : value}`
124125
125-
let envKey = key.replaceAll('_', '__').replaceAll('.', '_')
126+
let envKey = key.replaceAll('_', '__').replaceAll(keyDel, '_')
126127
if (/^[a-z_]+$/.test(envKey)) envKey = envKey.toUpperCase() // only uppercase if not camelCase
127128
envStr.value = `${envKey}=${jsonVal ? JSON.stringify(jsonVal) : value}`
129+
propStr.value = `${envKey}=${jsonVal ? JSON.stringify(jsonVal) : value}`
128130
129131
javaAppyml.value = yaml.stringify(pkg)
130132
javaEnvStr.value = `-D${propStr.value}`
131133
})
132134
133-
function toJson(key:string, value:string): Record<string, any> {
135+
function toJson(key:string, value:string, delim:string): Record<string, any> {
134136
let res = {}
135-
const parts = key.split('.')
137+
const parts = key.split(delim)
136138
parts.reduce((r:Record<string,any>, a, i) => {
137139
r[a] = r[a] || (i < parts.length-1 ? {} : value)
138140
return r[a];
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<template>
2+
<StatusBadge
3+
type="tip"
4+
text="Gamma"
5+
title="Gamma features are finalized and ready to use, stable, and supported long term. Yet, as they have a broad scope and range, you should ensure to test them thoroughly."
6+
/>
7+
</template>

.vitepress/theme/components/Since.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<template>
2-
<Badge type="info" :text="`since ${of} ${version}`" :title="`This feature is only available as of ${of} version ${version} or higher.`" />
2+
<StatusBadge
3+
type="tip"
4+
:text="`Since ${of} ${version}`"
5+
:title="`This feature is only available as of ${of} version ${version} or higher.`"
6+
/>
37
</template>
48

59
<script setup lang="ts">
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<template>
2+
<Badge
3+
:type="type"
4+
:text="text"
5+
:title="title"
6+
@click="click" style="cursor: pointer"
7+
/>
8+
</template>
9+
10+
<script setup lang="ts">
11+
defineProps<{ type: string, text:string, title:string }>()
12+
13+
import { withBase } from 'vitepress'
14+
function click() {
15+
location.href = withBase('../get-started/learning-sources#feature-status-badges')
16+
}
17+
</script>

0 commit comments

Comments
 (0)