[commit: ghc] ghc-8.2: users-guide: Move :shortdesc:s to mkUserGuidePart (ed9e62f)

[git at git.haskell.org]

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

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed9e62f2da9b077975158d542ac4fbac68660ef1/ghc

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

commit ed9e62f2da9b077975158d542ac4fbac68660ef1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 20 09:31:44 2017 -0500

    users-guide: Move :shortdesc:s to mkUserGuidePart


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

ed9e62f2da9b077975158d542ac4fbac68660ef1
 docs/users_guide/ghci.rst                  |  2 --
 docs/users_guide/phases.rst                |  2 --
 utils/mkUserGuidePart/Options/Linking.hs   | 10 ++++++++++
 utils/mkUserGuidePart/Options/Verbosity.hs |  4 ++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/users_guide/ghci.rst b/docs/users_guide/ghci.rst
index 3bdc863..df6996e 100644
--- a/docs/users_guide/ghci.rst
+++ b/docs/users_guide/ghci.rst
@@ -139,8 +139,6 @@ them all in dependency order.
    ``C:\Documents and Settings\user name``.
 
 .. ghc-flag:: -fshow-loaded-modules
-    :shortdesc: Show the names of modules that GHCi loaded after a
-                :ghci-cmd:`:load` command.
     :type: dynamic
     :default: off
 
diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst
index d9a59ab..afb3a8b 100644
--- a/docs/users_guide/phases.rst
+++ b/docs/users_guide/phases.rst
@@ -459,7 +459,6 @@ Options affecting code generation
     no-op on that platform.
 
 .. ghc-flag:: -fPIE
-    :shortdesc: Generate code for a position-independent executable (where available)
     :type: dynamic
     :category: codegen
 
@@ -889,7 +888,6 @@ for example).
     want ``-rdynamic``.
 
 .. ghc-flag:: -pie
-    :shortdesc: Instruct the linker to produce a position-independent executable.
     :type: dynamic
     :category: linking
 
diff --git a/utils/mkUserGuidePart/Options/Linking.hs b/utils/mkUserGuidePart/Options/Linking.hs
index c2ff1bd..23e32fa 100644
--- a/utils/mkUserGuidePart/Options/Linking.hs
+++ b/utils/mkUserGuidePart/Options/Linking.hs
@@ -21,6 +21,16 @@ linkingOptions =
            "Generate position-independent code (where available)"
          , flagType = DynamicFlag
          }
+  , flag { flagName = "-fPIE"
+         , flagDescription =
+           "Generate code for a position-independent executable (where available)"
+         , flagType = DynamicFlag
+         }
+  , flag { flagName = "-pie"
+         , flagDescription =
+           "Instruct the linker to produce a position-independent executable."
+         , flagType = DynamicFlag
+         }
   , flag { flagName = "-dynload"
          , flagDescription =
            "Selects one of a number of modes for finding shared libraries at runtime."
diff --git a/utils/mkUserGuidePart/Options/Verbosity.hs b/utils/mkUserGuidePart/Options/Verbosity.hs
index aa60876..1e31199 100644
--- a/utils/mkUserGuidePart/Options/Verbosity.hs
+++ b/utils/mkUserGuidePart/Options/Verbosity.hs
@@ -85,4 +85,8 @@ verbosityOptions =
          , flagDescription = "Show constraints when reporting typed holes"
          , flagType = DynamicFlag
          }
+  , flag { flagName = "-fshow-loaded-modules"
+         , flagDescription = "Show the names of modules that GHCi loaded after a :ghci-cmd:`:load` command."
+         , flagType = DynamicFlag
+         }
   ]