Merge remote-tracking branch 'upstream/master' into master

* upstream/master:
  GitBook: [master] 3 pages and 32 assets modified
  Add migration to special field (#7368)
  GitBook: [master] 5 pages and 29 assets modified

CHANGELOG.md

@@ -20,6 +20,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 ### Changed
 
 - The content of the field `timestamp` is migrated to `creationdate`. In case one configured "udpate timestampe", it is migrated to `modificationdate`. [koppor#130](https://github.com/koppor/jabref/issues/130)
+- The JabRef specific meta-data content in the main field such as priorities (prio1, prio2, ...) are migrated to their respective fields. They are removed from the keywords. [#6840](https://github.com/jabref/jabref/issues/6840)
 - We fixed an issue where groups generated from authors' last names did not include all entries of the authors' [#5833](https://github.com/JabRef/jabref/issues/5833)
 - The export to MS Office XML now uses the month name for the field `MonthAcessed` instead of the two digit number [#7354](https://github.com/JabRef/jabref/issues/7354)
 

docs/SUMMARY.md

@@ -15,7 +15,7 @@
   * [Custom SVG icons](advanced-reading/custom-svg-icons.md)
   * [Working on fetchers](advanced-reading/fetchers.md)
   * [Creating a binary and debug it](advanced-reading/jpackage.md)
-* [JabRef and Software Engineering](teaching.md)
+* [JabRef and Software Engineering Training](teaching.md)
 * [Readings on Coding](readings-on-coding/README.md)
   * [Readings on JavaFX](readings-on-coding/javafx.md)
   * [Useful development tooling](readings-on-coding/tools.md)

docs/advanced-reading/fetchers.md

@@ -1,4 +1,4 @@
-# Information about Fetchers
+# Working on fetchers
 
 Fetchers are the implementation of the [search using online services](https://docs.jabref.org/collect/import-using-online-bibliographic-database). Some fetchers require API keys to get them working. To get the fetchers running in a JabRef development setup, the keys need to be placed in the respective environment variable. The following table lists the respective fetchers, where to get the key from and the environment variable where the key has to be placed.
 
@@ -16,39 +16,37 @@ On Windows, you have to log-off and log-on to let IntelliJ know about the enviro
 
 ## Fulltext Fetchers
 
-- all fulltext fetchers run in parallel
-- the result with the highest priority wins
-- `InterruptedException` | `ExecutionException` | `CancellationException` are ignored
+* all fulltext fetchers run in parallel
+* the result with the highest priority wins
+* `InterruptedException` \| `ExecutionException` \| `CancellationException` are ignored
 
 ### Trust Levels
 
-- SOURCE (highest): definitive URL for a particular paper
-- PUBLISHER: any publisher library
-- PREPRINT: any preprint library that might include non final publications of a paper
-- META_SEARCH: meta search engines
-- UNKNOWN (lowest): anything else not fitting the above categories
+* SOURCE \(highest\): definitive URL for a particular paper
+* PUBLISHER: any publisher library
+* PREPRINT: any preprint library that might include non final publications of a paper
+* META\_SEARCH: meta search engines
+* UNKNOWN \(lowest\): anything else not fitting the above categories
 
 ### Current trust levels
 
-All fetchers are contained in the package `org.jabref.logic.importer.fetcher`.
-Here we list the trust levels of some of them:
+All fetchers are contained in the package `org.jabref.logic.importer.fetcher`. Here we list the trust levels of some of them:
 
-- DOI: SOURCE, as the DOI is always forwarded to the correct publisher page for the paper
-- ScienceDirect: Publisher
-- Springer: Publisher
-- ACS: Publisher
-- IEEE: Publisher
-- Google Scholar: META_SEARCH, because it is a search engine
-- Arxiv: PREPRINT, because preprints are published there
-- OpenAccessDOI: META_SEARCH
+* DOI: SOURCE, as the DOI is always forwarded to the correct publisher page for the paper
+* ScienceDirect: Publisher
+* Springer: Publisher
+* ACS: Publisher
+* IEEE: Publisher
+* Google Scholar: META\_SEARCH, because it is a search engine
+* Arxiv: PREPRINT, because preprints are published there
+* OpenAccessDOI: META\_SEARCH
 
 Reasoning:
 
-- A DOI uniquely identifies a paper. Per definition, a DOI leads to the right paper. Everything else is good guessing.
-- We assume the DOI resolution surely points to the correct paper and that publisher fetches may have errors: For instance, a title of a paper may lead to different publications of it. One the conference version, the other the journal version. --> the PDF could be chosen randomly
+* A DOI uniquely identifies a paper. Per definition, a DOI leads to the right paper. Everything else is good guessing.
+* We assume the DOI resolution surely points to the correct paper and that publisher fetches may have errors: For instance, a title of a paper may lead to different publications of it. One the conference version, the other the journal version. --> the PDF could be chosen randomly
 
-
-Code was first introduced at [PR#3882](https://github.com/JabRef/jabref/pull/3882).
+Code was first introduced at [PR\#3882](https://github.com/JabRef/jabref/pull/3882).
 
 ## Background on embedding the keys in JabRef
 

docs/contributing.md

@@ -1,10 +1,10 @@
-# Contributing Guide
+# Contributing
 
 After reading through this guide, check out some good first issues to contribute to by clicking here: [Good First Issues](https://github.com/JabRef/jabref/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
 
 In case you are aiming to contribute other improvements, please head over to our general [JabRef contribution page](https://docs.jabref.org/faqcontributing).
 
-In case you are an instructor and want to use **JabRef as software engineering example**, please head to <https://devdocs.jabref.org/teaching>.
+In case you are an instructor and want to use **JabRef as software engineering example**, please head to [https://devdocs.jabref.org/teaching](https://devdocs.jabref.org/teaching).
 
 ## Contribute code
 
@@ -13,62 +13,53 @@ In case you are an instructor and want to use **JabRef as software engineering e
 We welcome contributions to JabRef and encourage you to follow the GitHub workflow specified below. If you are not familiar with this type of workflow, take a look at GitHub's excellent overview on the [GitHub flow](https://guides.github.com/introduction/flow/index.html) and the explanation of [Feature Branch Workflow](https://atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) for the idea behind this kind of development.
 
 1. Get the JabRef code on your local machine. Detailed instructions about this step can be found in our [guidelines for setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
-    1. Fork the JabRef into your GitHub account.
-    2. Clone your forked repository on your local machine.
-2. **Create a new branch** (such as `fix-for-issue-121`). Be sure to create a **separate branch** for each improvement you implement.
+   1. Fork the JabRef into your GitHub account.
+   2. Clone your forked repository on your local machine.
+2. **Create a new branch** \(such as `fix-for-issue-121`\). Be sure to create a **separate branch** for each improvement you implement.
 3. Do your work on the **new branch - not the master branch.** Refer to our [code howtos](https://devdocs.jabref.org/getting-into-the-code/code-howtos) if you have questions about your implementation.
 4. Create a pull request. For an overview of pull requests, take a look at GitHub's [pull request help documentation](https://help.github.com/articles/about-pull-requests/).
 5. In case your pull request is not yet complete or not yet ready for review, consider creating a [draft pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/) instead.
 
-In case you have any questions, do not hesitate to write one of our [JabRef developers](https://github.com/orgs/JabRef/teams/developers) an email.
-We should also be online at [gitter](https://gitter.im/JabRef/jabref).
+In case you have any questions, do not hesitate to write one of our [JabRef developers](https://github.com/orgs/JabRef/teams/developers) an email. We should also be online at [gitter](https://gitter.im/JabRef/jabref).
 
 ### Formal requirements for a pull request
 
 The main goal of the formal requirements is to provide credit to you and to be able to understand the patch.
 
 #### Add your change to `CHANGELOG.md`
 
-You should edit the [`CHANGELOG.md`](https://github.com/JabRef/jabref/blob/master/CHANGELOG.md#changelog) file located in the root directory of the JabRef source.
-Add a line with your changes in the appropriate section.
+You should edit the [`CHANGELOG.md`](https://github.com/JabRef/jabref/blob/master/CHANGELOG.md#changelog) file located in the root directory of the JabRef source. Add a line with your changes in the appropriate section.
 
-If you did internal refactorings or improvements not visible to the user (e.g., UI, .bib file), then you don't need to put an entry there.
+If you did internal refactorings or improvements not visible to the user \(e.g., UI, .bib file\), then you don't need to put an entry there.
 
-##### Format of keyboard shortcuts
+**Format of keyboard shortcuts**
 
 Example: `<kbd>Ctrl</kbd> + <kbd>Enter</kbd>`
 
 In case you add keys to the changelog, please follow these rules:
 
-- `<kbd>` tag for each key
-- First letter of key capitalized
-- Combined keys separated by `+`
-- Spaces before and after separator `+`
+* `<kbd>` tag for each key
+* First letter of key capitalized
+* Combined keys separated by `+`
+* Spaces before and after separator `+`
 
 #### Author credits
 
-Please, **do not add yourself at JavaDoc's `@authors`**.
-The contribution information is tracked via the version control system and shown at <https://github.com/JabRef/jabref/graphs/contributors>.
-We also link to the contributors page in our about dialog.
+Please, **do not add yourself at JavaDoc's `@authors`**. The contribution information is tracked via the version control system and shown at [https://github.com/JabRef/jabref/graphs/contributors](https://github.com/JabRef/jabref/graphs/contributors). We also link to the contributors page in our about dialog.
 
 Your contribution is considered being made under [MIT license](https://tldrlegal.com/license/mit-license).
 
 #### Write a good commit message
 
-See [good commit message] or [commit guidelines section of Pro Git].
-The first line of your commit message is automatically taken as the title for the pull-request.
-All other lines make up the body of the pull request. Add the words `fixes #xxx` to your PR to auto-close the corresponding issue.
+See [good commit message](https://github.com/joelparkerhenderson/git_commit_message) or [commit guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines). The first line of your commit message is automatically taken as the title for the pull-request. All other lines make up the body of the pull request. Add the words `fixes #xxx` to your PR to auto-close the corresponding issue.
 
 #### Test your code
 
-We know that writing test cases takes a lot of time.
-Nevertheless, we rely on our test cases to ensure that a bug fix or a feature implementation doesn't break anything.
-In case you do not have time to add a test case, we nevertheless ask you to at least run `gradlew check` to ensure that your change doesn't break anything else.
+We know that writing test cases takes a lot of time. Nevertheless, we rely on our test cases to ensure that a bug fix or a feature implementation doesn't break anything. In case you do not have time to add a test case, we nevertheless ask you to at least run `gradlew check` to ensure that your change doesn't break anything else.
 
 #### When adding a new `Localization.lang` entry
 
-Add new `Localization.lang("KEY")` to a Java file.
-The tests will fail. In the test output a snippet is generated, which must be added to the English translation file.
+Add new `Localization.lang("KEY")` to a Java file. The tests will fail. In the test output a snippet is generated, which must be added to the English translation file.
 
 Example:
 
@@ -82,30 +73,21 @@ Expected :[]
 Actual   :[Opens\ JabRef's\ Twitter\ page (src\main\java\org\jabref\gui\JabRefFrame.java LANG)]
 ```
 
-Add the above snippet to the English translation file located at `src/main/resources/l10n/JabRef_en.properties`.
-[Crowdin](https://crowdin.com/project/jabref) will automatically pick up the new string and add it to the other translations.
+Add the above snippet to the English translation file located at `src/main/resources/l10n/JabRef_en.properties`. [Crowdin](https://crowdin.com/project/jabref) will automatically pick up the new string and add it to the other translations.
 
-You can also directly run the specific test in your IDE.
-The test "LocalizationConsistencyTest" is placed under `src/test/java/net.sf.jabref.logic.l10n/LocalizationConsistencyTest.java`
-Find more information in the [JabRef developer docs](https://devdocs.jabref.org/getting-into-the-code/code-howtos#using-localization-correctly).
+You can also directly run the specific test in your IDE. The test "LocalizationConsistencyTest" is placed under `src/test/java/net.sf.jabref.logic.l10n/LocalizationConsistencyTest.java` Find more information in the [JabRef developer docs](https://devdocs.jabref.org/getting-into-the-code/code-howtos#using-localization-correctly).
 
 #### When adding a library
 
-Please try to use a version available at JCenter and add it to `build.gradle`.
-In any case, describe the library at [`external-libraries.md`](https://github.com/JabRef/jabref/blob/master/external-libraries.md#external-libraries).
-We need that information for our package maintainers (e.g., those of the [debian package](https://tracker.debian.org/pkg/jabref)).
-Also add a txt file stating the license in `libraries/`.
-It is used at `gradlew processResources` to generate the About.html files.
-You can see the result in `build\resources\main\help\en\About.html` or when clicking Help -> About.
+Please try to use a version available at JCenter and add it to `build.gradle`. In any case, describe the library at [`external-libraries.md`](https://github.com/JabRef/jabref/blob/master/external-libraries.md#external-libraries). We need that information for our package maintainers \(e.g., those of the [debian package](https://tracker.debian.org/pkg/jabref)\). Also add a txt file stating the license in `libraries/`. It is used at `gradlew processResources` to generate the About.html files. You can see the result in `build\resources\main\help\en\About.html` or when clicking Help -&gt; About.
 
 #### When making an architectural decision
 
-In case you add a library or do major code rewrites, we ask you to document your decision.
-Recommended reading: <https://adr.github.io/>.
+In case you add a library or do major code rewrites, we ask you to document your decision. Recommended reading: [https://adr.github.io/](https://adr.github.io/).
 
-We simply ask to create a new markdown file in `docs/adr` following the template presented at <https://adr.github.io/madr/>.
+We simply ask to create a new markdown file in `docs/adr` following the template presented at [https://adr.github.io/madr/](https://adr.github.io/madr/).
 
-In case you want to directly add a comment to a class, simply use following template (based on [sustainable architectural decisions](https://www.infoq.com/articles/sustainable-architectural-design-decisions)):
+In case you want to directly add a comment to a class, simply use following template \(based on [sustainable architectural decisions](https://www.infoq.com/articles/sustainable-architectural-design-decisions)\):
 
 ```text
 In the context of <use case/user story u>,
@@ -119,14 +101,9 @@ because <additional rationale>.
 
 ### Create a pull request
 
-Create a pull request on GitHub following GitHub's guide "[Creating a pull request from a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork)".
-For text inspirations, consider [How to write the perfect pull request](https://github.com/blog/1943-how-to-write-the-perfect-pull-request).
+Create a pull request on GitHub following GitHub's guide "[Creating a pull request from a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork)". For text inspirations, consider [How to write the perfect pull request](https://github.com/blog/1943-how-to-write-the-perfect-pull-request).
 
-If you want to indicate that a pull request is not yet complete **before** creating the pull request, you may consider creating a [draft pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
-Alternatively, once the PR has been created, you can add the prefix `[WIP]` (which stands for "Work in Progress") to indicate that the pull request is not yet complete, but you want to discuss something or inform about the current state of affairs.
-
-[commit guidelines section of Pro Git]: http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines
-[good commit message]: https://github.com/joelparkerhenderson/git_commit_message
+If you want to indicate that a pull request is not yet complete **before** creating the pull request, you may consider creating a [draft pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/). Alternatively, once the PR has been created, you can add the prefix `[WIP]` \(which stands for "Work in Progress"\) to indicate that the pull request is not yet complete, but you want to discuss something or inform about the current state of affairs.
 
 ## How to improve the developer's documentation
 
@@ -139,3 +116,4 @@ In case you use some gitbook special features and you want to test them, checkou
 3. `gitbook serve`
 
 Then, you can see a near-to-reality rendering of the development documentation at [http://localhost:4000](http://localhost:4000).
+