X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=_learning_haskell.mdwn;h=ac4e4a97aca61b7b6e600db805c0dd8e5a16e9c6;hp=1b5d9dc91b57f8f426d4ef7fe61480331612044c;hb=5def21a04555a876bd1a26adadb94eebfc3f830a;hpb=ee463a6a599fd0d6c941de386ee971b863a9df9c

diff --git a/_learning_haskell.mdwn b/_learning_haskell.mdwn
index 1b5d9dc9..ac4e4a97 100644
--- a/_learning_haskell.mdwn
+++ b/_learning_haskell.mdwn
@@ -1,20 +1,21 @@
-*   [[Installing Haskell|/installing#haskell]]
 *   [Try Haskell in your browser](http://tryhaskell.org) (slow, bare-bones)
+*   [[Installing Haskell|/installing#haskell]]
 
 <!-- -->
-*   Wikipedia on [Haskell](https://en.wikipedia.org/wiki/Haskell_%28programming_language%29)
-*   Wikipedia on [GHC](https://en.wikipedia.org/wiki/Glasgow_Haskell_Compiler)
-*   Haskell wiki's [Introduction and explanation of Haskell](https://wiki.haskell.org/Introduction)
+*   Wikipedia on
+[Haskell](https://en.wikipedia.org/wiki/Haskell_%28programming_language%29) |
+[GHC](https://en.wikipedia.org/wiki/Glasgow_Haskell_Compiler)
+*   Haskell Wiki's [Introduction and explanation of Haskell](https://wiki.haskell.org/Introduction)
 
 <!-- -->
-*   [Learning Haskell](https://wiki.haskell.org/Learning_Haskell)
+<!-- [Haskell Wiki's Getting Started](https://wiki.haskell.org/Haskell_in_5_steps) -->
 *   [Learn Haskell in 10 minutes](https://wiki.haskell.org/Learn_Haskell_in_10_minutes)
 *   [Meta-tutorial](https://wiki.haskell.org/Meta-tutorial)
-*   [Haskell wiki's Getting Started](https://wiki.haskell.org/Haskell_in_5_steps)
+*   [Learning Haskell](https://wiki.haskell.org/Learning_Haskell)
 
 <!-- -->
-*   [Tutorials](https://wiki.haskell.org/Tutorials)
 *   [Books and Tutorials](https://wiki.haskell.org/Books_and_tutorials)
+*   [Tutorials](https://wiki.haskell.org/Tutorials)
 *   [Books](https://wiki.haskell.org/Books)
 *   [A Gentle Introduction to Haskell](https://www.haskell.org/tutorial) (from 2000)
 *   [Learn You a Haskell for Great Good](http://learnyouahaskell.com)
@@ -24,24 +25,33 @@
 *   [What I Wish I Knew When Learning Haskell](http;//dev.stephendiehl.com/hask)
 
 <!-- -->
-*   [Haskell Wiki](https://wiki.haskell.org)
+*   [Haskell Wiki](https://wiki.haskell.org), with a link to download the [Haskell Platform](https://www.haskell.org/platform/contents.html)
 *   [New Haskell Wiki](https://new-www.haskell.org)
-*   [Haskell Platform](https://www.haskell.org/platform)
 
 <!-- -->
-*   User manual for [GHC latest](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide) |
-[GHC in Haskell Platform](https://www.haskell.org/platform/doc/2014.2.0.0/ghc/users_guide)
-*   Libraries for [GHC latest](https://downloads.haskell.org/~ghc/latest/docs/html/libraries) |
-[Haskell Platform](https://www.haskell.org/platform/doc/2014.2.0.0/platform/doc)
-*   GHC [releases](https://www.haskell.org/ghc) and [other docs](https://wiki.haskell.org/GHC)
+*   User manual from
+[GHC in Haskell Platform](https://www.haskell.org/platform/doc/2014.2.0.0/ghc/users_guide) | 
+[latest](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide)
+*   Libraries from [Haskell Platform](https://www.haskell.org/platform/doc/2014.2.0.0/platform/doc) |
+[Haskell 2010](https://www.haskell.org/onlinereport/haskell2010/haskellpa2.html) <!--
+[GHC latest bootstrap libraries](https://downloads.haskell.org/~ghc/latest/docs/html/libraries)
+-->
+*   GHC [releases](https://www.haskell.org/ghc) and [other docs](https://wiki.haskell.org/GHC),
+including [GHCi](https://wiki.haskell.org/GHC/GHCi) and
+[GHC FAQ](https://wiki.haskell.org/GHC/FAQ)
 *   Formal language specs:
 [Haskell 98](https://www.haskell.org/onlinereport) |
 [Haskell 2010](https://www.haskell.org/onlinereport/haskell2010) |
 [Haskell'](https://ghc.haskell.org/trac/haskell-prime)
-*   [Cabal](https://www.haskell.org/cabal), [user guide](https://www.haskell.org/cabal/users-guide)
-*   [Hackage](https://hackage.haskell.org) Package Index
+*   [Cabal](https://www.haskell.org/cabal) or [Cabal](https://wiki.haskell.org/Cabal):
+[user guide](https://www.haskell.org/cabal/users-guide) |
+[Cabal-Install](https://wiki.haskell.org/Cabal-Install) |
+[cabal-setup](https://hackage.haskell.org/package/cabal-setup)
+*   [Hackage](https://hackage.haskell.org) Package Database
 *   Haskell API Search: [Hoogle](https://www.haskell.org/hoogle) | [Hayoo](http://hayoo.fh-wedel.de)
-*   [Haddock](https://www.haskell.org/platform/doc/2014.2.0.0/ghc/haddock/index.html)
+*   [Haddock](https://www.haskell.org/haddock):
+[User Guide from Haskell Platform](https://www.haskell.org/platform/doc/2014.2.0.0/ghc/haddock/index.html) |
+[latest](https://www.haskell.org/haddoc/doc/html)
 
 <!-- -->
 *   [GHC Developer Wiki](https://ghc.haskell.org/trac/ghc)