Differences

This shows you the differences between two versions of the page.

--- translucent_futures [2008-07-10 16:00] – 81.188.78.24
+++ translucent_futures [2008-07-11 10:08] – 81.188.78.24
@@ Line 2: / Line 2: @@
 ===== I. RESEARCH TOPICS =====
 ==== 1. IDEOLOGIES & DOCTRINES ===
-=== Anarchism ===
+  * Anarchism
-=== Libertarianism ===
+  * Civil rights
-=== Liberalism ===
+  * Liberalism
-=== Open society ===
+  * Libertarianism
-=== Police state ===
+  * Open society
-=== Totalitarianism ===
+  * Panopticon
-=== Shock doctrine ===
+  * Police state
-=== Civil rights ===
+  * Privacy
-=== Privacy ===
+  * Secrecy
-=== Panopticon ===
+  * Shock doctrine
-=== Transparancy & accountability ===
+  * Totalitarianism
-=== Secrecy ===
+  * Transparancy & accountability
 ==== 2. PROGRAMS & PRACTICES ====
-=== Total Information Awareness ===
-=== Security privatization ===
-=== Insurance policies ===
 === Employee surveillance ===
+=== Insurance policies ===
 === Pay/get paid to give up privacy ===
+=== Security privatization ===
 === Target marketing ===
+=== Total Information Awareness ===
 ==== 3. TECHNOLOGIES ====
 === Audiovisual surveillance ===
@@ Line 42: / Line 42: @@
 ==== 6. CULTURAL REPRESENTATIONS ====
 ==== 7. SOCIOLOGY & PSYCHOLOGY ====
-\\
-\\
 ===== II. Resources =====
 ===== III. Network =====
+===== IV. Meeting reports =====
+\\
+\\
 --------------------------------------------------