gchq · at055612 · Jun 7, 2024 · Jun 7, 2024 · Jun 10, 2024 · Jun 10, 2024
diff --git a/docs/content/en/docs/complete-examples/xml/object-types/search-results.xml.md b/docs/content/en/docs/complete-examples/xml/object-types/search-results.xml.md
@@ -15,13 +15,13 @@ description: >
 
 ---
 
-user is viewing a set of search results independently of the search event that generated them.
-the query/id element can be used to link the two events together.
+User is viewing a set of search results independently of the search event that generated them.
+The query/id element can be used to link the two events together.
 
-this object type can be used when the results of the query are not know at the time the search is executed and the search event is created.
+This object type can be used when the results of the query are not know at the time the search is executed and the search event is created.
 
-a view event is used here simply to illustrate the use of searchresults.
-searchresults can be used within other schema actions.
+A view event is used here simply to illustrate the use of searchresults.
+`searchresults` can be used within other schema actions.
 
 ``` xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -71,7 +71,7 @@ searchresults can be used within other schema actions.
           <Query>
             <!-- 
             Provides a link back to the Search event generated when the 
-            query was executed. The link can also be acheived using EventLinks below.
+            query was executed. The link can also be achieved using EventLinks below.
             -->
             <Id>query-538393</Id>
           </Query>

diff --git a/docs/content/en/docs/object-types/association.md b/docs/content/en/docs/object-types/association.md
@@ -1,7 +1,7 @@
 ---
 title: "Association"
 linkTitle: "Association"
-#weight:
+weight: 10
 date: 2022-05-05
 tags:
   - object-type

diff --git a/docs/content/en/docs/object-types/banner.md b/docs/content/en/docs/object-types/banner.md
@@ -1,7 +1,7 @@
 ---
 title: "Banner"
 linkTitle: "Banner"
-#weight:
+weight: 20
 date: 2022-05-05
 tags:
   - object-type

diff --git a/docs/content/en/docs/object-types/chat.md b/docs/content/en/docs/object-types/chat.md
@@ -1,7 +1,7 @@
 ---
 title: "Chat"
 linkTitle: "Chat"
-#weight:
+weight: 30
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/cloud-service.md b/docs/content/en/docs/object-types/cloud-service.md
@@ -0,0 +1,19 @@
+---
+title: "Cloud Service"
+linkTitle: "Cloud Service"
+weight: 60
+date: 2024-06-10
+tags: 
+  - object-type
+object_types:
+  - cloud-service
+description: >
+  Describes a service on a cloud provider, e.g. an AWS Lambda or a Google BigQuery database.
+  This normally descirbes a Software As A Serivce offering.
+  Cloud infrastructure such as AWS EC2s should be modelled with the VirtualDevice object type instead.
+---
+
+This object type can be used for modelling events where a user is performing actions on a cloud service, e.g. creating an AWS Lambda, updating the configuration of a Google BigQuery database.
+
+`CloudService` is distinct from  [`VirtualDevice`]({{< relref "./virtual-device" >}}) in that it tends to represent software as a service rather than a virtualised device.
+What is a service and what is a virtual device is somewhat subjective though, so some care and consistency of approach is needed.
diff --git a/docs/content/en/docs/object-types/configuration.md b/docs/content/en/docs/object-types/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "Configuration"
 linkTitle: "Configuration"
-#weight:
+weight: 40
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/criteria.md b/docs/content/en/docs/object-types/criteria.md
@@ -1,7 +1,7 @@
 ---
 title: "Criteria"
 linkTitle: "Criteria"
-#weight:
+weight: 50
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/document.md b/docs/content/en/docs/object-types/document.md
@@ -1,7 +1,7 @@
 ---
 title: "Document"
 linkTitle: "Document"
-#weight:
+weight: 70
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/email.md b/docs/content/en/docs/object-types/email.md
@@ -1,7 +1,7 @@
 ---
 title: "Email"
 linkTitle: "Email"
-#weight:
+weight: 80
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/file.md b/docs/content/en/docs/object-types/file.md
@@ -1,7 +1,7 @@
 ---
 title: "File"
 linkTitle: "File"
-#weight:
+weight: 90
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/folder.md b/docs/content/en/docs/object-types/folder.md
@@ -1,7 +1,7 @@
 ---
 title: "Folder"
 linkTitle: "Folder"
-#weight:
+weight: 100
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/group-chat.md b/docs/content/en/docs/object-types/group-chat.md
@@ -1,7 +1,7 @@
 ---
 title: "Group Chat"
 linkTitle: "Group Chat"
-#weight:
+weight: 120
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/group.md b/docs/content/en/docs/object-types/group.md
@@ -1,7 +1,7 @@
 ---
 title: "Group"
 linkTitle: "Group"
-#weight:
+weight: 110
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/object.md b/docs/content/en/docs/object-types/object.md
@@ -1,7 +1,7 @@
 ---
 title: "Object"
 linkTitle: "Object"
-#weight:
+weight: 130
 date: 2022-05-05
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/resource.md b/docs/content/en/docs/object-types/resource.md
@@ -1,7 +1,7 @@
 ---
 title: "Resource"
 linkTitle: "Resource"
-#weight:
+weight: 140
 date: 2022-05-06
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/search-results.md b/docs/content/en/docs/object-types/search-results.md
@@ -1,7 +1,7 @@
 ---
 title: "Search Results"
 linkTitle: "Search Results"
-#weight:
+weight: 150
 date: 2022-05-06
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/shortcut.md b/docs/content/en/docs/object-types/shortcut.md
@@ -1,7 +1,7 @@
 ---
 title: "Shortcut"
 linkTitle: "Shortcut"
-#weight:
+weight: 160
 date: 2022-05-06
 tags: 
   - object-type

diff --git a/docs/content/en/docs/object-types/user.md b/docs/content/en/docs/object-types/user.md
@@ -1,7 +1,7 @@
 ---
 title: "User"
 linkTitle: "User"
-#weight:
+weight: 170
 date: 2022-05-06
 tags:
   - object-type

diff --git a/docs/content/en/docs/object-types/virtual-device.md b/docs/content/en/docs/object-types/virtual-device.md
@@ -0,0 +1,16 @@
+---
+title: "Virtual Device"
+linkTitle: "Virtual Device"
+weight: 190
+date: 2024-06-10
+tags: 
+  - object-type
+object_types:
+  - virtual-device
+description: >
+  Describes a virtual device/machine running in a virtualised hosting environment.
+  A virtual device will typically be a virtual machine, network appliance or other piece of infrastructure that is addressable on the network.
+  It may be hosted on on-premesis or cloud infrastructure. 
+---
+
+
diff --git a/docs/content/en/docs/object-types/virtual-session.md b/docs/content/en/docs/object-types/virtual-session.md
@@ -1,7 +1,7 @@
 ---
 title: "Virtual Session"
 linkTitle: "Virtual Session"
-#weight:
+weight: 200
 date: 2022-05-06
 tags:
   - object-type

diff --git a/docs/content/en/docs/object-types/voip.md b/docs/content/en/docs/object-types/voip.md
@@ -1,7 +1,7 @@
 ---
 title: "VOIP"
 linkTitle: "VOIP"
-#weight:
+weight: 180
 date: 2022-05-06
 tags:
   - object-type