aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md5
-rw-r--r--all.opml55
-rw-r--r--analysis.opml7
-rw-r--r--brasil.opml4
-rw-r--r--brasil/analysis.opml2
-rw-r--r--brasil/foss.opml2
-rw-r--r--brasil/hacker.opml2
-rw-r--r--brasil/internet.opml2
-rw-r--r--brasil/investigative.opml13
-rw-r--r--brasil/jobs.opml2
-rw-r--r--brasil/left.opml2
-rw-r--r--brasil/movements.opml3
-rw-r--r--brasil/news.opml2
-rw-r--r--brasil/ngo.opml2
-rw-r--r--brasil/saopaulo/culture.opml2
-rw-r--r--brasil/saopaulo/news.opml2
-rw-r--r--brasil/saopaulo/weather.opml2
-rw-r--r--brasil/science.opml2
-rw-r--r--brasil/surveillance.opml2
-rw-r--r--brasil/tech.opml2
-rw-r--r--bsd.opml2
-rw-r--r--coins.opml2
-rw-r--r--comics.opml2
-rwxr-xr-xcompile41
-rw-r--r--data.opml12
-rw-r--r--development.opml2
-rw-r--r--drupal.opml2
-rw-r--r--essential.opml2
-rw-r--r--foss.opml2
-rw-r--r--geek.opml2
-rw-r--r--hacker.opml2
-rw-r--r--hardware.opml2
-rw-r--r--humanitarian.opml2
-rw-r--r--illuminati.opml4
-rw-r--r--incoming.opml3
-rw-r--r--internet.opml2
-rw-r--r--investigative.opml7
-rw-r--r--left.opml2
-rw-r--r--literature.opml2
-rw-r--r--misc.opml2
-rw-r--r--movements.opml2
-rw-r--r--news.opml6
-rw-r--r--sample.opml2
-rw-r--r--science.opml2
-rw-r--r--security.opml5
-rw-r--r--software.opml2
-rw-r--r--space.opml2
-rw-r--r--surveillance.opml2
-rw-r--r--tech.opml2
-rw-r--r--telecom.opml2
50 files changed, 185 insertions, 54 deletions
diff --git a/README.md b/README.md
index 532c699..cef933f 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,11 @@ the canonical URL:
Copy `sample.opml` to a new file and edit to include your own set of feeds!
+## Development
+
+Use the [compile](compile) script to build an OPML including all other
+OPML files.
+
## References
* For the OPML spec, check http://dev.opml.org
diff --git a/all.opml b/all.opml
new file mode 100644
index 0000000..63eeb99
--- /dev/null
+++ b/all.opml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<opml version="2.0">
+ <head>
+ <title>All Feeds</title>
+ </head>
+ <body>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/essential.opml" text="/essential"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/brasil.opml" text="/brasil"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/analysis.opml" text="/analysis"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/hardware.opml" text="/hardware"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/software.opml" text="/software"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/telecom.opml" text="/telecom"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/hacker.opml" text="/hacker"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/incoming.opml" text="/incoming"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/space.opml" text="/space"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/comics.opml" text="/comics"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/investigative.opml" text="/investigative"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilngo.opml" text="/brasil/ngo"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasil/saopauloweather.opml" text="/brasil/saopaulo/weather"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasil/saopauloculture.opml" text="/brasil/saopaulo/culture"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasil/saopaulonews.opml" text="/brasil/saopaulo/news"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilanalysis.opml" text="/brasil/analysis"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilhacker.opml" text="/brasil/hacker"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilinvestigative.opml" text="/brasil/investigative"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilinternet.opml" text="/brasil/internet"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilleft.opml" text="/brasil/left"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasiljobs.opml" text="/brasil/jobs"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasiltech.opml" text="/brasil/tech"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilfoss.opml" text="/brasil/foss"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilsurveillance.opml" text="/brasil/surveillance"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilscience.opml" text="/brasil/science"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilnews.opml" text="/brasil/news"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain//brasilmovements.opml" text="/brasil/movements"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/internet.opml" text="/internet"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/misc.opml" text="/misc"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/coins.opml" text="/coins"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/bsd.opml" text="/bsd"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/illuminati.opml" text="/illuminati"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/data.opml" text="/data"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/sample.opml" text="/sample"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/left.opml" text="/left"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/drupal.opml" text="/drupal"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/security.opml" text="/security"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/tech.opml" text="/tech"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/development.opml" text="/development"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/geek.opml" text="/geek"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/foss.opml" text="/foss"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/literature.opml" text="/literature"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/surveillance.opml" text="/surveillance"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/science.opml" text="/science"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/news.opml" text="/news"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/movements.opml" text="/movements"/>
+ <outline type="link" url="https://git.fluxo.info/feeds/plain/humanitarian.opml" text="/humanitarian"/>
+ </body>
+</opml>
diff --git a/analysis.opml b/analysis.opml
index cc746ba..fe3f730 100644
--- a/analysis.opml
+++ b/analysis.opml
@@ -1,11 +1,13 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Analysis</title>
</head>
<body>
<outline title="Analysis">
- <!--<outline type="rss" xmlUrl="http://neteffect.foreignpolicy.com/node/feed" htmlUrl="" title=""/>-->
+ <!-- https://theconversation.com/europe/feeds -->
+ <outline type="rss" xmlUrl="https://theconversation.com/articles.atom?language=en" htmlUrl="https://theconversation.com/articles.atom" title="The Conversation"/>
+
<outline type="rss" xmlUrl="http://feeds.feedburner.com/ip-watch?format=xml" htmlUrl="" title="IP Watch"/>
<outline type="rss" xmlUrl="https://www.blogger.com/feeds/7341321881472037483/posts/default" htmlUrl="http://redecastorphoto.blogspot.com/" title="redecastorphoto"/>
<outline type="rss" xmlUrl="http://www.democracynow.org/democracynow.rss" htmlUrl="" title="Democracy Now"/>
@@ -19,6 +21,7 @@
<outline type="rss" xmlUrl="https://www.mintpressnews.com/feed/" htmlUrl="https://www.mintpressnews.com/" title="MintPress News"/>
<outline type="rss" xmlUrl="https://truthout.org/latest/feed/" htmlUrl="https://truthout.org" title="Truthout"/>
<outline type="rss" xmlUrl="https://nevermore.media/feed" htmlUrl="https://nevermore.media" title="Nevermore!"/>
+ <!--<outline type="rss" xmlUrl="http://neteffect.foreignpolicy.com/node/feed" htmlUrl="" title=""/>-->
</outline>
</body>
</opml>
diff --git a/brasil.opml b/brasil.opml
index 5a9495d..6428be7 100644
--- a/brasil.opml
+++ b/brasil.opml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil</title>
</head>
<body>
<outline title="Brasil">
- <!--<outline type="rss" xmlUrl="http://apublica.org/feed" htmlUrl="http://apublica.org" title="Agência Pública"/>-->
+ <outline type="rss" xmlUrl="http://manchetometro.com.br/feed/" htmlUrl="http://manchetometro.com.br/" title="Manchetômetro"/>
<outline type="rss" xmlUrl="http://www.brasildefato.com.br/rss_internacional" htmlUrl="" title="Brasil de Fato - Internacional"/>
<outline type="rss" xmlUrl="http://www.brasildefato.com.br/rss_cultura" htmlUrl="" title="Brasil de Fato - Cultura"/>
<outline type="rss" xmlUrl="http://www.mst.org.br/rss.xml" htmlUrl="" title=""/>
diff --git a/brasil/analysis.opml b/brasil/analysis.opml
index 0d82c94..8581abe 100644
--- a/brasil/analysis.opml
+++ b/brasil/analysis.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Analysis</title>
</head>
diff --git a/brasil/foss.opml b/brasil/foss.opml
index 52f1f87..d93b20d 100644
--- a/brasil/foss.opml
+++ b/brasil/foss.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>FOSS - Brasil</title>
</head>
diff --git a/brasil/hacker.opml b/brasil/hacker.opml
index 3ba2768..79460cb 100644
--- a/brasil/hacker.opml
+++ b/brasil/hacker.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Hacker</title>
</head>
diff --git a/brasil/internet.opml b/brasil/internet.opml
index b7e4682..ebc9c2c 100644
--- a/brasil/internet.opml
+++ b/brasil/internet.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Internet</title>
</head>
diff --git a/brasil/investigative.opml b/brasil/investigative.opml
new file mode 100644
index 0000000..fa4716b
--- /dev/null
+++ b/brasil/investigative.opml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<opml version="2.0">
+ <head>
+ <title>Investigative Journalism - Brasil</title>
+ </head>
+ <body>
+ <outline title="Investigative Journalism - Brasil">
+ <outline type="rss" xmlUrl="http://apublica.org/feed" htmlUrl="http://apublica.org" title="Agência Pública"/>
+ <outline type="rss" xmlUrl="http://ponte.org/feed/" htmlUrl="http://ponte.org" title="Ponte - Segurança Pública, Justiça e Direitos Humanos"/>
+ <outline type="rss" xmlUrl="https://reporterbrasil.org.br/feed" htmlUrl="https://reporterbrasil.org.br" title="Repórter Brasil"/>
+ </outline>
+ </body>
+</opml>
diff --git a/brasil/jobs.opml b/brasil/jobs.opml
index 7a8e900..88e1811 100644
--- a/brasil/jobs.opml
+++ b/brasil/jobs.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Jobs</title>
</head>
diff --git a/brasil/left.opml b/brasil/left.opml
index a0435e6..af4dc99 100644
--- a/brasil/left.opml
+++ b/brasil/left.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Left Politics</title>
</head>
diff --git a/brasil/movements.opml b/brasil/movements.opml
index 2d1ba25..e3a429b 100644
--- a/brasil/movements.opml
+++ b/brasil/movements.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Social Movements</title>
</head>
@@ -9,7 +9,6 @@
<outline type="rss" xmlUrl="https://comitepopularsp.wordpress.com/feed/" htmlUrl="" title="Comitê Popular da Copa de São Paulo"/>
<outline type="rss" xmlUrl="http://mtst.org/index.php?format=feed" htmlUrl="" title="MTST - Movimento dos Trabalhadores Sem-Teto"/>
<outline type="rss" xmlUrl="https://milharal.org/?feed=networkrss" htmlUrl="" title="Últimas publicações no Milharal"/>
- <outline type="rss" xmlUrl="http://ponte.org/feed/" htmlUrl="http://ponte.org" title="Ponte - Segurança Pública, Justiça e Direitos Humanos"/>
<outline type="atom" xmlUrl="http://www.mtst.org/index.php?format=feed&amp;type=atom" htmlUrl="http://www.mtst.org" title="MTST - Movimento dos Trabalhadores Sem-Teto"/>
<outline type="rss" xmlUrl="http://tarifazero.org/feed/" htmlUrl="http://tarifazero.org" title="Tarifa Zero"/>
<outline type="rss" xmlUrl="http://actantes.org.br/feed/" htmlUrl="http://actantes.org.br" title="Actantes"/>
diff --git a/brasil/news.opml b/brasil/news.opml
index 541601f..551e902 100644
--- a/brasil/news.opml
+++ b/brasil/news.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - News</title>
</head>
diff --git a/brasil/ngo.opml b/brasil/ngo.opml
index 82ecb93..015160a 100644
--- a/brasil/ngo.opml
+++ b/brasil/ngo.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>NGOs - Brazil</title>
</head>
diff --git a/brasil/saopaulo/culture.opml b/brasil/saopaulo/culture.opml
index c088f7b..992d787 100644
--- a/brasil/saopaulo/culture.opml
+++ b/brasil/saopaulo/culture.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Sao Paulo - Culture</title>
</head>
diff --git a/brasil/saopaulo/news.opml b/brasil/saopaulo/news.opml
index 476d9d4..d7770ef 100644
--- a/brasil/saopaulo/news.opml
+++ b/brasil/saopaulo/news.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Sample OPML File</title>
</head>
diff --git a/brasil/saopaulo/weather.opml b/brasil/saopaulo/weather.opml
index 8ff851a..1dff833 100644
--- a/brasil/saopaulo/weather.opml
+++ b/brasil/saopaulo/weather.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - São Paulo - Weather</title>
</head>
diff --git a/brasil/science.opml b/brasil/science.opml
index d95105b..f878542 100644
--- a/brasil/science.opml
+++ b/brasil/science.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Ciência</title>
</head>
diff --git a/brasil/surveillance.opml b/brasil/surveillance.opml
index 5838a79..12aa043 100644
--- a/brasil/surveillance.opml
+++ b/brasil/surveillance.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Vigilância de Massa</title>
</head>
diff --git a/brasil/tech.opml b/brasil/tech.opml
index 5906124..0fa6957 100644
--- a/brasil/tech.opml
+++ b/brasil/tech.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Brasil - Tecnologia</title>
</head>
diff --git a/bsd.opml b/bsd.opml
index c6865ea..baf87f7 100644
--- a/bsd.opml
+++ b/bsd.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>*BSD News</title>
</head>
diff --git a/coins.opml b/coins.opml
index d23428a..5560e1e 100644
--- a/coins.opml
+++ b/coins.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Cryptocurrencies</title>
</head>
diff --git a/comics.opml b/comics.opml
index e990e55..b355187 100644
--- a/comics.opml
+++ b/comics.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Comics</title>
</head>
diff --git a/compile b/compile
new file mode 100755
index 0000000..e707ec9
--- /dev/null
+++ b/compile
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+#
+# Compile an OPML including all other OPML files.
+#
+
+# Parameters
+BASENAME="`basename $0`"
+DIRNAME="`dirname $0`"
+OUT="$DIRNAME/all.opml"
+BASE_URL="https://git.fluxo.info/feeds/plain/"
+
+# Header
+cat <<-EOF > $OUT
+<?xml version="1.0"?>
+<opml version="2.0">
+ <head>
+ <title>All Feeds</title>
+ </head>
+ <body>
+EOF
+
+# Contend
+find $DIRNAME -name '*.opml' | while read item; do
+ name="`basename $item .opml`"
+ base="`dirname $item | sed -e 's/^\.//'`"
+
+ # Avoid recursion
+ if [ "$name" = "all" ]; then
+ continue
+ fi
+
+ #echo " <outline type=\"include\" url=\"${item}\" title=\"${base}/${name}\"/>" >> $OUT
+ #echo " <outline type=\"include\" url=\"${item}\"/>" >> $OUT
+ echo " <outline type=\"link\" url=\"${BASE_URL}${base}${name}.opml\" text=\"${base}/${name}\"/>" >> $OUT
+done
+
+# Footer
+cat <<-EOF >> $OUT
+ </body>
+</opml>
+EOF
diff --git a/data.opml b/data.opml
new file mode 100644
index 0000000..1bc1c7c
--- /dev/null
+++ b/data.opml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<opml version="2.0">
+ <head>
+ <title>Data</title>
+ </head>
+ <body>
+ <outline title="Data">
+ <outline type="rss" xmlUrl="https://ourworldindata.org/atom.xml" htmlUrl="https://ourworldindata.org" title="Our World in Data - Research & Writing"/>
+ <outline type="rss" xmlUrl="https://ourworldindata.org/atom-data-insights.xml" htmlUrl="https://ourworldindata.org" title="Our World in Data - Daily Data Insights"/>
+ </outline>
+ </body>
+</opml>
diff --git a/development.opml b/development.opml
index 0f24d5e..8239db1 100644
--- a/development.opml
+++ b/development.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Development</title>
</head>
diff --git a/drupal.opml b/drupal.opml
index 16256aa..ce0e18e 100644
--- a/drupal.opml
+++ b/drupal.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Drupal</title>
</head>
diff --git a/essential.opml b/essential.opml
index acfec12..96c6b2e 100644
--- a/essential.opml
+++ b/essential.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Essential</title>
</head>
diff --git a/foss.opml b/foss.opml
index 2d93839..f7b6e49 100644
--- a/foss.opml
+++ b/foss.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>FOSS - Free and Open Source Software</title>
</head>
diff --git a/geek.opml b/geek.opml
index 787dc6f..e666c6e 100644
--- a/geek.opml
+++ b/geek.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Geek</title>
</head>
diff --git a/hacker.opml b/hacker.opml
index 2458042..f7ba19a 100644
--- a/hacker.opml
+++ b/hacker.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Hacker</title>
</head>
diff --git a/hardware.opml b/hardware.opml
index 5faa89f..fdf2643 100644
--- a/hardware.opml
+++ b/hardware.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Free and Open Source Hardware</title>
</head>
diff --git a/humanitarian.opml b/humanitarian.opml
index 64d78cf..6c4d740 100644
--- a/humanitarian.opml
+++ b/humanitarian.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Humanitarian Organizations</title>
</head>
diff --git a/illuminati.opml b/illuminati.opml
index 2258387..e3e26ce 100644
--- a/illuminati.opml
+++ b/illuminati.opml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Illuminati</title>
</head>
<body>
<!-- http://www.brookings.edu/rss#topics/ -->
- <outline title="Bookings">
+ <outline title="Brookings">
<outline type="rss" xmlUrl="http://webfeeds.brookings.edu/brookingsrss/topfeeds/latestfrombrookings?format=xml"/>
<outline type="rss" xmlUrl="http://webfeeds.brookings.edu/brookingsrss/topfeeds/upcomingevents?format=xml"/>
<outline type="rss" xmlUrl="http://webfeeds.brookings.edu/brookingsrss/topfeeds/up_front?format=xml"/>
diff --git a/incoming.opml b/incoming.opml
index 9792590..7c6ddce 100644
--- a/incoming.opml
+++ b/incoming.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Incoming, unsorted feeds to be incorporated</title>
</head>
@@ -36,5 +36,6 @@
<outline type="rss" xmlUrl="https://www.smithsonianmag.com/rss/latest_articles/" htmlUrl="https://www.smithsonianmag.com/rss/" title="Smithsonian Magazine"/>
<outline type="rss" xmlUrl="https://www.radicalphilosophy.com/feed" htmlUrl="https://www.radicalphilosophy.com" title="Radical Philosophy"/>
<outline type="rss" xmlUrl="https://www.mediapart.fr/articles/feed" htmlUrl="https://www.mediapart.fr" title="Mediapart.fr"/>
+ <outline type="rss" xmlUrl="https://www.pewresearch.org/feed/" htmlUrl="https://www.pewresearch.org" title="Pew Research Center"/>
</body>
</opml>
diff --git a/internet.opml b/internet.opml
index 84ba269..eaf1c4e 100644
--- a/internet.opml
+++ b/internet.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Internet</title>
</head>
diff --git a/investigative.opml b/investigative.opml
index 6b266d7..f69583e 100644
--- a/investigative.opml
+++ b/investigative.opml
@@ -1,13 +1,16 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Investigative Journalism</title>
</head>
<body>
- <outline title="Sample Topic">
+ <outline title="Investigative Journalism">
<outline type="rss" xmlUrl="https://www.icij.org/feeds/rss/projects.xml" htmlUrl="https://www.icij.org" title="The International Consortium on Investigative Journalism"/>
<outline tyle="atom" xmlUrl="https://www.thebureauinvestigates.com/feed/atom/" htmlUrl="https://www.thebureauinvestigates.com" title="The Bureau of Investigative Journalism"/>
<outline tyle="rss" xmlUrl="http://feeds.propublica.org/propublica/main" htmlUrl="http://www.propublica.org" title="ProPublica"/>
+ <outline type="rss" xmlUrl="https://www.bellingcat.com/feed/" htmlUrl="https://www.bellingcat.com" title="bellingcat"/>
+ <outline type="rss" xmlUrl="https://forbiddenstories.org/feed/" htmlUrl="https://forbiddenstories.org/" title="Forbidden Stories"/>
+ <outline type="rss" xmlUrl="http://apublica.org/feed" htmlUrl="http://apublica.org" title="Agência Pública"/>
</outline>
</body>
</opml>
diff --git a/left.opml b/left.opml
index 7374b7d..1cde1ee 100644
--- a/left.opml
+++ b/left.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Left politics</title>
</head>
diff --git a/literature.opml b/literature.opml
index 89f5852..43d9d73 100644
--- a/literature.opml
+++ b/literature.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Literature</title>
</head>
diff --git a/misc.opml b/misc.opml
index 9a941c9..903062f 100644
--- a/misc.opml
+++ b/misc.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Misc</title>
</head>
diff --git a/movements.opml b/movements.opml
index 228b514..9a07a22 100644
--- a/movements.opml
+++ b/movements.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Social Movements</title>
</head>
diff --git a/news.opml b/news.opml
index 1789d12..5b08721 100644
--- a/news.opml
+++ b/news.opml
@@ -1,18 +1,16 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>News</title>
</head>
<body>
<outline title="News">
- <outline type="rss" xmlUrl="https://forbiddenstories.org/feed/" htmlUrl="https://forbiddenstories.org/" title="Forbidden Stories"/>
<outline type="rss" xmlUrl="https://www.commondreams.org/feeds/feed.rss" htmlUrl="https://www.commondreams.org" title="Common Dreams"/>
<outline type="rss" xmlUrl="http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989" htmlUrl="http://www.aljazeera.com/default.html" title="AL JAZEERA ENGLISH (AJE)" />
<outline type="rss" xmlUrl="http://www.telesurtv.net/rss/RssPortada.html" htmlUrl="http://www.telesurtv.net" title="teleSURtv.net" />
- <outline type="rss" xmlUrl="https://www.rt.com/rss/news" htmlUrl="https://www.rt.com/news" title="RT - World news" />
- <outline type="rss" xmlUrl="http://manchetometro.com.br/feed/" htmlUrl="http://manchetometro.com.br/" title="Manchetômetro"/>
<!--
+ <outline type="rss" xmlUrl="https://www.rt.com/rss/news" htmlUrl="https://www.rt.com/news" title="RT - World news" />
<outline type="rss" xmlUrl="https://www.rt.com/rss/" htmlUrl="https://www.rt.com" title="RT - Daily news"/>
<outline type="rss" xmlUrl="https://www.rt.com/rss/op-ed" htmlUrl="https://www.rt.com/tags/op-ed" title="RT - Op-ed"/>
<outline type="rss" xmlUrl="https://www.rt.com/rss/russia" htmlUrl="https://www.rt.com/russia" title="RT Russia & Former Soviet Union"/>
diff --git a/sample.opml b/sample.opml
index 367016c..34ca865 100644
--- a/sample.opml
+++ b/sample.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Sample OPML File</title>
</head>
diff --git a/science.opml b/science.opml
index e77fd3c..ab0e2ae 100644
--- a/science.opml
+++ b/science.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Science</title>
</head>
diff --git a/security.opml b/security.opml
index 35b3e4b..5ac77fc 100644
--- a/security.opml
+++ b/security.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Security</title>
</head>
@@ -16,7 +16,8 @@
<outline type="rss" xmlUrl="http://outsourcedbits.org/feed/" htmlUrl="http://outsourcedbits.org" title="Outsourced Bits"/>
<outline type="rss" xmlUrl="http://blog.cr.yp.to/feed.application=xml" htmlUrl="http://blog.cr.yp.to" title="cr.yp.to blog"/>
<outline type="rss" xmlUrl="https://whispersystems.org/blog/rss.xml" htmlUrl="http://www.whispersystems.org/blog/" title="Open Whisper Systems Blog"/>
- <outline type="rss" xmlUrl="https://blog.torproject.org/blog/feed" htmlUrl="https://blog.torproject.org/blog" title="The Tor Blog blogs"/>
+ <outline type="rss" xmlUrl="https://blog.torproject.org/feed.xml" htmlUrl="https://blog.torproject.org" title="The Tor Blog"/>
+ <outline type="rss" xmlUrl="https://blog.torproject.org/event/feed.xml" htmlUrl="https://blog.torproject.org" title="The Tor Blog - Events"/>
<outline type="rss" xmlUrl="https://security.stackexchange.com/feeds" htmlUrl="http://security.stackexchange.com/questions" title="Recent Questions - Information Security Stack Exchange"/>
<outline type="rss" xmlUrl="http://seclists.org/rss/fulldisclosure.rss" htmlUrl="http://seclists.org/fulldisclosure/" title="Full Disclosure"/>
<outline type="rss" xmlUrl="http://seclists.org/rss/isn.rss" htmlUrl="http://seclists.org/isn/" title="Info Security News"/>
diff --git a/software.opml b/software.opml
index 2abd752..82e2c88 100644
--- a/software.opml
+++ b/software.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Software</title>
</head>
diff --git a/space.opml b/space.opml
index 710034d..8deacc3 100644
--- a/space.opml
+++ b/space.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Space</title>
</head>
diff --git a/surveillance.opml b/surveillance.opml
index 4e2819b..91671b6 100644
--- a/surveillance.opml
+++ b/surveillance.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Surveillance</title>
</head>
diff --git a/tech.opml b/tech.opml
index 711d974..96a1375 100644
--- a/tech.opml
+++ b/tech.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Tech</title>
</head>
diff --git a/telecom.opml b/telecom.opml
index 754a648..24ac86a 100644
--- a/telecom.opml
+++ b/telecom.opml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<opml version="1.0">
+<opml version="2.0">
<head>
<title>Telecom</title>
</head>