revert to /contribute/ urls

bishabosha · bishabosha · commit 302bfbff1dc4 · 2022-03-22T16:00:44.000+01:00
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ For more details on the Docker option, see [this issue](https://github.com/scala
 
 ## Contributing ##
 
-Please have a look at [Add New Guides/Tutorials](https://docs.scala-lang.org/overviews/contribute/add-guides.html) before making a contribution.
+Please have a look at [Add New Guides/Tutorials](https://docs.scala-lang.org/contribute/add-guides.html) before making a contribution.
 This document gives an overview of the type of documentation contained within the Scala Documentation repository and the repository's structure.
 
 Small changes, or corrected typos will generally be pulled in right away. Large changes, like the addition of new documents, or the rewriting of
diff --git a/_config.yml b/_config.yml
@@ -105,6 +105,14 @@ defaults:
       overview-name: "Scala 3 — Book"
       layout: multipage-overview
       permalink: "/scala3/book/:title.html"
+  -
+    scope:
+      path: "_overviews/contribute"
+    values:
+      partof: scala-contribution
+      overview-name: Contributing to Scala
+      layout: multipage-overview
+      permalink: "/contribute/:title.html"
   -
     scope:
       path: "_overviews/scala3-migration"
diff --git a/_contribute_resources/1-documentation.md b/_contribute_resources/1-documentation.md
@@ -1,6 +1,6 @@
 ---
 title: Documentation
-link: /overviews/contribute/documentation.html
+link: /contribute/documentation.html
 icon: fa fa-book
 ---
-[Scaladoc (API)](/overviews/contribute/scala-standard-library-api-documentation.html), [docs.scala-lang.org](/overviews/contribute/add-guides.html) and [scala-lang.org](https://github.com/scala/scala-lang).
+[Scaladoc (API)](/contribute/scala-standard-library-api-documentation.html), [docs.scala-lang.org](/contribute/add-guides.html) and [scala-lang.org](https://github.com/scala/scala-lang).
diff --git a/_contribute_resources/2-bug-fixes.md b/_contribute_resources/2-bug-fixes.md
@@ -1,6 +1,6 @@
 ---
 title: Bug fixes
-link: /overviews/contribute/guide.html
+link: /contribute/guide.html
 icon: fa fa-bug
 ---
-Issues with the tools, core libraries and compiler. Also you can help us by [reporting bugs](/overviews/contribute/bug-reporting-guide.html).
+Issues with the tools, core libraries and compiler. Also you can help us by [reporting bugs](/contribute/bug-reporting-guide.html).
diff --git a/_contribute_resources/3-code-reviews.md b/_contribute_resources/3-code-reviews.md
@@ -1,6 +1,6 @@
 ---
 title: Code Reviews
-link: /overviews/contribute/codereviews.html
+link: /contribute/codereviews.html
 icon: fa fa-eye
 ---
 Review pull requests against [scala/scala](https://github.com/scala/scala/pulls),
diff --git a/_contribute_resources/4-core-libraries.md b/_contribute_resources/4-core-libraries.md
@@ -1,6 +1,6 @@
 ---
 title: Core Libraries
-link: /overviews/contribute/corelibs.html
+link: /contribute/corelibs.html
 icon: fa fa-clipboard
 ---
 Update and expand the capabilities of the core (and associated) Scala libraries.
diff --git a/_contribute_resources/5-ide-and-build-tools.md b/_contribute_resources/5-ide-and-build-tools.md
@@ -1,6 +1,6 @@
 ---
 title: IDE and Build Tools
-link: /overviews/contribute/tools.html
+link: /contribute/tools.html
 icon: fa fa-terminal
 ---
 Enhance the Scala tools with features for build tools, IDE plug-ins and other related projects.
diff --git a/_contribute_resources/6-compiler-language.md b/_contribute_resources/6-compiler-language.md
@@ -1,6 +1,6 @@
 ---
 title: Compiler/Language
-link: /overviews/contribute/guide.html#larger-changes-new-features
+link: /contribute/guide.html#larger-changes-new-features
 icon: fa fa-cogs
 ---
 Larger language features and compiler enhancements including language specification and SIPs.
diff --git a/_data/doc-nav-header.yml b/_data/doc-nav-header.yml
@@ -36,7 +36,7 @@
     - title: Language Specification
       url: http://scala-lang.org/files/archive/spec/2.13/
     - title: Contribution Guide
-      url: "/overviews/contribute/"
+      url: "/contribute/"
     - title: Style Guide
       url: "/style/index.html"
     - title: Cheatsheet
diff --git a/_data/nav-header.yml b/_data/nav-header.yml
@@ -11,7 +11,7 @@
   url: https://index.scala-lang.org
   can-highlight: true
 - title: Contribute
-  url: /overviews/contribute/
+  url: /contribute/
 - title: Blog
   url: https://www.scala-lang.org/blog/
   can-highlight: true
diff --git a/_overviews/contribute/add-guides.md b/_overviews/contribute/add-guides.md
@@ -1,9 +1,6 @@
 ---
 title: Add New Guides/Tutorials
-layout: multipage-overview
 num: 7
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 ## Why Contribute New Learning Material?
diff --git a/_overviews/contribute/bug-reporting-guide.md b/_overviews/contribute/bug-reporting-guide.md
@@ -1,9 +1,6 @@
 ---
 title: Bug Reporting Guide
-layout: multipage-overview
 num: 8
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 The Scala compiler and standard library bug tracker is located at [https://github.com/scala/bug](https://github.com/scala/bug), and for Scala 3, it is located at [github.com/lampepfl/dotty](https://github.com/lampepfl/dotty/issues). Before you submit a bug make sure that it is certainly a bug by following instructions in *Is it a Bug?*.
diff --git a/_overviews/contribute/codereviews.md b/_overviews/contribute/codereviews.md
@@ -1,13 +1,10 @@
 ---
 title: Code Review Contributions
-layout: multipage-overview
 num: 3
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 ## Code Review Contributions
 
-In addition to [bug fixing](/overviews/contribute/guide.html), you can help us review
+In addition to [bug fixing](/contribute/guide.html), you can help us review
 [waiting pull requests](#pull-requests-awaiting-comment).
 This is also a good (and recommended) way to get to know the feel of
 the bug-fixing and submissions process before jumping in with your
@@ -57,4 +54,4 @@ own pull requests.
    </div>
 </div>
 
-Also note that the [Tools contributions](/overviews/contribute/tools.html) page has more projects that will generate pull requests.
+Also note that the [Tools contributions](/contribute/tools.html) page has more projects that will generate pull requests.
diff --git a/_overviews/contribute/corelibs.md b/_overviews/contribute/corelibs.md
@@ -1,17 +1,14 @@
 ---
 title: Core Library Contributions
-layout: multipage-overview
 num: 4
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 ## Core Library Contributions
 
 There are several options for contributing to Scala's core libraries. You can:
 
-* Help with [Documentation](/overviews/contribute/documentation.html).
-* [Report Bugs or Issues](/overviews/contribute/bug-reporting-guide.html) against the core libraries.
-* [Fix Bugs or Issues](/overviews/contribute/guide.html) against the
+* Help with [Documentation](/contribute/documentation.html).
+* [Report Bugs or Issues](/contribute/bug-reporting-guide.html) against the core libraries.
+* [Fix Bugs or Issues](/contribute/guide.html) against the
   [reported library bugs/issues](https://github.com/scala/bug).
 
 ### Significant changes
diff --git a/_overviews/contribute/documentation.md b/_overviews/contribute/documentation.md
@@ -1,9 +1,6 @@
 ---
 title: Documentation Contributions
-layout: multipage-overview
 num: 5
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 ## Contributing Documentation to the Scala project
 
@@ -23,11 +20,11 @@ Thanks
 
 The Scala API documentation lives with the scala project source code. There are many ways you can help with improving Scaladoc, including:
 
-* [Log issues for missing scaladoc documentation](/overviews/contribute/scala-standard-library-api-documentation.html#contribute-api-documentation-bug-reports) -
+* [Log issues for missing scaladoc documentation](/contribute/scala-standard-library-api-documentation.html#contribute-api-documentation-bug-reports) -
 Please *follow the issue submission process closely* to help prevent duplicate issues being created.
-* [Claim Scaladoc Issues and Provide Documentation](/overviews/contribute/scala-standard-library-api-documentation.html) - please claim issues prior to working on a specific scaladoc task to prevent duplication of effort. If you sit on an issue for too long without submitting a pull request, it will revert back to unassigned and you will need to re-claim it.
+* [Claim Scaladoc Issues and Provide Documentation](/contribute/scala-standard-library-api-documentation.html) - please claim issues prior to working on a specific scaladoc task to prevent duplication of effort. If you sit on an issue for too long without submitting a pull request, it will revert back to unassigned and you will need to re-claim it.
 * You can also just
-[submit new Scaladoc](/overviews/contribute/scala-standard-library-api-documentation.html)
+[submit new Scaladoc](/contribute/scala-standard-library-api-documentation.html)
 without creating an issue, but please look to see if there is an issue already submitted for your task and claim it if there is. If not, please post your intention to work on a specific scaladoc task on [Scala Contributors](https://contributors.scala-lang.org/) so that people know what you are doing.
 
 ### The Main Scala Documentation Site
@@ -44,7 +41,7 @@ without creating an issue, but please look to see if there is an issue already s
 * SIP (Scala Improvement Process) Proposals
 and more
 
-Please read [Add New Guides/Tutorials](/overviews/contribute/add-guides.html) through before embarking on changes. The site uses
+Please read [Add New Guides/Tutorials](/contribute/add-guides.html) through before embarking on changes. The site uses
 the [Jekyll](https://jekyllrb.com/) markdown engine so you will need to follow the instructions to get that running as well.
 
 ### Updating scala-lang.org
@@ -55,4 +52,4 @@ to Scala and related projects) is provided on the main
 [scala-lang GitHub project](https://github.com/scala/scala-lang) which may be forked to create pull requests.
 
 Please read both the
-[Add New Guides/Tutorials](/overviews/contribute/add-guides.html) document and the [scala-lang.org GitHub README](https://github.com/scala/scala-lang#scala-langorg) before embarking on any changes to the Scala language site, as it uses the same Jekyll markdown tool and many of the same conventions as the Scala documentation site.
+[Add New Guides/Tutorials](/contribute/add-guides.html) document and the [scala-lang.org GitHub README](https://github.com/scala/scala-lang#scala-langorg) before embarking on any changes to the Scala language site, as it uses the same Jekyll markdown tool and many of the same conventions as the Scala documentation site.
diff --git a/_overviews/contribute/guide.md b/_overviews/contribute/guide.md
@@ -1,9 +1,6 @@
 ---
 title: Contributing guide
-layout: multipage-overview
 num: 10
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 | **Shortcut**                           | **Description** |
@@ -41,19 +38,19 @@ unencumbered by copyrights or patents.
 
 This is the impatient developer's checklist for the steps to submit a bug-fix pull request to the Scala project. For more information, description and justification for the steps, follow the links in that step. Further specific instructions for the release of Scala you are targeting can be found in the `CONTRIBUTING.md` file for that [GitHub branch](https://github.com/scala/scala)
 
-1. [Select a bug to fix from GitHub](/overviews/contribute/index.html#community-tickets), or if you found the bug yourself and want to fix it, [create a GitHub issue](/overviews/contribute/bug-reporting-guide.html) (but please
-[make sure it's not a duplicate](/overviews/contribute/bug-reporting-guide.html#please-check-before-reporting-a-bug)).
-2. Optional ([but recommended](/overviews/contribute/scala-internals.html/#why-its-a-good-idea)), announce your intention to work on the bug on [Scala Contributors](https://contributors.scala-lang.org/). After all, don't you want to work on a team with
-[these friendly people](/overviews/contribute/hacker-guide.html#1-connect) - it's one of the perks of contributing.
-3. [Fork the Scala repository](/overviews/contribute/hacker-guide.html#fork) and clone your fork (if you haven't already).
-4. [Create a feature branch](/overviews/contribute/hacker-guide.html#branch) to work on: use the branch name `issue/NNNN` where NNNN is the GitHub issue number.
-5. [Fix the bug, or implement the new small feature](/overviews/contribute/hacker-guide.html#implement), include new tests (yes, for bug fixes too).
-6. [Test, rinse](/overviews/contribute/hacker-guide.html#test) and [test some more](/overviews/contribute/partest-guide.html) until [all the tests pass](/overviews/contribute/hacker-guide.html#verify).
-7. [Commit your changes](/overviews/contribute/hacker-guide.html#commit) to your feature branch in your fork. Please choose your commit message based on the [Git Hygiene](https://github.com/scala/scala#user-content-git-hygiene) section of the Scala project README.
+1. [Select a bug to fix from GitHub](/contribute/index.html#community-tickets), or if you found the bug yourself and want to fix it, [create a GitHub issue](/contribute/bug-reporting-guide.html) (but please
+[make sure it's not a duplicate](/contribute/bug-reporting-guide.html#please-check-before-reporting-a-bug)).
+2. Optional ([but recommended](/contribute/scala-internals.html/#why-its-a-good-idea)), announce your intention to work on the bug on [Scala Contributors](https://contributors.scala-lang.org/). After all, don't you want to work on a team with
+[these friendly people](/contribute/hacker-guide.html#1-connect) - it's one of the perks of contributing.
+3. [Fork the Scala repository](/contribute/hacker-guide.html#fork) and clone your fork (if you haven't already).
+4. [Create a feature branch](/contribute/hacker-guide.html#branch) to work on: use the branch name `issue/NNNN` where NNNN is the GitHub issue number.
+5. [Fix the bug, or implement the new small feature](/contribute/hacker-guide.html#implement), include new tests (yes, for bug fixes too).
+6. [Test, rinse](/contribute/hacker-guide.html#test) and [test some more](/contribute/partest-guide.html) until [all the tests pass](/contribute/hacker-guide.html#verify).
+7. [Commit your changes](/contribute/hacker-guide.html#commit) to your feature branch in your fork. Please choose your commit message based on the [Git Hygiene](https://github.com/scala/scala#user-content-git-hygiene) section of the Scala project README.
 8. If necessary [re-write git history](https://git-scm.com/book/en/Git-Branching-Rebasing) so that [commits are organized by major steps to the fix/feature](
 https://github.com/scala/scala#git-hygiene). For bug fixes, a single commit is requested, for features several commits may be desirable (but each separate commit must compile and pass all tests)
-9. [Submit a pull request](/overviews/contribute/hacker-guide.html#submit).
-10. [Work with a reviewer](https://github.com/scala/scala#reviewing) to [get your pull request merged in](/overviews/contribute/hacker-guide.html#review).
+9. [Submit a pull request](/contribute/hacker-guide.html#submit).
+10. [Work with a reviewer](https://github.com/scala/scala#reviewing) to [get your pull request merged in](/contribute/hacker-guide.html#review).
 11. Celebrate!
 
 Need more information or a little more hand-holding for the first one? We got you covered: take a read through the entire [Hacker Guide][hackers] (or the [equivalent Scala 3 Contributing Guide][scala3-hackers]) for an example of implementing a new feature (some of the steps can be skipped for bug fixes, this will be obvious from reading it, but many of the steps here will help with bug fixes too).
@@ -67,8 +64,8 @@ on the [Scala Contributors](https://contributors.scala-lang.org/) mailing list a
 Contributions, big or small, simple or complex, controversial or undisputed, need to materialize as patches against
 the Scala project source tree. The hacker's guides ([Scala 2][hackers], or [Scala 3][scala3-hackers]) will explain how to materialize your idea into a full-fledged pull request against the Scala code base.
 
-[hackers]: /overviews/contribute/hacker-guide.html
-[community-tickets]: /overviews/contribute/index.html#community-tickets
-[bug-reporting-guide]: /overviews/contribute/bug-reporting-guide.html
+[hackers]: /contribute/hacker-guide.html
+[community-tickets]: /contribute/index.html#community-tickets
+[bug-reporting-guide]: /contribute/bug-reporting-guide.html
 [scala3-hackers]: {% link _overviews/scala3-contribution/procedures-intro.md %}
 [contrib-forum]: https://contributors.scala-lang.org/
diff --git a/_overviews/contribute/hacker-guide.md b/_overviews/contribute/hacker-guide.md
@@ -1,10 +1,7 @@
 ---
 title: Scala hacker guide
 by: Eugene Burmako
-layout: multipage-overview
 num: 12
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 <br>
 This guide is intended to help you get from an idea of fixing a bug or implementing a new feature into a nightly Scala build, and, ultimately, to a production release of Scala incorporating your idea.
@@ -310,7 +307,7 @@ This means your change is backward or forward binary incompatible with the speci
 
 ### Verify
 
-Now to make sure that my fix doesn't break anything I need to run the test suite. The Scala test suite uses [JUnit](https://junit.org/junit4/) and [partest](/overviews/contribute/partest-guide.html), a tool we wrote for testing Scala.
+Now to make sure that my fix doesn't break anything I need to run the test suite. The Scala test suite uses [JUnit](https://junit.org/junit4/) and [partest](/contribute/partest-guide.html), a tool we wrote for testing Scala.
 Run `sbt test` and `sbt partest` to run all of the JUnit and partest tests, respectively.
 `partest` (not `sbt partest`) also allows you to run a subset of the tests using wildcards:
 
diff --git a/_overviews/contribute/inclusive-language-guide.md b/_overviews/contribute/inclusive-language-guide.md
@@ -1,9 +1,6 @@
 ---
 title: Inclusive Language Guide
-layout: multipage-overview
 num: 2
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 We are committed to providing a friendly, safe and welcoming environment for
diff --git a/_overviews/contribute/index.md b/_overviews/contribute/index.md
@@ -1,9 +1,6 @@
 ---
 title: Contribute
-layout: multipage-overview
 num: 1
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 The Scala programming language is an open source project with a very
@@ -18,7 +15,7 @@ That depends on what you want to contribute. Below are some getting started reso
 
 ### Reporting bugs
 
-See our [bug reporting guide](/overviews/contribute/bug-reporting-guide.html) to learn
+See our [bug reporting guide](/contribute/bug-reporting-guide.html) to learn
 how to efficiently report a bug.
 
 ### Contribute
@@ -33,7 +30,7 @@ Coordination of contribution efforts takes place on
 When contributing, please follow:
 
 * The [Scala Code of Conduct](https://scala-lang.org/conduct/)
-* The [Inclusive Language Guide](/overviews/contribute/inclusive-language-guide.html)
+* The [Inclusive Language Guide](/contribute/inclusive-language-guide.html)
 
 ### Community Tickets
 
diff --git a/_overviews/contribute/partest-guide.md b/_overviews/contribute/partest-guide.md
@@ -1,9 +1,6 @@
 ---
 title: Running the Test Suite
-layout: multipage-overview
 num: 13
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 Partest is a custom parallel testing tool that we use to run the test suite for the Scala compiler and library. Go to the scala project folder from your local checkout and run it via `sbt`, `ant` or standalone as follows.
diff --git a/_overviews/contribute/scala-internals.md b/_overviews/contribute/scala-internals.md
@@ -1,9 +1,6 @@
 ---
 title: Scala Contributors Forum
-layout: multipage-overview
 num: 9
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 The [Scala Contributors Forum][scala-contributors] is where discussions about the Scala ecosystem
diff --git a/_overviews/contribute/scala-standard-library-api-documentation.md b/_overviews/contribute/scala-standard-library-api-documentation.md
@@ -1,9 +1,6 @@
 ---
 title: Contribute to API Documentation
-layout: multipage-overview
 num: 6
-partof: scala-contribution
-overview-name: Contributing to Scala
 ---
 
 This page is specific to API documentation contributions – that is, API
@@ -13,7 +10,7 @@ sometimes referred to as Scaladoc contributions.
 
 For contributions to tutorial and guide-style documentation on
 [docs.scala-lang.org](/),
-see [Add New Guides/Tutorials](/overviews/contribute/add-guides.html).
+see [Add New Guides/Tutorials](/contribute/add-guides.html).
 
 *Please note, these instructions cover documentation contributions Scala core
 libraries only. For other Scala projects please check those projects for the
@@ -79,7 +76,7 @@ component so that they show up in the correct issue filters.
 Please familiarize yourself with the following before contributing
 new API documentation to save time, effort, mistakes and repetition.
 
-* [Forking the Repo](/overviews/contribute/hacker-guide.html#2-set-up) - follow the setup steps through
+* [Forking the Repo](/contribute/hacker-guide.html#2-set-up) - follow the setup steps through
   the Branch section. If providing new documentation related to an existing GitHub issue, use `issue/NNNN`
   or `ticket/NNNN` as the guide states. If providing API documentation with no associated
   GitHub issue, use `scaladoc/xxxx` instead.
diff --git a/_overviews/contribute/tools.md b/_overviews/contribute/tools.md
diff --git a/contribute.md b/contribute.md
diff --git a/index.md b/index.md
