Changeset 131

Timestamp:

07/16/05 21:21:54 (3 years ago)

Author:

adrian

Message:

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

Files:

• django/trunk/docs/faq.txt (modified) (3 diffs)

django/trunk/docs/faq.txt

@@ -64 +64 @@
-    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
-
+ 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`_
@@ -79 +79 @@
-    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 lives in Lawrence, Kansas.
-
-`Wilson Miner`_
@@ -85 +85 @@
-    into apartment complex swimming pools  he is the Commercial Development
-    Director for World Online, which means he makes the money that pays all our
-
+ He lives in Lawrence, Kansas.
-
-.. _`World Online`: http://code.djangoproject.com/wiki/WorldOnline