Merge branch 'patch-1' of https://github.com/dtchepak/fsharpx into patch-1

Conflicts:
	build.fsx

Author: tachyus-ryan

build.fsx

@@ -45,7 +45,7 @@ let projectDesc = "FSharpx is a library for the .NET platform implementing gener
 let rec getPackageDesc = function
 | "Http" -> projectDesc + "\r\n\r\nThis library provides common features for working with HTTP applications."
 | "Observable" -> projectDesc + "\r\n\r\nThis library implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford."
-| "Text.StructuredFormat" -> projectDesc + "\r\n\r\nThis library provides data structures and functoins for pretty printers."
+| "Text.StructuredFormat" -> projectDesc + "\r\n\r\nThis library provides data structures and functions for pretty printers."
 | _ -> projectDesc + "\r\n\r\nIt currently implements:\r\n\r\n" + 
                        "* Several standard monads: State, Reader, Writer, Either, Continuation, Distribution\r\n" +
                        "* Validation applicative functor\r\n" + 

src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs

@@ -22,7 +22,7 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59
 
 [<assembly: AssemblyDescription ("FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
 
-This library provides data structures and functoins for pretty printers.")>]
+This library provides data structures and functions for pretty printers.")>]
 
 [<assembly: AssemblyProduct ("FSharpx.Text.StructuredFormat")>]