X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FConfiguration.hs;h=042cddbe0a5f137d9ac8eb8f207e31f76da58142;hb=60aea8c7765bf2382b1d24d039f3951e00434e3c;hp=10e01bcb01c37e62fd9e54edaf6907cef896363d;hpb=ae4540dc27f564fe14b8a3d0118e183f3c75d715;p=dead%2Fhtsn.git diff --git a/src/Configuration.hs b/src/Configuration.hs index 10e01bc..042cddb 100644 --- a/src/Configuration.hs +++ b/src/Configuration.hs @@ -13,7 +13,7 @@ import System.Log ( Priority( INFO ) ) import qualified OptionalConfiguration as OC ( OptionalConfiguration(..), merge_maybes ) -import TSN.FeedHosts (FeedHosts(..)) +import FeedHosts (FeedHosts(..)) -- | The main configuration data type. This will be passed to most of -- the important functions once it has been created. @@ -49,9 +49,9 @@ instance Default Configuration where username = 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 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