Merge pull request #1855 from stgraber/main

doc: Fix missing OCI section

Author: hallyn

doc/config_options.txt

@@ -677,9 +677,9 @@ Override the working directory of an OCI container.
 ```{config:option} oci.entrypoint instance-oci
 :condition: "OCI container"
 :liveupdate: "no"
-:shortdesc: "OCI container entrypoint"
+:shortdesc: "OCI container entry point"
 :type: "string"
-Override the entrypoint of an OCI container.
+Override the entry point of an OCI container.
 ```
 
 ```{config:option} oci.gid instance-oci

doc/reference/instance_options.md

@@ -14,6 +14,7 @@ The following options are available:
 - {ref}`instance-options-limits`
 - {ref}`instance-options-migration`
 - {ref}`instance-options-nvidia`
+- {ref}`instance-options-oci`
 - {ref}`instance-options-raw`
 - {ref}`instance-options-security`
 - {ref}`instance-options-snapshots`
@@ -222,6 +223,17 @@ The following instance options specify the NVIDIA and CUDA configuration of the
     :end-before: <!-- config group instance-nvidia end -->
 ```
 
+(instance-options-oci)=
+## OCI configuration
+
+The following instance options specify the OCI configuration of the instance:
+
+% Include content from [../config_options.txt](../config_options.txt)
+```{include} ../config_options.txt
+    :start-after: <!-- config group instance-oci start -->
+    :end-before: <!-- config group instance-oci end -->
+```
+
 (instance-options-raw)=
 ## Raw instance configuration overrides
 

internal/instance/config.go

@@ -653,12 +653,12 @@ var InstanceConfigKeysContainer = map[string]func(value string) error{
 	"nvidia.require.driver": validate.IsAny,
 
 	// gendoc:generate(entity=instance, group=oci, key=oci.entrypoint)
-	// Override the entrypoint of an OCI container.
+	// Override the entry point of an OCI container.
 	// ---
 	//  type: string
 	//  liveupdate: no
 	//  condition: OCI container
-	//  shortdesc: OCI container entrypoint
+	//  shortdesc: OCI container entry point
 	"oci.entrypoint": validate.IsAny,
 
 	// gendoc:generate(entity=instance, group=oci, key=oci.cwd)

internal/server/metadata/configuration.json

@@ -745,8 +745,8 @@
 						"oci.entrypoint": {
 							"condition": "OCI container",
 							"liveupdate": "no",
-							"longdesc": "Override the entrypoint of an OCI container.",
-							"shortdesc": "OCI container entrypoint",
+							"longdesc": "Override the entry point of an OCI container.",
+							"shortdesc": "OCI container entry point",
 							"type": "string"
 						}
 					},