[2.29.x] Forward ports docs from 2.26

distribution/docs/src/main/resources/content/_architectures/_catalogFrameworks/catalog-framework-intro.adoc

@@ -111,7 +111,6 @@ Similarly, for deletion of catalog entries, the delete requests call the `delete
 
 Any ingest attempts that fail inside the Catalog Framework (whether the failure comes from the Catalog Framework itself, pre-ingest plugin failures, or issues with the Catalog Provider) are logged to a separate log file for ease of error handling.
 The file is located at `${home_directory}/data/log/ingest_error.log` and it logs the Metacards that fail, their ID and Title name, and the stack trace associated with their failure.
->>>>>>> Removed future tense from docs content (#6646)
 By default, successful ingest attempts are not logged.
 However, that functionality can be achieved by setting the log level of the `ingestLogger` to DEBUG (note that enabling DEBUG can cause a non-trivial performance hit).
 

distribution/docs/src/main/resources/content/_introduction/applications.adoc

@@ -26,7 +26,7 @@ Provides authentication, authorization, and auditing services for the ${branding
 It is both a framework that developers and integrators can extend and a reference implementation that meets security requirements.
 
 ((${ddf-solr} Application))::
-Includes the Solr Catalog Provider, an implementation of the Catalog Provider using http://solr.apache.org/[Apache Solr] {external-link} as a data store.
+Includes the Solr Catalog Provider, an implementation of the Catalog Provider using http://lucene.apache.org/solr/[Apache Solr] {external-link} as a data store.
 
 ((${ddf-spatial} Application))::
 Provides OGC services, such as http://www.opengeospatial.org/standards/cat[CSW] {external-link}, http://www.opengeospatial.org/standards/wcs[WCS] {external-link}, http://www.opengeospatial.org/standards/wfs[WFS] {external-link}, and http://www.opengeospatial.org/standards/kml[KML] {external-link}.

distribution/docs/src/main/resources/content/_managing/_configuring/content-directory-monitor.adoc

@@ -111,10 +111,11 @@ A maximum of 8 is imposed to protect system resources.
 
 .Read Lock
 When the CDM is set up, the directory specified is continuously scanned, and files are locked for processing based on the *ReadLock Time Interval*. This does not apply to the *Monitor in place* processing directive. Files are not ingested without having a ReadLock that has observed no change in the file size.
-This is done so that files that are in transit are not ingested prematurely. The interval should be dependent on the speed of the copy to the directory monitor (for example, network drive vs local disk).
+This is done so that files that are in transit are not ingested prematurely. The interval should be dependent on the speed of the copy to the directory monitor (ex. network drive vs local disk).
 For local files, the default value of 500 milliseconds is recommended. The recommended interval for network drives is 1000 - 2000 milliseconds. If the value provided is less than 100, 100 milliseconds is used.
 It is also recommended that the *ReadLock Time Interval* be set to a lower amount of time when the *Maximum Concurrent Files* is set above 1 so that files are
-locked in a timely manner and processed as soon as possible. When a higher *ReadLock Time Interval* is set, the time it takes for files to be processed is increased.
+locked in a timely manner and processed as soon as possible.
+When a higher *ReadLock Time Interval* is set, the time it takes for files to be processed is increased.
 
 .Attribute Overrides
 The CDM supports setting metacard attributes directly when ${branding} ingests a file. Custom overrides are entered in the form: