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

* upstream/master: Fix typos (#7425)
JabRef · Feb 15, 2021 · ec7b9e4 · ec7b9e4
2 parents 95a67d6 + 8a95a82
commit ec7b9e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,7 +91,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We changed connect timeouts for server requests to 30 seconds in general and 5 seconds for GROBID server (special) and improved user notifications on connection issues. [7026](https://github.com/JabRef/jabref/pull/7026)
 - We changed the order of the library tab context menu items. [#7171](https://github.com/JabRef/jabref/issues/7171)
 - We changed the way linked files are opened on Linux to use the native openFile method, compatible with confined  packages. [7037](https://github.com/JabRef/jabref/pull/7037)
-- We refined the entry preview to show the full names of authors and editors, to list the editor only if no author is present, have the year ealier. [#7083](https://github.com/JabRef/jabref/issues/7083)
+- We refined the entry preview to show the full names of authors and editors, to list the editor only if no author is present, have the year earlier. [#7083](https://github.com/JabRef/jabref/issues/7083)
 
 ### Fixed
 

diff --git a/docs/adr/0016-mutable-preferences-objects.md b/docs/adr/0016-mutable-preferences-objects.md
@@ -6,8 +6,8 @@ To create an immutable preferences object every time seems to be a waste of time
 
 ## Considered Options
 
-* Create a new object every time a preferences object should be altered by a with*-method, similar to a builder.
-* Alter the existing object and return it.
+* Alter the existing object and return it (by a `with*` -method, similar to a builder, but changing the object at hand).
+* Create a new object every time a preferences object should be altered.
 
 ## Decision Outcome
 

diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
@@ -41,7 +41,7 @@ default List<BibEntry> performSearch(String searchQuery) throws FetcherException
         try {
             return this.performSearch(parser.parse(searchQuery, NO_EXPLICIT_FIELD));
         } catch (QueryNodeParseException e) {
-            throw new FetcherException("An error occured when parsing the query");
+            throw new FetcherException("An error occurred when parsing the query");
         }
     }
 }