Small cleanups in Makefile.

CONTRIBUTING.md

@@ -210,10 +210,9 @@ With stack:
 
     stack bench
 
-You can also build pandoc with the `weigh-pandoc` flag and
+You can also build `weigh-pandoc` (`stack build pandoc:weigh-pandoc`)
-run `weigh-pandoc` to get some statistics on memory usage.
+to get some statistics on memory usage.  (Eventually this should
-(Eventually this should be incorporated into the benchmark
+be incorporated into the benchmark suite.)
-suite.)
 
 Using the REPL
 --------------

Makefile

@@ -4,10 +4,6 @@ SOURCEFILES?=$(shell find pandoc.hs src test -name '*.hs')
 BRANCH?=master
 RESOLVER?=lts-13
 GHCOPTS=-fdiagnostics-color=always
-# Later:
-# -Wpartial-fields        (currently used in Powerpoint writer)
-# -Wmissing-export-lists  (currently some Odt modules violate this)
-# -Wredundant-constraints (problematic if we want to support older base)
 WEBSITE=../../web/pandoc.org
 
 quick:

pandoc.cabal

@@ -448,6 +448,10 @@ library
                    -Wincomplete-record-updates
                    -Wnoncanonical-monad-instances
                    -Wnoncanonical-monadfail-instances
+  -- Later:
+  -- -Wpartial-fields        (currently used in Powerpoint writer)
+  -- -Wmissing-export-lists  (currently some Odt modules violate this)
+  -- -Wredundant-constraints (problematic if we want to support older base)
   if impl(ghc >= 8.2)
     ghc-options:     -Wcpp-undef
   if impl(ghc >= 8.4)