Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #16 from wilkie/patch-1

Update posts/2012-08-13-protological-control--an-introduction.md
  • Loading branch information...
commit d781b5757dd7ed014bc51dd6b7a19cb5a0293efc 2 parents 96ad2ff + 1e62695
Steve Klabnik authored August 14, 2012
9  posts/2012-08-13-protological-control--an-introduction.md
Source Rendered
@@ -148,10 +148,11 @@ in this new society. That mechanism is called "discipline." Discipline
148 148
 the great advances of Taylorism, for example, was studying how the bodies of
149 149
 assembly line workers operated and streamlining their motions.
150 150
 
151  
-Foucault also introduces the idea of the 'Panopticon,' which is a prison in
152  
-a circular shape by which the rooms can all observe each other. The observation
153  
-would help to keep them all in line, since the all-seeing tower in the middle
154  
-would be able to observe everyone at all times.
  151
+Foucault also illustrates that control and power in modern society mirror
  152
+Jeremy Bentham's concept of the 'Panopticon,' which is a prison in a circular
  153
+shape by which the rooms can all observe each other. The observation would help
  154
+to keep them all in line, since the all-seeing tower in the middle would be able
  155
+to observe everyone at all times.
155 156
 
156 157
 ![panopticon](http://upload.wikimedia.org/wikipedia/commons/thumb/1/11/Panopticon.jpg/250px-Panopticon.jpg)
157 158
 

0 notes on commit d781b57

Please sign in to comment.
Something went wrong with that request. Please try again.