From 5945845420c019db81e8c09f0ce174a7eeebcdd8 Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.co>
Date: Thu, 18 Jun 2020 22:20:12 +0200
Subject: [PATCH] v2.2.0

---
 CHANGELOG.rst      | 4 ++--
 README.rst         | 6 ++++++
 httpie/__init__.py | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 64ad44e5..e5b828cd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,7 +6,7 @@ This document records all notable changes to `HTTPie <https://httpie.org>`_.
 This project adheres to `Semantic Versioning <https://semver.org/>`_.
 
 
-`2.2.0-dev`_ (unreleased)
+`2.2.0`_ (2020-06-18)
 -------------------------
 
 * Added support for custom content types for uploaded files (`#668`_).
@@ -436,7 +436,7 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
 .. _1.0.3: https://github.com/jakubroztocil/httpie/compare/1.0.2...1.0.3
 .. _2.0.0: https://github.com/jakubroztocil/httpie/compare/1.0.3...2.0.0
 .. _2.1.0: https://github.com/jakubroztocil/httpie/compare/2.0.0...2.1.0
-.. _2.2.0-dev: https://github.com/jakubroztocil/httpie/compare/2.1.0...master
+.. _2.2.0: https://github.com/jakubroztocil/httpie/compare/2.1.0...2.2.0
 
 
 .. _#128: https://github.com/jakubroztocil/httpie/issues/128
diff --git a/README.rst b/README.rst
index 99e5fdf3..fdc7f4ef 100644
--- a/README.rst
+++ b/README.rst
@@ -1404,6 +1404,8 @@ One of these options can be used to control output processing:
 
 
 You can control the applied formatting via the ``--format-options`` option.
+The following options are available:
+
 For example, this is how you would disable the default header and JSON key
 sorting, and specify a custom JSON indent size:
 
@@ -1415,6 +1417,10 @@ sorting, and specify a custom JSON indent size:
 This is something you will typically store as one of the default options in your
 `config`_ file. See ``http --help`` for all the available formatting options.
 
+There are also two shortcuts that allow you to quickly disable and re-enable
+sorting-related format options (currently it means JSON keys and headers):
+``--unsorted`` and ``--sorted``.
+
 
 Binary data
 -----------
diff --git a/httpie/__init__.py b/httpie/__init__.py
index 4b684929..1e8da56a 100644
--- a/httpie/__init__.py
+++ b/httpie/__init__.py
@@ -3,6 +3,6 @@ HTTPie - a CLI, cURL-like tool for humans.
 
 """
 
-__version__ = '2.2.0-dev'
+__version__ = '2.2.0'
 __author__ = 'Jakub Roztocil'
 __licence__ = 'BSD'