Merge remote-tracking branch 'origin/main' into vulnerable-deps

slisson · slisson · commit 932bd741e145 · 2023-05-01T13:31:27.000+02:00
# Conflicts:
#	gradle/libs.versions.toml
diff --git a/docs/global/modules/core/pages/reference/component-metamodel-export.adoc b/docs/global/modules/core/pages/reference/component-metamodel-export.adoc
@@ -1 +1,2 @@
-= MPS solution for metamodel-export
+= MPS solution for metamodel-export
+:navtitle: `metamodel-export` (MPS)
diff --git a/docs/global/modules/core/partials/nav-howto.adoc b/docs/global/modules/core/partials/nav-howto.adoc
@@ -1,4 +1,4 @@
 * xref:core:howto/usage-model-server.adoc[]
-* xref:core:howto/usage-metamodel-generator.adoc[]
+* xref:core:howto/usage-model-api-gen-gradle.adoc[]
 * xref:core:howto/usage-light-model-client.adoc[]
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-= MPS solution for metamodel-export`
	`1`	`+= MPS solution for metamodel-export`
	`2`	+:navtitle: `metamodel-export` (MPS)