Merge pull request #40461 from abrennan89/reorg2

SRVCOM-1580: Content reorg, review and editing

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -3143,6 +3143,10 @@ Topics:
     File: serverless-serving-components
   - Name: Knative Eventing components
     File: serverless-eventing-components
+  - Name: Event sources
+    File: knative-event-sources
+  - Name: Channels
+    File: serverless-channels
 - Name: Install
   Dir: install
   Topics:
@@ -3174,12 +3178,28 @@ Topics:
     File: serverless-traffic-management
   - Name: Routing
     File: serverless-configuring-routes
+  - Name: Event sinks
+    File: serverless-event-sinks
+  - Name: Using the API server source
+    File: serverless-apiserversource
+  - Name: Using a ping source
+    File: serverless-pingsource
+  - Name: Using a Kafka source
+    File: serverless-kafka-source
+  - File: serverless-custom-event-sources
+    Name: Custom event sources
+  - Name: Creating and deleting channels
+    File: serverless-creating-channels
+  - Name: Subscriptions
+    File: serverless-subs
 # Admin guide
 - Name: Administer
   Dir: admin_guide
   Topics:
   - Name: Configuring OpenShift Serverless
     File: serverless-configuration
+  - Name: Configuring channel defaults
+    File: serverless-configuring-channels
     # Ingress options
   - Name: Integrating Service Mesh with OpenShift Serverless
     File: serverless-ossm-setup
@@ -3237,9 +3257,6 @@ Topics:
 - Name: Knative Eventing
   Dir: knative_eventing
   Topics:
-# Event sinks
-  - Name: Event sinks
-    File: serverless-event-sinks
 # Brokers
   - Name: Brokers
     File: serverless-using-brokers
@@ -3252,34 +3269,6 @@ Topics:
 # Knative Kafka
   - Name: Knative Kafka
     File: serverless-kafka
-# Event sources
-- Name: Event sources
-  Dir: event_sources
-  Topics:
-  - Name: Understanding event sources
-    File: knative-event-sources
-  - Name: Listing event sources and event source types
-    File: serverless-listing-event-sources
-  - Name: Using the API server source
-    File: serverless-apiserversource
-  - Name: Using a ping source
-    File: serverless-pingsource
-  - Name: Using a Kafka source
-    File: serverless-kafka-source
-  - File: serverless-custom-event-sources
-    Name: Custom event sources
-# Channels
-- Name: Channels
-  Dir: channels
-  Topics:
-  - Name: Understanding channels
-    File: serverless-channels
-  - Name: Creating and deleting channels
-    File: serverless-creating-channels
-  - Name: Subscriptions
-    File: serverless-subs
-  - Name: Configuring channel defaults
-    File: serverless-configuring-channels
 # Functions
 - Name: Functions
   Dir: functions
@@ -3322,11 +3311,16 @@ Topics:
     File: installing-kn
   - Name: Knative CLI advanced configuration
     File: advanced-kn-config
+- Name: Reference
+  Dir: reference
+  Topics:
   - Name: kn flags reference
     File: kn-flags-reference
   - Name: Knative Serving CLI commands
     File: kn-serving-ref
   - Name: Knative Eventing CLI commands
     File: kn-eventing-ref
+  - Name: Listing event sources and event source types
+    File: serverless-listing-event-sources
   - Name: kn func
     File: kn-func-ref

serverless/admin_guide/serverless-cluster-admin-eventing.adoc

@@ -11,7 +11,7 @@ You can create Knative Eventing components with {ServerlessProductName} in the *
 // Event sources
 include::modules/serverless-creating-event-source-admin-web-console.adoc[leveloffset=+1]
 
-See xref:../../serverless/event_sources/knative-event-sources.adoc#knative-event-sources[Understanding event sources] for more information on which event source types are supported and can be created using by {ServerlessProductName}.
+See xref:../../serverless/discover/knative-event-sources.adoc#knative-event-sources[Event sources] for more information about which event source types are supported and can be created by using {ServerlessProductName}.
 
 // Brokers
 include::modules/serverless-creating-broker-admin-web-console.adoc[leveloffset=+1]
@@ -26,7 +26,7 @@ include::modules/serverless-creating-subscription-admin-web-console.adoc[levelof
 == Additional resources
 
 * See xref:../../serverless/knative_eventing/serverless-using-brokers.adoc#serverless-using-brokers[Brokers].
-* See xref:../../serverless/channels/serverless-subs.adoc#serverless-subs[Subscriptions].
+* See xref:../../serverless/develop/serverless-subs.adoc#serverless-subs[Subscriptions].
 * See xref:../../serverless/knative_eventing/serverless-triggers.adoc#serverless-triggers[Triggers].
-* See xref:../../serverless/channels/serverless-channels.adoc#serverless-channels[Channels].
+* See xref:../../serverless/discover/serverless-channels.adoc#serverless-channels[Channels].
 * See xref:../../serverless/knative_eventing/serverless-kafka.adoc#serverless-kafka[Knative Kafka].

serverless/channels/serverless-configuring-channels.adoc renamed to serverless/admin_guide/serverless-configuring-channels.adoc

@@ -45,4 +45,4 @@ include::modules/serverless-delete-channel-kn.adoc[leveloffset=+1]
 [id="next-steps_serverless-creating-channels"]
 == Next steps
 
-* After you have created a channel, see xref:../../serverless/channels/serverless-subs.adoc#serverless-subs[Using subscriptions] for information about creating and using subscriptions for event delivery.
+* After you have created a channel, see xref:../../serverless/develop/serverless-subs.adoc#serverless-subs[Using subscriptions] for information about creating and using subscriptions for event delivery.

serverless/event_sources/serverless-apiserversource.adoc renamed to serverless/develop/serverless-apiserversource.adoc

@@ -24,6 +24,6 @@ include::modules/serverless-kafka-source-yaml.adoc[leveloffset=+1]
 [id="additional-resources_serverless-kafka-source"]
 == Additional resources
 
-* See xref:../../serverless/event_sources/knative-event-sources.adoc#knative-event-sources[Understanding event sources].
+* See xref:../../serverless/discover/knative-event-sources.adoc#knative-event-sources[Event sources].
 * See xref:../../serverless/knative_eventing/serverless-kafka.adoc#serverless-kafka[Knative Kafka].
 * See the link:https://access.redhat.com/documentation/en-us/red_hat_amq/7.6/html/amq_streams_on_openshift_overview/kafka-concepts_str#kafka-concepts-key_str[Red Hat AMQ Streams] documentation for more information about Kafka concepts.