Merge review changes (Squash)

Author: gwynnemonahan

modules/network-observability-filtering-ebpf-rule.adoc

@@ -8,7 +8,7 @@ You can configure the `FlowCollector` custom resource to filter eBPF flows using
 
 [IMPORTANT]
 ====
-* You cannot use duplicate CIDRs in filter rules.
+* You cannot use duplicate Classless Inter-Domain Routing (CIDRs) in filter rules.
 * When an IP address matches multiple filter rules, the rule with the most specific CIDR prefix (longest prefix) takes precedence.
 ====
 

modules/network-observability-netobserv-cli-reference.adoc

@@ -86,7 +86,7 @@ $ oc netobserv flows [<feature_option>] [<command_options>]
 |--port|                      filter port                                | –
 |--ports|                     filter on either of two ports              | –
 |--protocol|                  filter protocol                            | –
-|--query|                     filter flows using a custom query          | –
+|--query|                     filter flows by using a custom query          | –
 |--sport_range|               filter source port range                   | –
 |--sport|                     filter source port                         | –
 |--sports|                    filter on either of two source ports       | –
@@ -134,7 +134,7 @@ $ oc netobserv packets [<option>]
 |--port|                      filter port                                | –
 |--ports|                     filter on either of two ports              | –
 |--protocol|                  filter protocol                            | –
-|--query|                     filter flows using a custom query          | –
+|--query|                     filter flows by using a custom query          | –
 |--sport_range|               filter source port range                   | –
 |--sport|                     filter source port                         | –
 |--sports|                    filter on either of two source ports       | –
@@ -184,7 +184,7 @@ $ oc netobserv metrics [<option>]
 |--port|                      filter port                                | –
 |--ports|                     filter on either of two ports              | –
 |--protocol|                  filter protocol                            | –
-|--query|                     filter flows using a custom query          | –
+|--query|                     filter flows by using a custom query          | –
 |--sport_range|               filter source port range                   | –
 |--sport|                     filter source port                         | –
 |--sports|                    filter on either of two source ports       | –

modules/proc_network-observability-working-with-ipsec.adoc renamed to modules/network-observability-proc_configuring-ipsec-with-flow-collector-resource.adoc

@@ -3,8 +3,8 @@
 // network_observability/observing-network-traffic.adoc
 
 :_mod-docs-content-type: PROCEDURE
-[id="network-observability-working-with-ipsec_{context}"]
-= Working with IPsec
+[id="network-observability-configuring-ipsec-with-flow-collector-resource_{context}"]
+= Configuring IPsec with the FlowCollector custom resource
 
 In {product-title}, IPsec is disabled by default. You can enable IPsec by following the instructions in "Configuring IPsec encryption".
 

modules/network-observability-viewing-network-events.adoc

@@ -15,10 +15,10 @@ You can edit the `FlowCollector` to view information about network traffic event
 * `BaselineNetworkPolicy`
 * `EgressFirewall`
 * `UserDefinedNetwork` isolation
-* Multicast ACLs 
+* Multicast ACLs
 
 .Prerequisites
-* You must have `OVNObservability` enabled by setting the `TechPreviewNoUpgrade` feature set in the `FeatureGate` custom resource (CR) named `cluster`. For more information, see "Enabling feature sets using the CLI" and "Checking OVN-Kubernetes network traffic with OVS sampling using the CLI". 
+* You must have `OVNObservability` enabled by setting the `TechPreviewNoUpgrade` feature set in the `FeatureGate` custom resource (CR) named `cluster`. For more information, see "Enabling feature sets using the CLI" and "Checking OVN-Kubernetes network traffic with OVS sampling using the CLI".
 * You have created at least one of the following network APIs: `NetworkPolicy`, `AdminNetworkPolicy`, `BaselineNetworkPolicy`, `UserDefinedNetwork` isolation, multicast, or `EgressFirewall`.
 
 .Procedure
@@ -44,15 +44,15 @@ spec:
       features:
        - "NetworkEvents"
 ----
-<1> Optional: The `sampling` parameter is set to a value of 1 so that all network events are captured. If sampling `1` is too resource heavy, set sampling to something more appropriate for your needs. 
+<1> Optional: The `sampling` parameter is set to a value of 1 so that all network events are captured. If sampling `1` is too resource heavy, set sampling to something more appropriate for your needs.
 <2> The `privileged` parameter is set to `true` because the `OVN observability` library needs to access local Open vSwitch (OVS) socket and OpenShift Virtual Network (OVN) databases.
 
 .Verification
-. Navigate to the *Network Traffic* view and select the *Traffic flows* table. 
-. You should see the new column, *Network Events*, where you can view information about impacts of one of the following network APIs you have enabled: `NetworkPolicy`, `AdminNetworkPolicy`, `BaselineNetworkPolicy`, `UserDefinedNetwork` isolation, multicast, or egress firewalls. 
+. Navigate to the *Network Traffic* view and select the *Traffic flows* table.
+. You should see the new column, *Network Events*, where you can view information about impacts of one of the following network APIs you have enabled: `NetworkPolicy`, `AdminNetworkPolicy`, `BaselineNetworkPolicy`, `UserDefinedNetwork` isolation, multicast, or egress firewalls.
 
 An example of the kind of events you could see in this column is as follows:
-+
+
 .Example of Network Events output
 [source,text]
 ----

observability/network_observability/observing-network-traffic.adoc

@@ -58,11 +58,11 @@ include::modules/network-observability-networking-events-overview.adoc[leveloffs
 include::modules/network-observability-trafficflow.adoc[leveloffset=+1]
 include::modules/network-observability-working-with-trafficflow.adoc[leveloffset=+2]
 include::modules/network-observability-configuring-options-trafficflow.adoc[leveloffset=+2]
-include::modules/proc_network-observability-working-with-ipsec.adoc[leveloffset=+2]
+include::modules/network-observability-proc_configuring-ipsec-with-flow-collector-resource.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
-*xref:../../networking/network_security/configuring-ipsec-ovn.adoc#configuring-ipsec-ovn[Configuring IPsec encryption]
+* xref:../../networking/network_security/configuring-ipsec-ovn.adoc#configuring-ipsec-ovn[Configuring IPsec encryption]
 
 //Traffic flows continued
 include::modules/network-observability-working-with-conversations.adoc[leveloffset=+2]