From b8db21195cd835020a4d0d7814193743cfbad35e Mon Sep 17 00:00:00 2001
From: Nathan Totten <nathan@ntotten.com>
Date: Thu, 9 Apr 2020 15:40:48 -0400
Subject: [PATCH] readme and changelog

---
 CHANGELOG.md | 4 ++++
 README.md    | 2 ++
 package.json | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17df15562..45f4a98e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to the "prettier-vscode" extension will be documented in thi
 
 <!-- Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. -->
 
+## [4.2.0]
+
+- Use default configuration based on the version of prettier
+
 ## [4.1.1]
 
 - Updated prettier to 2.0.4
diff --git a/README.md b/README.md
index 0b511657b..40aad3e8b 100644
--- a/README.md
+++ b/README.md
@@ -188,6 +188,8 @@ This extension will automatically detect when you have these extensions installe
 
 All prettier options can be configured directly in this extension. These settings are used as a fallback when no configuration file is present in your project, see the [configuration](#configuration) section of this document for more details. For reference on the options see the [prettier documentation](https://prettier.io/docs/en/options.html).
 
+> The default values of these configurations are set to their Prettier 2.0 defaults. However, if this extension detects you have a version of prettier less than 2.0 installed, it will use the prettier 1.x default config values.
+
 ```
 prettier.arrowParens
 prettier.bracketSpacing
diff --git a/package.json b/package.json
index 6a07cdcb7..5a4b42d96 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "prettier-vscode",
   "displayName": "Prettier - Code formatter",
   "description": "Code formatter using prettier",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "publisher": "esbenp",
   "author": "Prettier <@prettiercode>",
   "galleryBanner": {