From: Jim Pryor <profjim@jimpryor.net>
Date: Tue, 22 Feb 2011 15:32:46 +0000 (-0500)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=eb911b5d944e52796284fc88109e8e171f7bd81d;hp=b8c76ddeb4d0dfe6a165b7cf9f2e3597ac71f8fa

Merge branch 'pryor'
---

diff --git a/index.mdwn b/index.mdwn
index 40c9d473..eb46063b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -244,6 +244,10 @@ other.
 
 [[Translating between OCaml Scheme and Haskell]]
 
+## What is Functional Programming? ##
+
+Here's a [survey conducted at Microsoft](http://research.microsoft.com/apps/pubs/default.aspx?id=141506) asking programmers what they understand "functional programming" to be. Don't take their responses to be authoritative... this is a just a "man in the street" (seat?) poll.
+
 
 ## Recommended Books ##