db

1 files changed, 14 insertions, 13 deletions

diff --git a/db.json b/db.json
index a8c7bb2..adc3b06 100644
--- a/db.json
+++ b/db.json
@@ -368,11 +368,11 @@
       "credit": "Imagecourtesy: A demonstration of the Queen Bee, controlled over a panel from the ground. Royal Air Force\r\n",
       "links": [
         {
-          "text": "Link text",
+          "text": "Vintage Wings",
           "uri": "http://www.vintagewings.ca/VintageNews/Stories/tabid/116/articleType/ArticleView/articleId/484/The-Mother-of-All-Drones.aspx"
         },
         {
-          "text": "Link text ",
+          "text": "Defense News",
           "uri": "http://intercepts.defensenews.com/2013/05/the-origin-of-drone-and-why-it-should-be-ok-to-use/"
         }
       ],
@@ -1092,11 +1092,11 @@
       "credit": "CIA\r\n",
       "links": [
         {
-          "text": "Link text",
-          "uri": " https://www.cia.gov/library/video-center/video-transcripts/charlie-cias-robotic-fish.html"
+          "text": "CIA",
+          "uri": "https://www.cia.gov/library/video-center/video-transcripts/charlie-cias-robotic-fish.html"
         },
         {
-          "text": "Link text",
+          "text": "SOFREP News",
           "uri": "https://sofrep.com/54444/cias-robotic-fish/"
         }
       ],
@@ -1540,7 +1540,7 @@
       "credit": "unknown\r\n",
       "links": [
         {
-          "text": "Link text ",
+          "text": "Washington Post",
           "uri": "http://www.washingtonpost.com/wp-dyn/content/article/2011/01/01/AR2011010102690.html"
         }
       ],
@@ -2157,9 +2157,9 @@
   ],
   "page": [
     {
-      "id": "terms-of-service",
-      "title": "Terms of Service",
-      "body": "The <i>Terms of Service</i> of a website is a legal document describing a relationship between a software vendor and the end user.  Typically this document is designed to indemnify the company who made the software from what you do with it.  It also describes your rights in using the software - and what rights you give up.\r\n\r\nThe website <a href=\"https://tosdr.org/\">TOS;DR</a> was created to keep track of what's hidden in the small print of these legal agreements.  For instance, on Youtube, \"Deleted videos are not really deleted.\" Facebook and Google admit to tracking your behavior, even on other websites.  Instagram and Netflix waive your right to participating in a class action lawsuit.  You cannot delete your Skype account.\r\n\r\nA website is also legally bound to describe what information it uses to track you, which it publishes on its <a href=\"/page/privacy\">Privacy Policy</a>. ",
+      "id": "credits",
+      "title": "Credits",
+      "body": "CREDITS GO HERE",
       "disabled": false,
       "__index": 2,
       "dateCreated": "Sat, 13 May 2017 19:49:53 GMT"
@@ -2167,7 +2167,7 @@
     {
       "id": "privacy-policy",
       "title": "Privacy Policy",
-      "body": "A website is required by law to publish a <i>Privacy Policy</i> if it collects <i>personally identifiable information</i> (PII) which can be used to trace an individual's identity.  This information can include your name, email address, telephone number, social security number, date of birth, mother's maiden name, etc.  The Privacy Policy should indicate what information is tracked and how it is stored.\r\n\r\nA website's Privacy Policy is intimately tied to its <a href=\"/page/terms\">Terms and Conditions</a>.  For more information on how these two documents differ, read the article, <a href=\"https://termsfeed.com/blog/privacy-policies-vs-terms-conditions/\">Privacy Policy vs Terms and Conditions</a>.",
+      "body": "The <i>Terms of Service</i> of a website is a legal document describing a relationship between a software vendor and the end user.  Typically this document is designed to indemnify the company who made the software from what you do with it.  It also describes your rights in using the software - and what rights you give up.\r\n\r\nThe website <a href=\"https://tosdr.org/\">TOS;DR</a> was created to keep track of what's hidden in the small print of these legal agreements.  For instance, on Youtube, \"Deleted videos are not really deleted.\" Facebook and Google admit to tracking your behavior, even on other websites.  Instagram and Netflix waive your right to participating in a class action lawsuit.  You cannot delete your Skype account.\r\n\r\nA website is required by law to publish a <i>Privacy Policy</i> if it collects <i>personally identifiable information</i> (PII) which can be used to trace an individual's identity.  This information can include your name, email address, telephone number, social security number, date of birth, mother's maiden name, etc.  The Privacy Policy should indicate what information is tracked and how it is stored.\r\n\r\nA website's Privacy Policy is intimately tied to its <a href=\"/page/terms\">Terms and Conditions</a>.  For more information on how these two documents differ, read the article, <a href=\"https://termsfeed.com/blog/privacy-policies-vs-terms-conditions/\">Privacy Policy vs Terms and Conditions</a>.",
       "disabled": false,
       "__index": 3,
       "dateCreated": "Sat, 13 May 2017 19:50:06 GMT"
@@ -2183,7 +2183,7 @@
     {
       "id": "history-of-surveillance",
       "title": "History of Surveillance",
-      "body": "Spying and surveillance are as old as civilization itself.  Our researchers have compiled a list of 100 milestones in the history of surveillance dating from pre-history to present day.\r\n\r\nExplore the entries by scrolling through the timeline.  Click on each entry for more information.  Entries are color coded into three categories: <blue>blue</blue> for surveillance, <red>red</red> for drones, and <green>green</green> for facial recognition software.  \r\n\r\nIf you have an entry to suggest please feel free to send it to us via the <a href=\"/contact\">Contact Us</a> page.\r\n\r\nResearchers:  \r\nBerit Gwendolyn Gilma and Hanno Hauenstein. \r\nSpecial thanks to Jacob Appelbaum who offered his expertise on the topic.",
+      "body": "The history of surveillance cannot be understood as an isolated subject; it is tightly bound to concepts of privacy and identity, and speaks volumes on the influence, limits, and evolution of technology, cryptography, warfare, and power.  Practices of surveillance also reach far back in history – from evidence of a “secret service” in ancient Egypt to Biblical stories of secrecy, envy, treason and lust. \r\n\r\nResearch into the subject of surveillance often reveals surreal, even comical cases - like those of people deploying pigeons for espionage purposes. The examples chosen here eventually leads up to the present-day omnipresence of the internet and – within this context – various examples of so-called counter-surveillance.\r\n\r\nThe following timeline collects items that refer to both historical events and technological novelties, as well as cultural and artistic responses to surveillance culture, with emphasis on three main categories: History of Surveillance, Facial Recognition Technology, and Military Drones.\r\n\r\nThis attempt to showcase an overview of surveillance history is regarded as an open platform – entry suggestions can be sent and considered via the <a href=\"/contact\">CONTACT US</a> icon on the homepage.",
       "disabled": false,
       "__index": 6,
       "dateCreated": "Thu, 18 May 2017 00:16:34 GMT"
@@ -2242,7 +2242,8 @@
           "uri": "https://www.defense.gov/UAS/"
         }
       ],
-      "statisticsByline": "Data collected by the Bureau of Investigative Journalism. The totals represent minimum and maximum casualty levels, based on available reports. The lower bounds tend to represent statistics provided by the US Government, though the Bureau's investigation found these to underestimate the scale of drone warfare.\r\n\r\nSince 2010, the Bureau has made an extensive study of reports of US covert activities in Afghanistan, Pakistan, Yemen and Somalia. For more detailed information on drone use in these countries, investigate the countries below:"
+      "statisticsByline": "Data collected by the Bureau of Investigative Journalism. The totals represent minimum and maximum casualty levels, based on available reports. The lower bounds tend to represent statistics provided by the US Government, though the Bureau's investigation found these to underestimate the scale of drone warfare.\r\n\r\nSince 2010, the Bureau has made an extensive study of reports of US covert activities in Afghanistan, Pakistan, Yemen and Somalia. For more detailed information on drone use in these countries, investigate the countries below:",
+      "moreInfo": "More information can be found at the following links:"
     }
   ],
   "about": [
@@ -2252,7 +2253,7 @@
       "show": "In a new commission that is both object and environment, Pritzker Prize-winning architects Jacques Herzog and Pierre de Meuron with artist/activist Ai Weiwei explore the meaning of public space in our surveillance-laden world, referencing the story of Hansel and Gretel in which the children lose their way and feel a sense of menace in a space they know and trust. The artists take advantage of the vast openness of the Drill Hall, creating a 21st century public place in which the environment is disconcerting, the entrance is unexpected, and every movement is tracked and surveyed by drones and communicated to an unknown public.\r\n\r\nThe work builds on the artists’ shared practice as designers of form and investigation (the Beijing Olympic Stadium and “quite simply the best summer Serpentine Pavilion ever” according to Time Out London) and their deep interest in the public realm whether through activism or architecture. Ai Weiwei has described their collaborations as follows: “My experience of working with Jacques and Pierre is that we never think separately. It’s like three soldiers in the war—and that’s a good feeling: we have a constant understanding.”\r\n\r\nCurated by Tom Eccles and Hans Ulrich Obrist",
       "herzogBio": "Jacques Herzog established Herzog & de Meuron with Pierre de Meuron in Basel in 1978. He studied architecture at the Swiss Federal Institute of Technology Zurich (ETHZ) from 1970 to 1975 with Aldo Rossi and Dolf Schnebli. He was a visiting tutor at Cornell University, USA in 1983. With Pierre de Meuron, he is visiting professor at Harvard University, USA (1989 and since 1994), professor at ETH Zürich since 1999, and co-founder of ETH Studio Basel - Contemporary City Institute since 2002. In 2001, he was awarded the Pritzker Architecture Prize together with Pierre de Meuron.",
       "deMeuronBio": "Pierre de Meuron established Herzog & de Meuron with Jacques Herzog in Basel in 1978. Pierre studied architecture at the Swiss Federal Institute of Technology Zurich (ETHZ) from 1970 to 1975 with Aldo Rossi and Dolf Schnebli. With Jacques Herzog, he is visiting professor at Harvard University, USA (1989 and since 1994), professor at ETH Zürich since 1999, and co-founder of ETH Studio Basel - Contemporary City Institute since 2002. In 2001, he was awarded the Pritzker Architecture Prize together with Jacques Herzog.",
-      "aiWeiWeiBio": "(coming soon)",
+      "aiWeiWeiBio": "Ai Weiwei (b. Beijing, 1957) is an artist and activist who currently resides and works in both Berlin and Beijing. From architecture to installations, social media to documentaries, Ai uses a wide range of mediums as expressions to set up new possibilities and conditions for his audience to examine society and its values. Recent exhibitions include Law of the Journey at the National Gallery in Prague, Ai Weiwei. Libero at Palazzo Strozzi in Florence, #SafePassage at Foam in Amsterdam, translocation - transformation at 21er Haus Museum of Contemporary Art in Vienna, Andy Warhol | Ai Weiwei at the National Gallery of Victoria in Melbourne, and Ai Weiwei at the Royal Academy of Arts in London.\r\n\r\nAi is the recipient of the Václav Havel Prize for Creative Dissent in 2012 and the Amnesty International Ambassador of Conscience Award in 2015.",
       "video": {
         "url": "https://www.youtube.com/watch?v=elpAKTauZUw",
         "type": "youtube",