hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 44
-There are currently a lot of wiki applications available online.  By looking at
-these existing systems, we can easily extract a basic set of properties we
-expect a wiki to have. 
+There are currently a lot of wiki applications available.  By looking at these
+existing systems, we can easily extract a set of properties we expect a wiki to
+have. 
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 63
-  directory-like structure.
+  directory-like structure using references.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 66
-  insert additional media into documents like images, tables, lists, source
-  code snippets, mathematical formulas and possibly even more.
+  insert media into documents like images, tables, lists, source code snippets,
+  mathematical formulas and possibly even more.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 70
-  documents we require a simple form of version control to be available.  This
-  will help keeping track of changes and simplify cooperation and conflict
-  resolution.
+  documents we require a simple form of version control. This will help keeping
+  track of changes and simplify cooperation and conflict resolution.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 160
-  in the collection. Because most browsers do not allow end-users to directly
-  PUT documents to a server, this method requires a special front-end
-  application to be used.  When a new document is saved it will automatically
+  in the collection. Because browsers do not allow end-users to store documents
+  at the server using a HTTP PUT method directly, a special front-end
+  application must be used.  When a new document is saved it will automatically
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 164
-  be recorded in version control.  The query string for the request URI is used
-  to determine the name of the change.  All save actions will immediately be
-  reflected in the document history.
+  be stored in the version control system.  The query string for the request
+  URI is used to determine the name of the change.  All save actions will
+  immediately be reflected in the document history.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 202
-This section gives a brief explanation of the internal architecture of the
-project.  It aims to give some insight into the inner working of both the
-application server and the wiki application.
+This section briefly explains the internal architecture of the project.  It
+aims to give some insight into the inner working of both the application server
+and the wiki application.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 350
-    This is actually a combinator handler because it takes a handler and
-    returns a new handler.  This function analyses the method part of a request
-    message and checks whether this is the HTTP HEAD request. It uses the gets
-    function to read values from the state monad. When the request is a HEAD
-    request it executed the input handler as if the request was a regular GET
-    request and empties the send queue afterwards.  The return value of the
-    input handler computation is returned.  When the method is not a HEAD, this
-    function acts like the identity function.  Note how you can freely mix
-    monadic and applicative syntax for the handlers, both instances are
-    supplied.
+    This is a handler that transforms another handler.  This function analyses
+    the method part of a request message and checks whether this is the HTTP
+    HEAD request. It uses the =gets= from the state monad function to read
+    values from the state monad.  When the request is a HEAD request it
+    executes the input handler as if the request was a regular GET request and
+    empties the send queue afterwards.  The return value of the input handler
+    computation is returned.  When the method is not a HEAD, this function acts
+    like the identity function.  Note how you can freely mix monadic and
+    applicative syntax for the handlers, both instances are supplied.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 426
-    parsers and printers for this aspect only.  The maintainer of a plug-in is
-    responsible for implementing the parsers and printers for different
-    formats.  This means that is not enforced that a plug-in a parser or a
-    pretty printer of _every_ existing format.  Partial implementations are
-    allowed.
+    parsers and printers for this aspect only. 
+    
+    The maintainer of a plug-in is responsible for implementing the parsers and
+    printers for different formats.  This means that is not enforced that a
+    plug-in parser or a pretty printer of _every_ existing format.  Partial
+    implementations are allowed.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 434
-    format that possibly delivers a pretty printer for a specific format.  In
+    format that possibly delivers a pretty printer for a specific format. In
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 444
-    This is actually a simplified version of what is actually implemented in
-    the plug-in core.  In the real application the parsers can optionally
-    receive a parser context from the base (non plug-in) parser they become
-    part of.  The pretty printer can output their contents in several formats,
-    for example plain Haskell =String=s, XML nodes, binary byte-strings, etc.
-    This freedom to access parser contexts and to customize the output result
-    makes the system more flexible but somewhat more complicated.
-
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 497
-  The main wiki handler, called =hWiki=, has the following type Haskell
-  signture:
+  The main wiki handler, called =hWiki=, has the following type signture:
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 501
-    hWiki :: UserDatabase -> UserSession a -> Backend -> Handler ()
+    hWiki :: UserDatabase -> UserSession -> Backend -> Handler ()
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 518
-    altering the wiki core application.  This system is very closely tight to
+    altering the wiki core application.  This system is very closely linked to
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 542
-    are actually stored, an abstract =Backend= data type is used to modal the
+    are actually stored, an abstract =Backend= data type is used to model the
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 564
-    When implementing an back-end instance four function should be supplied.
+    When implementing an back-end instance four function must be supplied.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 569
-    Currently there is only one physical back-end implementation and one simple
+    Currently there is one physical back-end implementation and one simple
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 613
-As became clear in previous sections the system is far from finished, lots of
+As became clear in previous sections the system is far from finished; lots of
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 619
-  would be nice to have more test coverage.  Currently only very selective part
-  of the system are tested.
+  would be nice have test case for important parts of the code.  Currently only
+  very selective part of the system are tested.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 622
-- *Document collection.* Not all operation, like deletion, on the document are
-  supported in an entirely clear way.  It would also be nice to have an include
-  mechanism that allows the inclusion of external section into other documents.
+- *Document.* Not all operation, like deletion, on the document are supported
+  in an entirely clear way.  It would also be nice to have an include mechanism
+  that allows the inclusion of external sections into a document
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 627
-  can be a useful addition.  Scripting the document system this way might be a
-  lower the threshold for people to play with the system.
+  can be a useful addition.  Scripting the document system this way might lower
+  the threshold for people to play with the system.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 640
-  more abstract definitions, this can on the long term improve reusability.
+  more abstract definitions, this will improve reusability.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 656
-  interface too automatically.
+  interface automatically.
hunk ./Building\32\a\32\Wiki\32\in\32\Haskell 659
-  be decorated with more comments so the generated Haddock [#ref-haddock| (#)]
-  documentation will be become more clear.
+  be decorated with more comments to be included into the generated Haddock
+  [#ref-haddock| (#)] documentation.
