Skip to content
Browse files

Changed mentions of HAppS to Happstack.

  • Loading branch information...
1 parent a4f6d18 commit fd9eed57f0dd9a0b989428fd3ed9b8bf75e2a33c @jgm committed
Showing with 7 additions and 11 deletions.
  1. +4 −4 Gitit/Server.hs
  2. +2 −6 README.markdown
  3. +1 −1 gitit.cabal
View
8 Gitit/Server.hs
@@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
-{- Re-exports HAppS functions needed by gitit, including
- replacements for HAppS functions that don't handle UTF-8 properly, and
+{- Re-exports Happstack functions needed by gitit, including
+ replacements for Happstack functions that don't handle UTF-8 properly, and
new functions for setting headers and zipping contents and for looking up IP
addresses.
-}
@@ -34,7 +34,7 @@ module Gitit.Server
, setFilename
, lookupIPAddr
, readMimeTypesFile
- -- re-exported HAppS functions
+ -- re-exported Happstack functions
, ok
, toResponse
, Response(..)
@@ -80,7 +80,7 @@ import qualified Data.Map as M
-- Contents of an HTML text area or text field generated by Text.XHtml
-- will often contain decimal character references. We want to convert these
-- to regular unicode characters. We also need to use toString to
--- convert from UTF-8, since HAppS doesn't do this.
+-- convert from UTF-8, since Happstack doesn't do this.
look :: String -> RqData String
look = liftM (decodeCharacterReferences . toString) . lookBS
View
8 README.markdown
@@ -1,7 +1,7 @@
Gitit
=====
-Gitit is a wiki program written in Haskell. It uses [HAppS][] for the
+Gitit is a wiki program written in Haskell. It uses [Happstack][] for the
web server and [pandoc][] for markup processing. Pages and uploaded
files are stored in a [git][] or [darcs][] repository and may be modified either
by using the VCS's command-line tools or through the wiki's web interface.
@@ -14,7 +14,7 @@ MediaWiki markup. Gitit can be configured to display TeX math (using
[git]: http://git.or.cz
[darcs]: http://darcs.net
[pandoc]: http://johnmacfarlane.net/pandoc
-[HAppS]: http://happs.org
+[Happstack]: http://happstack.com
[jsMath]: http://www.math.union.edu/~dpvc/jsMath/
[highlighting-kate]: http://johnmacfarlane.net/highlighting-kate/
@@ -63,10 +63,6 @@ If that doesn't work, check to see that `gitit` is in your local
cabal-install executable directory (usually `~/.cabal/bin`). And make
sure `~/.cabal/bin` is in your system path.
-Note: the build process is configured to use happstack by default.
-If you want to use the old HAppS packages instead, use the flag
-`-f-happstack`.
-
Optional plugins support
------------------------
View
2 gitit.cabal
@@ -2,7 +2,7 @@ name: gitit
version: 0.6
Cabal-version: >= 1.2
build-type: Simple
-synopsis: Wiki using HAppS, git or darcs, and pandoc.
+synopsis: Wiki using Happstack, git or darcs, and pandoc.
description: Gitit is a wiki program. Pages and uploaded files
are stored in a git or darcs repository and may be modified
either by using the VCS's command-line tools or through

0 comments on commit fd9eed5

Please sign in to comment.
Something went wrong with that request. Please try again.