theforeman · ianballou · Dec 20, 2023 · Nov 28, 2023 · Nov 25, 2023 · Nov 25, 2023
diff --git a/guides/common/assembly_administering-hosts.adoc b/guides/common/assembly_administering-hosts.adoc
@@ -59,3 +59,11 @@ include::modules/proc_installing-the-snapshot-management-plugin.adoc[leveloffset
 
 include::modules/proc_creating-snapshots-of-a-managed-host.adoc[leveloffset=+1]
 endif::[]
+
+ifdef::katello,satellite,orcharhino[]
+include::modules/con_lifecycle-status-of-rhel-hosts.adoc[leveloffset=+1]
+
+include::modules/proc_displaying-rhel-lifecycle-status.adoc[leveloffset=+2]
+
+include::modules/con_host-search-by-rhel-lifecycle-status.adoc[leveloffset=+2]
+endif::[]
diff --git a/guides/common/assembly_building_cloud-images.adoc b/guides/common/assembly_building_cloud-images.adoc
@@ -8,8 +8,6 @@ include::modules/proc_configuring-a-host-for-registration.adoc[leveloffset=+1]
 
 include::modules/proc_registering-a-host.adoc[leveloffset=+1]
 
-include::modules/proc_installing-the-katello-agent.adoc[leveloffset=+1]
-
 include::modules/proc_installing-and-configuring-puppet-agent-manually.adoc[leveloffset=+1]
 
 include::modules/proc_completing-the-rhel7-image.adoc[leveloffset=+1]

diff --git a/guides/common/assembly_importing-content.adoc b/guides/common/assembly_importing-content.adoc
@@ -114,6 +114,8 @@ include::modules/proc_changing-the-mirroring-policy-for-a-repository.adoc[levelo
 
 include::modules/proc_uploading-content-to-custom-rpm-repositories.adoc[leveloffset=+1]
 
+include::modules/proc_refreshing-content-counts-on-smart-proxy.adoc[leveloffset=+1]
+
 ifdef::katello,satellite,orcharhino[]
 include::modules/proc_configuring-selinux-to-permit-content-synchronization-on-custom-ports.adoc[leveloffset=+1]
 endif::[]

diff --git a/guides/common/assembly_installing-capsule-server.adoc b/guides/common/assembly_installing-capsule-server.adoc
@@ -25,6 +25,10 @@ ifdef::foreman-el,foreman-deb[]
 include::modules/proc_configuring-repositories.adoc[leveloffset=+1]
 endif::[]
 
+include::modules/con_using-fapolicyd-on-server.adoc[leveloffset=+1]
+
+include::modules/proc_installing-fapolicyd-on-server.adoc[leveloffset=+2]
+
 // Installing {SmartProxyServer} Packages
 include::modules/proc_installing-capsule-server-packages.adoc[leveloffset=+1]
 

diff --git a/guides/common/assembly_installing-satellite-server-disconnected.adoc b/guides/common/assembly_installing-satellite-server-disconnected.adoc
@@ -21,6 +21,10 @@ include::modules/proc_configuring-the-base-operating-system-with-offline-reposit
 
 include::modules/proc_installing-from-the-offline-repositories.adoc[leveloffset=+1]
 
+include::modules/con_using-fapolicyd-on-server.adoc[leveloffset=+1]
+
+include::modules/proc_installing-fapolicyd-on-server.adoc[leveloffset=+2]
+
 include::modules/proc_resolving-package-dependency-errors.adoc[leveloffset=+1]
 
 include::modules/proc_synchronizing-the-system-clock-with-chronyd.adoc[leveloffset=+1]

diff --git a/guides/common/assembly_installing-server-connected.adoc b/guides/common/assembly_installing-server-connected.adoc
@@ -55,6 +55,10 @@ endif::[]
 
 include::modules/proc_configuring-repositories.adoc[leveloffset=+1]
 
+include::modules/con_using-fapolicyd-on-server.adoc[leveloffset=+1]
+
+include::modules/proc_installing-fapolicyd-on-server.adoc[leveloffset=+2]
+
 include::modules/proc_installing-the-satellite-server-packages.adoc[leveloffset=+1]
 
 ifdef::foreman-el,katello,satellite[]

diff --git a/guides/common/assembly_managing-application-life-cycles.adoc b/guides/common/assembly_managing-application-life-cycles.adoc
diff --git a/guides/common/assembly_managing-application-lifecycles.adoc b/guides/common/assembly_managing-application-lifecycles.adoc
@@ -0,0 +1,13 @@
+include::modules/con_managing-application-lifecycles.adoc[]
+
+include::modules/con_introduction-to-application-lifecycle.adoc[leveloffset=+1]
+
+include::modules/con_content-promotion-across-the-application-lifecycle.adoc[leveloffset=+1]
+
+include::modules/proc_creating-a-lifecycle-environment-path.adoc[leveloffset=+1]
+
+include::modules/proc_adding-lifecycle-environments.adoc[leveloffset=+1]
+
+include::modules/proc_removing-lifecycle-environments-from-foreman.adoc[leveloffset=+1]
+
+include::modules/proc_removing-lifecycle-environments-from-smart-proxy.adoc[leveloffset=+1]
diff --git a/guides/common/assembly_monitoring-hosts-using-red-hat-insights.adoc b/guides/common/assembly_monitoring-hosts-using-red-hat-insights.adoc
@@ -4,6 +4,14 @@ ifdef::orcharhino[]
 include::modules/proc_installing-red-hat-cloud-plug-in.adoc[leveloffset=+1]
 endif::[]
 
-include::modules/proc_using-red-hat-insights.adoc[leveloffset=+1]
+include::modules/ref_access-to-information-from-insights-in-project.adoc[leveloffset=+1]
 
-include::modules/proc_creating-an-insights-plan-for-hosts.adoc[leveloffset=+1]
+include::modules/proc_excluding-hosts-from-rh-cloud-and-insights-client-reports.adoc[leveloffset=+1]
+
+include::modules/proc_deploying-red-hat-insights-using-the-ansible-role.adoc[leveloffset=+1]
+
+include::modules/proc_configuring-synchronization-of-insights-recommendations-for-hosts.adoc[leveloffset=+1]
+
+include::modules/proc_configuring-automatic-removal-of-hosts-from-the-insights-inventory.adoc[leveloffset=+1]
+
+include::modules/proc_creating-an-insights-remediation-plan-for-hosts.adoc[leveloffset=+1]
diff --git a/guides/common/assembly_performing-additional-configuration-on-capsule-server.adoc b/guides/common/assembly_performing-additional-configuration-on-capsule-server.adoc
@@ -9,11 +9,6 @@ Use this chapter to configure additional settings on your {SmartProxyServer}.
 // Configuring SmartProxy for Host Registration and Provisioning
 include::modules/proc_configuring-smart-proxy-for-host-registration-and-provisioning.adoc[leveloffset=+1]
 
-ifdef::katello,orcharhino,satellite[]
-// Enabling Katello Agent Infrastructure
-include::modules/proc_enabling-katello-agent.adoc[leveloffset=+1]
-endif::[]
-
 ifdef::foreman-el,foreman-deb,katello[]
 include::modules/proc_enabling-remote-execution.adoc[leveloffset=+1]
 endif::[]
@@ -28,8 +23,8 @@ include::modules/proc_enabling-openscap.adoc[leveloffset=+1]
 endif::[]
 
 ifdef::katello,satellite[]
-// Adding Life Cycle Environments to {SmartProxyServers}
-include::modules/proc_adding-life-cycle-environments.adoc[leveloffset=+1]
+// Adding Lifecycle Environments to {SmartProxyServers}
+include::modules/proc_adding-lifecycle-environments.adoc[leveloffset=+1]
 endif::[]
 
 // Enabling Power Management on Managed Hosts

diff --git a/guides/common/assembly_registering-hosts.adoc b/guides/common/assembly_registering-hosts.adoc
@@ -43,8 +43,6 @@ include::modules/proc_providing-an-alternative-fqdn-for-the-host.adoc[leveloffse
 endif::[]
 
 // Host tools
-include::modules/proc_installing-the-katello-agent.adoc[leveloffset=+1]
-
 include::modules/proc_installing-tracer.adoc[leveloffset=+1]
 
 include::modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc[leveloffset=+1]

diff --git a/guides/common/assembly_searching-and-bookmarking.adoc b/guides/common/assembly_searching-and-bookmarking.adoc
@@ -15,3 +15,5 @@ include::modules/con_managing-bookmarks.adoc[leveloffset=+1]
 include::modules/proc_creating-bookmarks.adoc[leveloffset=+2]
 
 include::modules/proc_deleting-bookmarks.adoc[leveloffset=+2]
+
+include::modules/con_using-keyboard-shortcuts.adoc[leveloffset=+1]
diff --git a/guides/common/attributes-foreman-el.adoc b/guides/common/attributes-foreman-el.adoc
@@ -1,7 +1,6 @@
 // Overrides for foreman-el build
 :install-on-os: CentOS/RHEL
 :dnf-module: foreman:el8
-:dnf-modules: {dnf-module}
 
 // Some documents are not ready for stable releases, but can be published on nightly
 ifeval::["{DocState}" != "nightly"]

diff --git a/guides/common/attributes-katello.adoc b/guides/common/attributes-katello.adoc
@@ -3,7 +3,6 @@
 :client-content-apt:
 :client-content-zypper:
 :dnf-module: katello:el8
-:dnf-modules: {dnf-module} pulpcore:el8
 :foreman-installer-package: foreman-installer-katello
 :installer-log-file: /var/log/foreman-installer/katello.log
 :installer-scenario-smartproxy: foreman-installer --scenario foreman-proxy-content

diff --git a/guides/common/attributes-orcharhino.adoc b/guides/common/attributes-orcharhino.adoc
@@ -36,7 +36,6 @@
 :customssl: custom SSL
 :customssltitle: Custom SSL
 :dnf-module: orcharhino:el8
-:dnf-modules: {dnf-module}
 :foreman-example-com: orcharhino.example.com
 :installer-log-file: /var/log/foreman-installer/katello.log
 :installer-scenario-smartproxy: orcharhino-installer --no-enable-foreman

diff --git a/guides/common/attributes-satellite.adoc b/guides/common/attributes-satellite.adoc
@@ -31,7 +31,7 @@
 :APIDocURL: {BaseURL}api_guide/index#
 :HammerDocURL: {BaseURL}hammer_cli_guide/index#
 :ConfiguringVMSubscriptionsDocURL: {BaseURL}configuring_virtual_machine_subscriptions_in_red_hat_satellite/index#
-:ConversionsToolkitDocURL: {BaseURL}converting_hosts_to_rhel_by_using_conversions_toolkit/index#
+:ConversionsToolkitDocURL: {BaseURL}converting_hosts_to_rhel_by_using_satellite_conversions_toolkit/index#
 
 // Overrides for satellite build
 :ansible-collection-package: ansible-collection-redhat-satellite
@@ -147,4 +147,3 @@
 :project-client-RHEL7-url: {RepoRHEL7ServerSatelliteToolsProjectVersion}
 :project-client-RHEL8-url: {RepoRHEL8ServerSatelliteToolsProjectVersion}
 :dnf-module: satellite:el8
-:dnf-modules: {dnf-module}
diff --git a/guides/common/attributes-titles.adoc b/guides/common/attributes-titles.adoc
@@ -32,7 +32,7 @@
 :APIDocTitle: API Guide
 :HammerDocTitle: Hammer CLI Guide
 :ConfiguringVMSubscriptionsDocTitle: Configuring Virtual Machine Subscriptions in {ProjectName}
-:ConversionsToolkitDocTitle: Converting Hosts to RHEL by Using Conversions Toolkit
+:ConversionsToolkitDocTitle: Converting Hosts to RHEL by Using Satellite Conversions Toolkit
 
 // Overrides for titles per product
 

diff --git a/guides/common/modules/con_applying-errata-to-hosts.adoc b/guides/common/modules/con_applying-errata-to-hosts.adoc
@@ -13,10 +13,4 @@ For more information, see {ManagingHostsDocURL}Registering_Hosts_managing-hosts[
 * Configure the host for remote execution.
 For more information about running remote execution jobs, see {ManagingHostsDocURL}Configuring_and_Setting_Up_Remote_Jobs_managing-hosts[Configuring and Setting Up Remote Jobs] in _{ManagingHostsDocTitle}_.
 
-[NOTE]
-====
-If the host is already configured to receive content updates with the deprecated Katello Agent, migrate to remote execution instead.
-For more information, see {ManagingHostsDocURL}Migrating_Hosts_From_Katello_Agent_to_Remote_Execution_managing-hosts[Migrating From Katello Agent to Remote Execution] in _{ManagingHostsDocTitle}_.
-====
-
 The procedure to apply an erratum to a managed host depends on its operating system.
diff --git a/guides/common/modules/con_configuring-external-authentication.adoc b/guides/common/modules/con_configuring-external-authentication.adoc
@@ -42,7 +42,7 @@ For more information, see xref:Configuring_Keycloak_Authentication_with_CAC_Card
 endif::[]
 
 As well as providing access to {ProjectServer}, hosts provisioned with {Project} can also be integrated with {FreeIPA} realms.
-{ProjectName} has a realm feature that automatically manages the life cycle of any system registered to a realm or domain provider.
+{ProjectName} has a realm feature that automatically manages the lifecycle of any system registered to a realm or domain provider.
 For more information, see xref:External_Authentication_for_Provisioned_Hosts_{context}[].
 
 .Authentication Overview

diff --git a/guides/common/modules/con_configuring-host-collections.adoc b/guides/common/modules/con_configuring-host-collections.adoc
@@ -8,6 +8,6 @@ endif::[]
 
 A host collection is a group of content hosts.
 This feature enables you to perform the same action on multiple hosts at once.
-These actions can include the installation, removal, and update of packages and errata, change of assigned life cycle environment, and change of Content View.
+These actions can include the installation, removal, and update of packages and errata, change of assigned lifecycle environment, and change of Content View.
 You can create host collections to suit your requirements, and those of your company.
 For example, group hosts in host collections by function, department, or business unit.
diff --git a/...on-across-the-application-life-cycle.adoc → ...ion-across-the-application-lifecycle.adoc b/...on-across-the-application-life-cycle.adoc → ...ion-across-the-application-lifecycle.adoc
@@ -1,17 +1,17 @@
-[id="Content_Promotion_across_the_Application_Life_Cycle_{context}"]
-= Content Promotion across the Application Life Cycle
+[id="Content_Promotion_across_the_Application_Lifecycle_{context}"]
+= Content Promotion across the Application Lifecycle
 
-In the application life cycle chain, when content moves from one environment to the next, this is called _promotion_.
+In the application lifecycle chain, when content moves from one environment to the next, this is called _promotion_.
 
-.Example Content Promotion Across {Project} Life Cycle Environments
+.Example Content Promotion Across {Project} Lifecycle Environments
 
 Each environment contains a set of systems registered to {ProjectName}.
 These systems only have access to repositories relevant to their environment.
 When you promote packages from one environment to the next, the target environment's repositories receive new package versions.
 As a result, each system in the target environment can update to the new package versions.
 
 ifndef::satellite[]
-This example uses a `.{client-pkg-ext}` package, but you can promote any type of content across the application life cycle.
+This example uses a `.{client-pkg-ext}` package, but you can promote any type of content across the application lifecycle.
 endif::[]
 
 |===
@@ -21,7 +21,7 @@ endif::[]
 |===
 
 After completing development on the patch, you promote the package to the Testing environment so the Quality Engineering team can review the patch.
-The application life cycle then contains the following package versions in each environment:
+The application lifecycle then contains the following package versions in each environment:
 
 |===
 | Development | Testing | Production
@@ -30,7 +30,7 @@ The application life cycle then contains the following package versions in each
 |===
 
 While the Quality Engineering team reviews the patch, the Development team starts work on _example_software_ 2.0.
-This results in the following application life cycle:
+This results in the following application lifecycle:
 
 |===
 | Development | Testing | Production

diff --git a/guides/common/modules/con_download-policies-overview.adoc b/guides/common/modules/con_download-policies-overview.adoc
@@ -26,7 +26,7 @@ endif::[]
 ifndef::satellite[]
 The lazy synchronization feature must be used only for `deb` and `yum` repositories.
 endif::[]
-You can add the packages to Content Views and promote to life cycle environments as normal.
+You can add the packages to Content Views and promote to lifecycle environments as normal.
 
 {SmartProxyServer} has the following policies:
 

diff --git a/guides/common/modules/con_examples-of-using-granular-permission-filter.adoc b/guides/common/modules/con_examples-of-using-granular-permission-filter.adoc
@@ -2,4 +2,4 @@
 = Examples of Using Granular Permission Filters
 
 As an administrator, you can allow selected users to make changes in a certain part of the environment path.
-The following filter allows you to work with content while it is in the development stage of the application life cycle, but the content becomes inaccessible once is pushed to production.
+The following filter allows you to work with content while it is in the development stage of the application lifecycle, but the content becomes inaccessible once is pushed to production.
diff --git a/guides/common/modules/con_host-search-by-rhel-lifecycle-status.adoc b/guides/common/modules/con_host-search-by-rhel-lifecycle-status.adoc
@@ -0,0 +1,12 @@
+[id="host_search_by_rhel_lifecycle_status_{context}"]
+= Host Search by RHEL Lifecycle Status
+
+You can use the *Search* field to search hosts by `rhel_lifecycle_status`.
+It can have one of the following values:
+
+* `full_support`
+* `maintenance_support`
+* `approaching_end_of_maintenance`
+* `extended_support`
+* `approaching_end_of_support`
+* `support_ended`
diff --git a/guides/common/modules/con_introduction-to-application-life-cycles.adoc b/guides/common/modules/con_introduction-to-application-life-cycles.adoc
diff --git a/guides/common/modules/con_introduction-to-application-lifecycle.adoc b/guides/common/modules/con_introduction-to-application-lifecycle.adoc
@@ -0,0 +1,44 @@
+[id="introduction_to_application_lifecycle_{context}"]
+= Introduction to Application Lifecycle
+
+The _application lifecycle_ is a concept central to {Project}'s content management functions.
+The application lifecycle defines how a particular system and its software look at a particular stage.
+For example, an application lifecycle might be simple; you might only have a development stage and production stage.
+In this case the application lifecycle might look like this:
+
+* Development
+* Production
+
+However, a more complex application lifecycle might have further stages, such as a phase for testing or a beta release.
+This adds extra stages to the application lifecycle:
+
+* Development
+* Testing
+* Beta Release
+* Production
+
+{Project} provides methods to customize each application lifecycle stage so that it suits your specifications.
+
+Each stage in the application lifecycle is called an _environment_ in {Project}.
+Each environment uses a specific collection of content.
+{Project} defines these content collections as a Content View.
+Each Content View acts as a filter where you can define what repositories, and packages to include in a particular environment.
+This provides a method for you to define specific sets of content to designate to each environment.
+
+For example, an email server might only require a simple application lifecycle where you have a production-level server for real-world use and a test server for trying out the latest mail server packages.
+When the test server passes the initial phase, you can set the production-level server to use the new packages.
+
+Another example is a development lifecycle for a software product.
+To develop a new piece of software in a development environment, test it in a quality assurance environment, pre-release as a beta, then release the software as a production-level application.
+
+ifdef::katello[]
+image::application-lifecycle.png[title="The {Project} Application Lifecycle", alt="The {Project} Application Lifecycle"]
+endif::[]
+
+ifdef::satellite[]
+image::application-lifecycle-satellite.png[title="The {Project} Application Lifecycle", alt="The {Project} Application Lifecycle"]
+endif::[]
+
+ifdef::orcharhino[]
+image::application-lifecycle-orcharhino.svg[title="The {Project} Application Lifecycle", alt="The {Project} Application Lifecycle"]
+endif::[]
diff --git a/guides/common/modules/con_introduction-to-content-management.adoc b/guides/common/modules/con_introduction-to-content-management.adoc
@@ -4,10 +4,10 @@
 In the context of {Project}, _content_ is defined as the software installed on systems.
 This includes, but is not limited to, the base operating system, middleware services, and end-user applications.
 ifdef::satellite[]
-With {ProjectName}, you can manage the various types of content for {RHEL} systems at every stage of the software life cycle.
+With {ProjectName}, you can manage the various types of content for {RHEL} systems at every stage of the software lifecycle.
 endif::[]
 ifndef::satellite[]
-With {Project}, you can manage the various types of content at every stage of the software life cycle.
+With {Project}, you can manage the various types of content at every stage of the software lifecycle.
 endif::[]
 
 ifdef::foreman-el,katello[]