DOCSP-48444 -- Reversed unintended changes during backport (#872)

A previous [backport
PR](10gen/docs-ops-manager#869) went ahead with
unintended changes and unresolved merge conflicts. This new PR removes
them.

- [DOCSP-48444](https://jira.mongodb.org/browse/DOCSP-48444)
- [STAGING](paste the link to staging here)

- [LATEST BUILD LOG](paste the build here)

### Self-Review Checklist

- [ ]
[Define](https://wiki.corp.mongodb.com/display/DE/Taxonomy+tagging+instructions)
taxonomy
[values](https://wiki.corp.mongodb.com/display/DE/Docs+Taxonomy) at top
of page.
- [ ] Add genre facets (tutorial or reference), as in this [example
PR](10gen/cloud-docs#5042).
- [ ] Add programmingLanguage (if necessary).
- [ ] Add meta keywords (if necessary).
- [ ] Resolve any new warnings or errors in the build.
- [ ] Proofread for spelling and grammatical errors.
- [ ] Check staging for rendering issues.
- [ ] Confirm links are working.

Author: xargom

source/admin/admin-tab-general.txt

@@ -24,7 +24,7 @@ messages, and other information.
    API Keys </admin/general/api-keys-page>
    Global Access List </admin/general/global-access-list-page>
    Projects </admin/general/projects-page>
-   Backup Logs </admin/general/logs-page>
+   Logs </admin/general/logs-page>
    Version Manifest </admin/general/version-manifest-page>
    Messages </admin/general/messages-page>
    MongoDB Usage </admin/general/mongodb-usage-page>

source/admin/backup/logs-page.txt

@@ -1,15 +1,9 @@
-<<<<<<< HEAD
-====
-Logs
-====
-=======
 =======================
 System Logs
 =======================
 
 .. meta::
    :description: Explore Ops Manager system logs by job and class, with message counts for the last two hours, day, and three days.
->>>>>>> 3f5b03c9 (DOCSP-48444 -- Changed duplicated headings. Modified further headings under the Administration Console->General section in the nav bar for parallelism)
 
 .. default-domain:: mongodb
 

source/admin/general/logs-page.txt

@@ -1,17 +1,11 @@
 .. _admin-console-general-logs:
 
-<<<<<<< HEAD
-====
-Logs
-====
-=======
 ============
 Logs Page
 ============
 
 .. meta::
    :description: Explore backup logs by job and class, with messages grouped and counted over different time periods.
->>>>>>> 3f5b03c9 (DOCSP-48444 -- Changed duplicated headings. Modified further headings under the Administration Console->General section in the nav bar for parallelism)
 
 .. default-domain:: mongodb
 

source/includes/steps-admin-add-s3-blockstore.yaml

@@ -30,9 +30,8 @@ content: |
 
      * - S3 Bucket Name
        - Required
-       - Enter the name of the |s3| bucket where you want to host the the S3-compatible
-       snapshot or oplog store. In case of Amazon S3 using the |uri| name, use the
-       following format: ``s3:// {BUCKET-NAME}``.
+       - Type the name of the |s3| bucket where you want to host the
+         the |s3ss|.
 
      * - Region Override
        - Conditional
@@ -44,17 +43,15 @@ content: |
 
      * - S3 Endpoint
        - Required
-       - Enter the URL for this |s3| bucket. If AWS needs to comply with Amazon S3 regular
-       endpoints, use the following format: ``https://\{Region}.amazonaws.com`` as  the
-       :aws:`AWS S3 documentation </general/latest/gr/s3.html>` shows.
+       - Type the |url| for this |s3| bucket.
 
      * - S3 Max Connections
        - Required
        - Type a positive integer indicating the maximum number of
          connections to this |s3| bucket.
 
      * - Path Style Access
-       - Required
+       - Optional
        - Select if you want your |s3| bucket
          to use a path-style |url| endpoint
          (``s3.amazonaws.com/<bucket>``) instead of a