summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSnoyman <>2016-08-28 12:04:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-08-28 12:04:00 (GMT)
commitc8a7ad991481945f3490d4b345f2485102366b96 (patch)
treefb8228888a02a08d27f46e6040fc47841acb42e8
parent451242629f1ed2cba48e3b8059967af910e5eb08 (diff)
version 2.2.0.12.2.0.1
-rw-r--r--ChangeLog.md4
-rw-r--r--Network/HTTP/Simple.hs20
-rw-r--r--http-conduit.cabal4
3 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index fa4c312..4463696 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 2.2.0.1
+
+* Doc fixes
+
## 2.2.0
* Upgrade to http-client 0.5
diff --git a/Network/HTTP/Simple.hs b/Network/HTTP/Simple.hs
index 95c723d..eb55e52 100644
--- a/Network/HTTP/Simple.hs
+++ b/Network/HTTP/Simple.hs
@@ -6,17 +6,15 @@
-- available at
-- <https://github.com/commercialhaskell/jump/blob/master/doc/http-client.md>.
--
--- Important note: 'Request' is an instance of 'IsString', and therefore
--- recommended usage is to turn on @OverloadedStrings@, e.g.
---
--- @@@
--- {-# LANGUAGE OverloadedStrings #-}
--- import Network.HTTP.Simple
--- import qualified Data.ByteString.Lazy.Char8 as L8
---
--- main :: IO ()
--- main = httpLBS "http://example.com" >>= L8.putStrLn
--- @@@
+-- Important note: 'H.Request' is an instance of 'Data.String.IsString', and
+-- therefore recommended usage is to turn on @OverloadedStrings@, e.g.
+--
+-- > {-# LANGUAGE OverloadedStrings #-}
+-- > import Network.HTTP.Simple
+-- > import qualified Data.ByteString.Lazy.Char8 as L8
+-- >
+-- > main :: IO ()
+-- > main = httpLBS "http://example.com" >>= L8.putStrLn
module Network.HTTP.Simple
( -- * Perform requests
httpLBS
diff --git a/http-conduit.cabal b/http-conduit.cabal
index 7b04dd2..445d68d 100644
--- a/http-conduit.cabal
+++ b/http-conduit.cabal
@@ -1,5 +1,5 @@
name: http-conduit
-version: 2.2.0
+version: 2.2.0.1
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
@@ -31,7 +31,7 @@ library
, http-types >= 0.7
, lifted-base >= 0.1
, http-client >= 0.5 && < 0.6
- , http-client-tls >= 0.2.4
+ , http-client-tls >= 0.3 && < 0.4
, monad-control
, mtl
, exceptions >= 0.6