From d27a62fbf4fbe1040bab4af7a34bd8be679dd5c7 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sat, 3 Sep 2016 10:34:45 +0100 Subject: [PATCH] typo --- FAQ.md | 8 ++++++-- censorship.md | 8 +++++++- events.md | 2 ++ media.md | 4 ++++ stack-overflow.md | 4 ++++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/FAQ.md b/FAQ.md index db0120d..cdea7a2 100644 --- a/FAQ.md +++ b/FAQ.md @@ -31,7 +31,7 @@ This is a good point, and one that does make me think. So this puts pressure on them to take away the firewall. -1. Programmers are more likely to develop better Firewall climbing tools is SO is blocked +1. Programmers are more likely to develop better Firewall climbing tools if SO is blocked 1. If we don't take any action to show our dissatisfaction, the dictatorship never ends. @@ -46,7 +46,11 @@ This is a good point, and one that does make me think. But between those two extremes, what is the right measure? I think that saying nothing is too close to stability. - I do see that one alternative scenario is that if we do nothing, maybe there will be more and more contact with Western countries, and the Chinese will see for themselves that we are not that bad, and eventually request democracy. But who can know if this can really happen? + I do see that one alternative scenario is that if we do nothing, maybe there will be more and more contact with Western countries, and the Chinese will see for themselves that we are not that bad, and eventually request democracy. + +1. Even if programmers get very powerful, it is not very likely that they will succeed to undo the dictatorship, they simply don't have enough power. + + I'd rather have a less strong dictatorship, than one with good programmers. ## You are harming the Chinese programmers diff --git a/censorship.md b/censorship.md index 7cba178..d014dae 100644 --- a/censorship.md +++ b/censorship.md @@ -71,7 +71,7 @@ Censorship monitoring tools 审查监控工具: -- +- Temporarily blocked twice: - - , , @@ -84,6 +84,12 @@ Curated list of censored websites: - Website title translate: "After you climb the wall, what to see?". - +### Pornography + +Illegal since 1949: and continues to be semi-enforced. + +TODO rationale today? Some people said it is to not divert people's attention from work and the service of the country. + ## Tools Skype TODO status?: diff --git a/events.md b/events.md index 40d012e..14fd6ee 100644 --- a/events.md +++ b/events.md @@ -1,5 +1,7 @@ # Events 事件 +- 2016-06 +- 2016-06 first GitHub takedown - 2016 queen says Chinese were rude in state visit http://www.nytimes.com/2016/05/12/world/asia/china-britain-queen-xi-jinping.html?_r=0 - Sexy banana eating forbidden http://shanghaiist.com/2016/05/06/dont_eat_that_banana.php - 201X Chinese government uses forbidden media in China like Facebook and Twitter, possibly click farmed: diff --git a/media.md b/media.md index 8ac5b03..130013b 100644 --- a/media.md +++ b/media.md @@ -55,6 +55,10 @@ Which is the same as not controlled by it :-) - - +## Uncertain + +- SCMP from Hong Kong, and was critical of CCP, but was bought by Alibaba: There were still critical articles after the purchase. + ## Pertinent to Falun Gong - seems not to consider Falun Gong as a sect diff --git a/stack-overflow.md b/stack-overflow.md index d03ea22..b8278c0 100644 --- a/stack-overflow.md +++ b/stack-overflow.md @@ -37,3 +37,7 @@ Accounts of people detained: ## Previously on my username - **包卓轩**: Bao Zhuoxuan, 16-year old son of Jul 2015 arrested human rights activist [Wang Yu](https://goo.gl/bTfxFp), kept hostage after trying to flee China ([nytimes](http://goo.gl/zt4IJD), [chinachange](http://goo.gl/bfqP8k)) + +## Backlinks + +-