Docsp 30396 fix path v7.0 (#3279)

Dave Cuthbert · web-flow · commit dc736f45a1c4 · 2023-06-06T09:18:26.000-07:00
* DOCSP-30396 fix broken path * Unrelated build errors
diff --git a/source/includes/atlas-search-commands/atlas-search-command-table.rst b/source/includes/atlas-search-commands/atlas-search-command-table.rst
@@ -8,12 +8,12 @@
 
    * - :dbcommand:`createSearchIndexes`
 
-     - .. include:: /includes/atlas-search-commands/command-descriptions.rst/createSearchIndexes-description.rst
+     - .. include:: /includes/atlas-search-commands/command-descriptions/createSearchIndexes-description.rst
 
    * - :dbcommand:`dropSearchIndex`
 
-     - .. include:: /includes/atlas-search-commands/command-descriptions.rst/dropSearchIndex-description.rst
+     - .. include:: /includes/atlas-search-commands/command-descriptions/dropSearchIndex-description.rst
 
    * - :dbcommand:`updateSearchIndex`
 
-     - .. include:: /includes/atlas-search-commands/command-descriptions.rst/updateSearchIndex-description.rst
+     - .. include:: /includes/atlas-search-commands/command-descriptions/updateSearchIndex-description.rst
diff --git a/source/includes/atlas-search-commands/command-descriptions/createSearchIndexes-description.rst b/source/includes/atlas-search-commands/command-descriptions/createSearchIndexes-description.rst
diff --git a/source/includes/atlas-search-commands/command-descriptions/dropSearchIndex-description.rst b/source/includes/atlas-search-commands/command-descriptions/dropSearchIndex-description.rst
diff --git a/source/includes/atlas-search-commands/command-descriptions/updateSearchIndex-description.rst b/source/includes/atlas-search-commands/command-descriptions/updateSearchIndex-description.rst
diff --git a/source/reference/command.txt b/source/reference/command.txt
@@ -949,13 +949,13 @@ Atlas Search Commands
      - Description
 
    * - :dbcommand:`createSearchIndexes`
-     - .. include:: /includes/atlas-search-commands/command-descriptions.rst/createSearchIndexes-description.rst
+     - .. include:: /includes/atlas-search-commands/command-descriptions/createSearchIndexes-description.rst
 
    * - :dbcommand:`dropSearchIndex`
-     - .. include:: /includes/atlas-search-commands/command-descriptions.rst/dropSearchIndex-description.rst
+     - .. include:: /includes/atlas-search-commands/command-descriptions/dropSearchIndex-description.rst
    
    * - :dbcommand:`updateSearchIndex`
-     - .. include:: /includes/atlas-search-commands/command-descriptions.rst/updateSearchIndex-description.rst
+     - .. include:: /includes/atlas-search-commands/command-descriptions/updateSearchIndex-description.rst
 
 .. toctree::
    :titlesonly:
diff --git a/source/reference/command/createSearchIndexes.txt b/source/reference/command/createSearchIndexes.txt
@@ -15,7 +15,7 @@ Definition
 
 .. dbcommand:: createSearchIndexes
 
-.. include:: /includes/atlas-search-commands/command-descriptions.rst/createSearchIndexes-description.rst
+.. include:: /includes/atlas-search-commands/command-descriptions/createSearchIndexes-description.rst
 
 .. include:: /includes/atlas-search-commands/atlas-only-db-command.rst
 
diff --git a/source/reference/command/dropSearchIndex.txt b/source/reference/command/dropSearchIndex.txt
@@ -15,7 +15,7 @@ Definition
 
 .. dbcommand:: dropSearchIndex
 
-.. include:: /includes/atlas-search-commands/command-descriptions.rst/dropSearchIndex-description.rst
+.. include:: /includes/atlas-search-commands/command-descriptions/dropSearchIndex-description.rst
 
 .. include:: /includes/atlas-search-commands/atlas-only-db-command.rst
 
diff --git a/source/reference/command/updateSearchIndex.txt b/source/reference/command/updateSearchIndex.txt
@@ -15,7 +15,7 @@ Definition
 
 .. dbcommand:: updateSearchIndex
 
-.. include:: /includes/atlas-search-commands/command-descriptions.rst/updateSearchIndex-description.rst
+.. include:: /includes/atlas-search-commands/command-descriptions/updateSearchIndex-description.rst
 
 .. include:: /includes/atlas-search-commands/atlas-only-db-command.rst
 
diff --git a/source/release-notes/7.0-compatibility.txt b/source/release-notes/7.0-compatibility.txt
@@ -12,10 +12,6 @@ Compatibility Changes in MongoDB 7.0
    :depth: 1
    :class: singlecol
 
-<<<<<<< HEAD
-This page describes changes introduced in MongoDB 7.0 that can affect
-compatibility with older versions of MongoDB.
-=======
 .. |version| replace:: 7.0
 .. include:: /includes/rapid-release.rst
 
@@ -64,4 +60,3 @@ If you encrypted data using the {+qe-preview+}:
      collection from a driver to output the decrypted data. 
    * MongoDB 7.0 drivers can't query encrypted fields on data encrypted 
      with MongoDB 6.x drivers, so you must query the entire collection.
->>>>>>> 3f72852ce (Cleaned feature branch)
