X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FConfiguration.hs;h=7b237c5f1d0d350de28b8d00bc711fabcc78ee2c;hb=a2c2a1a6865be7b4cd17fb72de635bb9385728b9;hp=a382a9d77244504386a6e2025b8b078db98b7b5b;hpb=d4d924b26e451aec9ad84b6d9d376ba2aeab3422;p=dead%2Fhtsn.git

diff --git a/src/Configuration.hs b/src/Configuration.hs
index a382a9d..7b237c5 100644
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -1,7 +1,7 @@
 -- | This module defines the 'Configuration' type, which is just a
 --   wrapper around all of the configuration options we accept on the
---   command line. We thread this throughout the rest of the program.
-
+--   command line.
+--
 module Configuration (
   Configuration(..),
   merge_optional )
@@ -9,8 +9,8 @@ where
 
 import System.Console.CmdArgs.Default (Default(..))
 
-import FeedHosts (FeedHosts(..))
 import qualified OptionalConfiguration as OC (OptionalConfiguration(..))
+import TSN.FeedHosts (FeedHosts(..))
 
 data Configuration =
   Configuration {
@@ -25,6 +25,10 @@ data Configuration =
 instance Default Configuration where
   def = Configuration def def "." def
 
+
+-- | Merge a Configuration with an OptionalConfiguration. This is more
+--   or less the Monoid instance for OptionalConfiguration, but since
+--   the two types are different, we have to repeat ourselves.
 merge_optional :: Configuration
                -> OC.OptionalConfiguration
                -> Configuration