haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yesodweb/yesod

Browse Source
This commit is contained in:
Michael Snoyman 2013-06-24 13:53:06 +03:00
commit a9a8cd3286
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-core/Yesod/Core/Class/Yesod.hs
View File

@ -266,7 +266,7 @@ class RenderRoute site => Yesod site where
-- Default: the 'defaultYesodMiddleware' function.
--
-- Since: 1.1.6
yesodMiddleware :: HandlerT site IO res -> HandlerT site IO res
yesodMiddleware :: ToTypedContent res => HandlerT site IO res -> HandlerT site IO res
yesodMiddleware = defaultYesodMiddleware
-- | Default implementation of 'yesodMiddleware'. Adds the response header

2
yesod/Yesod/Default/Config.hs
View File

@ -214,7 +214,7 @@ loadConfig (ConfigSettings env parseExtra getFile getObject) = do
Nothing -> fail $ "Not found: " ++ show k
-- | Loads the configuration block in the passed file named by the
-- passed environment, yeilds to the passed function as a mapping.
-- passed environment, yields to the passed function as a mapping.
--
-- Errors in the case of a bad load or if your function returns
-- @Nothing@.