[commit: haddock] alexbiehl-patch-1, ghc-8.0, ghc-head, ghc-head1, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, travis, v2.17, v2.18, wip/new-tree-one-param, wip/rae, wip/remove-frames, wip/remove-frames1, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13: Merge pull request #538 from massysett/master (a9a520e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: alexbiehl-patch-1,ghc-8.0,ghc-head,ghc-head1,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.18,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/a9a520ecca8290f5cb20092618c5ea7a69ed6aa5

>---------------------------------------------------------------

commit a9a520ecca8290f5cb20092618c5ea7a69ed6aa5
Merge: 08aa479 d1dc783
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Mon Aug 29 20:47:45 2016 +0100

    Merge pull request #538 from massysett/master
    
    Add $ as a special character



>---------------------------------------------------------------

a9a520ecca8290f5cb20092618c5ea7a69ed6aa5
 doc/markup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)