Revert "add changelogs for Cabal-3.6.2.0 and cabal-install-3.6.2.0"

This reverts commit 3d9ee26a.

Cabal/ChangeLog.md

-# 3.6.2.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) October 2021
-  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.2.0.md
-
-# 3.6.1.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021
-  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.1.0.md
+# 3.8.0.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) _Month _Year
+  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.8.0.0.md
 
 # 3.6.0.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021
   * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.0.0.md

cabal-install/changelog

 -*-change-log-*-
-
-3.6.2.0 Emily Pillmore <emilypi@cohomolo.gy> October 2021
-	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.2.0.md
-
 3.6.0.0 Emily Pillmore <emilypi@cohomolo.gy> August 2021
 	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md
 

changelog.d/issue-4683

 synopsis: 'cabal check' to fail when no upper bounds for base or Cabal are present in setup dependencies
-packages: Cabal cabal-install
+packages: Cabal, cabal-install
 issues: #4683
-prs: #5370 #7409
+prs: #5370, #7409

changelog.d/option-argument-errors

 synopsis: Handle option argument parse errors without 'error'
-packages: Cabal cabal-install
+packages: Cabal, cabal-install
 prs: #7579
 issues: #7573
 description: {

changelog.d/pr-7296

 synopsis: Add 'preferred-versions' support for LocalIndexRepo
 packages: cabal-install
 prs: #7296
-issues: #7249 #5603
+issues: #7249, #5603
 
 description: {
 
@@ -9,3 +9,4 @@ description: {
   versions of packages. In particular, if the only newer version of a package has been deprecated,
   `cabal outdated` should not report that there are newer versions available.
 }
+

changelog.d/pr-7358

@@ -8,7 +8,7 @@ description {
 
 - Moves `cabal-install-solver` out to its own directory, and treats it as its own separate project. Addresses #6090, #7224, and #3781
 
-- Enable HPC coverage
+- Enable HPC coverage:
 
   - absorb `cabal-install-solver-dsl` module into the test modules, and
     incorporate it into its own test target.

changelog.d/pr-7536

 synopsis: Add fields extra-libraries-static and extra-lib-dirs-static
 packages: Cabal
 prs: #7536
-issues: #7399 #6688
+issues: #7399, #6688

release-notes/Cabal-3.6.2.0.md

-### Significant changes
-
-
-- Make Paths_ modules work with non-standard preludes again [#5962](https://github.com/haskell/cabal/issues/5962)
-
-  - Generate Paths_ module with qualified Data.List.last import so that compatibility with non-standard preludes is not regressed compared to cabal 3.4.
-
-- Windows: redo the fix to breakage caused by new autoconf; the wrong fix made cabal sometimes fail with old autoconf [#7494](https://github.com/haskell/cabal/issues/7494) [#7649](https://github.com/haskell/cabal/issues/7649)
-
-  - Reverts #7510 that failed on Windows when used with pre-generated scripts included in packages such as network, time, process.
-  - Adds a subtler fix/workaround for the deficiencies of new autoconf versions on Windows.
-
-### Other changes
-
-
-- Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7
-
-  - This regenerates bootstrap plans using new package versions and also updating GHC from 8.10.4 to 8.10.7, as requested by GHC HQ.

release-notes/cabal-install-3.6.2.0.md

-### Significant changes
-
-- Make Paths_ modules work with non-standard preludes again [#5962](https://github.com/haskell/cabal/issues/5962)
-
-  - Generate Paths_ module with qualified Data.List.last import so that compatibility with non-standard preludes is not regressed compared to cabal 3.4.
-
-- Windows: redo the fix to breakage caused by new autoconf; the wrong fix made cabal sometimes fail with old autoconf [#7494](https://github.com/haskell/cabal/issues/7494) [#7649](https://github.com/haskell/cabal/issues/7649)
-
-  - Reverts #7510 that failed on Windows when used with pre-generated scripts included in packages such as network, time, process.
-  - Adds a subtler fix/workaround for the deficiencies of new autoconf versions on Windows.
-
-### Other changes
-
-- Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7
-
-  - This regenerates bootstrap plans using new package versions and also updating GHC from 8.10.4 to 8.10.7, as requested by GHC HQ.