Changed FAQ 'Who's behind this' to give our locations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@131 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/faq.txt

@@ -63,28 +63,28 @@ Lawrence, Kansas, USA.
     Chicagoan. He's also a pretty decent programmer, with a knack for whipping
     data into shape and putting it to work for the good of his fellow man.
     Adrian is the lead developer at World Online and the man behind the code at
-    `chicagocrime.org`_.
+    `chicagocrime.org`_. He lives in Chicago.
 
 `Simon Willison`_
     Simon is a well-respected Web developer from England. He had a one-year
-    stint at World Online, during which time he and Adrian developed Django from
-    scratch. He's enthusiastic, he's passionate about best practices in Web
-    development, and he really likes squirrels. Probably to a fault. He went
-    back to England to finish his degree and is poised to continue doing big,
-    exciting things on the Web. Read his weblog at `simon.incutio.com`_.
+    internship at World Online, during which time he and Adrian developed
+    Django from scratch. He's enthusiastic, he's passionate about best
+    practices in Web development, and he really likes squirrels. Probably to a
+    fault. He went back to university to finish his degree and is poised to
+    continue doing big, exciting things on the Web. He lives in England.
 
 `Jacob Kaplan-Moss`_
     Jacob is a whipper-snapper from California who spends equal time coding and
     cooking. He does Web development for World Online and actively hacks on
     various cool side projects. He's contributed to the Python-ObjC bindings and
     was the first guy to figure out how to write Tivo apps in Python. Lately
-    he's been messing with Python on the PSP.
+    he's been messing with Python on the PSP. He lives in Lawrence, Kansas.
 
 `Wilson Miner`_
     Wilson's design-fu makes us all look like rock stars. When not sneaking
     into apartment complex swimming pools  he is the Commercial Development
     Director for World Online, which means he makes the money that pays all our
-    paychecks.
+    paychecks. He lives in Lawrence, Kansas.
 
 .. _`World Online`: http://code.djangoproject.com/wiki/WorldOnline
 .. _`Adrian Holovaty`: http://www.holovaty.com/