Recent changes to this wiki:

Now that's sulbet! Great to hear from you. http://impzqz.com [url=http://ofirrivejg.com]ofirrivejg[/url] [link=http://zbecywkvpa.com]zbecywkvpa[/link]
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index ce81597..6204f35 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-Grade A stuff. I'm <a href="http://akcviac.com">unbqastioneuly</a> in your debt.
+Now that's sulbet! Great to hear from you. http://impzqz.com [url=http://ofirrivejg.com]ofirrivejg[/url] [link=http://zbecywkvpa.com]zbecywkvpa[/link]

Grade A stuff. I'm <a href="http://akcviac.com">unbqastioneuly</a> in your debt.
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 02a7f18..ce81597 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-Holy Todloe, so glad I clicked on this site first! http://pzbucg.com [url=http://kxcfgkygiy.com]kxcfgkygiy[/url] [link=http://wbfhizqc.com]wbfhizqc[/link]
+Grade A stuff. I'm <a href="http://akcviac.com">unbqastioneuly</a> in your debt.

Holy Todloe, so glad I clicked on this site first! http://pzbucg.com [url=http://kxcfgkygiy.com]kxcfgkygiy[/url] [link=http://wbfhizqc.com]wbfhizqc[/link]
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 5cd14cd..02a7f18 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-Boom <a href="http://onkbfqe.com">shkkalaaa</a> boom boom, problem solved.
+Holy Todloe, so glad I clicked on this site first! http://pzbucg.com [url=http://kxcfgkygiy.com]kxcfgkygiy[/url] [link=http://wbfhizqc.com]wbfhizqc[/link]

Boom <a href="http://onkbfqe.com">shkkalaaa</a> boom boom, problem solved.
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 07d76a9..5cd14cd 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-I'm rellay into it, thanks for this great stuff!
+Boom <a href="http://onkbfqe.com">shkkalaaa</a> boom boom, problem solved.

I'm rellay into it, thanks for this great stuff!
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 5c33495..07d76a9 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-Right on-this helped me sort thnigs right out.
+I'm rellay into it, thanks for this great stuff!

This reverts commit 2a760f3b7094bbf58a7d87028850db59a6930fd1
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 5d992fe..5c33495 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-6CZDgY  <a href="http://fclnxlquuouk.com/">fclnxlquuouk</a>
+Right on-this helped me sort thnigs right out.

6CZDgY <a href="http://fclnxlquuouk.com/">fclnxlquuouk</a>
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 5c33495..5d992fe 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-Right on-this helped me sort thnigs right out.
+6CZDgY  <a href="http://fclnxlquuouk.com/">fclnxlquuouk</a>

Right on-this helped me sort thnigs right out.
diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
index 8bcaff5..5c33495 100644
--- a/Overview/discussion.mdwn
+++ b/Overview/discussion.mdwn
@@ -1 +1 @@
-Starting discussion...
+Right on-this helped me sort thnigs right out.

diff --git a/AboutThisVersion.mdwn b/AboutThisVersion.mdwn
index 1131a38..bc5a63b 100644
--- a/AboutThisVersion.mdwn
+++ b/AboutThisVersion.mdwn
@@ -2,4 +2,4 @@ This is currently an experimental version of Dan Gillmor's work-in-progress, Tak
 
 The final project might not end up here at all, as we're looking into other backends or server setups.
 
-This instance is maintained by Daniel Kahn Gillmor (actually a different person from the main author of the book (actually his nephew, which Uncle Dan thinks is very cool), despite the similar name).
+This instance is maintained by Daniel Kahn Gillmor (actually a different person from the main author of the book [actually his nephew, which Uncle Dan thinks is pretty cool], despite the similar name).

diff --git a/AboutThisVersion.mdwn b/AboutThisVersion.mdwn
index faf8b9a..1131a38 100644
--- a/AboutThisVersion.mdwn
+++ b/AboutThisVersion.mdwn
@@ -2,4 +2,4 @@ This is currently an experimental version of Dan Gillmor's work-in-progress, Tak
 
 The final project might not end up here at all, as we're looking into other backends or server setups.
 
-This instance is maintained by Daniel Kahn Gillmor (actually a different person from the main author of the book, despite the similar name).
+This instance is maintained by Daniel Kahn Gillmor (actually a different person from the main author of the book (actually his nephew, which Uncle Dan thinks is very cool), despite the similar name).

diff --git a/Overview.mdwn b/Overview.mdwn
index 237e572..864e59c 100644
--- a/Overview.mdwn
+++ b/Overview.mdwn
@@ -1,5 +1,3 @@
-[[Discussion of this section]]
-
 In the first several chapters, I explain why we should prefer
 technological freedom. During the rest of the book I mostly explain
 how (with more of the “why” accompanying the more specific how-to

diff --git a/Overview.mdwn b/Overview.mdwn
index 864e59c..237e572 100644
--- a/Overview.mdwn
+++ b/Overview.mdwn
@@ -1,3 +1,5 @@
+[[Discussion of this section]]
+
 In the first several chapters, I explain why we should prefer
 technological freedom. During the rest of the book I mostly explain
 how (with more of the “why” accompanying the more specific how-to

diff --git a/Overview/discussion.mdwn b/Overview/discussion.mdwn
new file mode 100644
index 0000000..8bcaff5
--- /dev/null
+++ b/Overview/discussion.mdwn
@@ -0,0 +1 @@
+Starting discussion...

sigh. more typos
diff --git a/GoodEnough.mdwn b/GoodEnough.mdwn
index 99ddbdf..dc6b88b 100644
--- a/GoodEnough.mdwn
+++ b/GoodEnough.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="If Open Source Software is Good Enough for IBM, It’Good Enough for Us"]]
+[[!meta title="If Open Source Software is Good Enough for IBM, It’s Good Enough for Us"]]
 
 The world of open-source and free software is a large and fascinating
 ecosystem, devoted to the idea that fundamental computing tools should

fix title
diff --git a/GoodEnough.mdwn b/GoodEnough.mdwn
index 6a0bcbe..99ddbdf 100644
--- a/GoodEnough.mdwn
+++ b/GoodEnough.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="If Open Source Software is Good Enough for IBM, It’s Good Enough for Us"]
+[[!meta title="If Open Source Software is Good Enough for IBM, It’Good Enough for Us"]]
 
 The world of open-source and free software is a large and fascinating
 ecosystem, devoted to the idea that fundamental computing tools should

fixing name
diff --git a/index.mdwn b/index.mdwn
index 8580aed..9aeaf8c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
 [[AboutThisVersion]]
 
-[[!meta title="Taking Permission: How We can Recapture Control of Our Own Technology and Communications"]]
+[[!meta title="Permission Taken: How We can Recapture Control of Our Own Technology and Communications"]]
 
 by Dan Gillmor
 

tweak index.mdwn to force a rebuild
diff --git a/index.mdwn b/index.mdwn
index 317e20a..8580aed 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -74,3 +74,5 @@ not a positive one.
 [[!inline pagenames="Overview EmergingEmpires Governments TechLiberty GoodEnough GetStarted Android ProtectingYourData UsingMedia Publishing WhatsMissing"]]
 
 You might also be interested in [[TheWebsite]], [[TheApps]], and [[TheAudience]]
+
+[[AboutThisVersion]]

add missing chapter
diff --git a/GoodEnough.mdwn b/GoodEnough.mdwn
new file mode 100644
index 0000000..6a0bcbe
--- /dev/null
+++ b/GoodEnough.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="If Open Source Software is Good Enough for IBM, It’s Good Enough for Us"]
+
+The world of open-source and free software is a large and fascinating
+ecosystem, devoted to the idea that fundamental computing tools should
+be a) freely available for download, use, and redistribution; b)
+provide “source code” – the programming instructions – that is open
+for study and modification by other programmers and c) supported by
+the community of users and for-profit enterprises alike. You may not
+realize it, but you are using open-source and free software every day,
+because it helps operate the Internet’s essential services. Android,
+the mobile operating system, is open source as well – though the
+carriers restrict it, as we’ll learn in another chapter – and there
+are thousands of programs that can replace the ones you use today on
+the Mac and Windows.
+
+Sidebar: Richard Stallman, founder of the Free Software Foundation
+
+Sidebar: Christine Peterson, who coined the expression “open source”

upload initial draft
diff --git a/Android.mdwn b/Android.mdwn
new file mode 100644
index 0000000..6336cb3
--- /dev/null
+++ b/Android.mdwn
@@ -0,0 +1,16 @@
+[[!meta title="Why Android Should be Your Mobile OS, at Least for Now, and How to Get the Most from It"]]
+
+Apple’s iOS is a huge success, due to the elegant hardware of the
+iPhone and iPad and massive collection of apps. Even though the
+Android operating system, which powers an increasing percentage of
+“smart phones” around the world, is itself open-source, the phone
+makers and mobile carriers have locked it down in most cases,
+preventing users from using it as they wish. There are some sound
+reasons for this, but the lockdowns have many negative
+consequences. In this chapter we look at the Android ecosystem, and
+discuss ways of “jailbreaking” your phone to give yourself the
+greatest freedom – and also how to avoid some of the problems that
+result when you do. We’ll also discuss several upcoming open-source
+mobile operating systems that may provide even more user freedom.
+
+Sidebar: Andy Rubin, head of Android at Google
diff --git a/GetStarted.mdwn b/GetStarted.mdwn
new file mode 100644
index 0000000..59ee7c7
--- /dev/null
+++ b/GetStarted.mdwn
@@ -0,0 +1,14 @@
+[[!meta title="Let’s Get Started: How to Move to Linux from the Mac or Windows"]]
+
+OK, here we go. Your computer’s operating system is the traffic
+cop. For years, Linux has been the also-ran in the operating systems
+market, but it’s been improving at a rapid rate. Linux has many
+variants, but two have captured the most attention for their elegance,
+ease of use and strong support: Ubuntu and Mint. In this chapter I’ll
+explain the basics of switching from Windows or the Mac, including how
+to run both systems for a time while you get acclimated, and how to
+find application software to replace what you’ve been using.
+
+Sidebar: Linus Torvalds about the Linux journey
+
+Sidebar: Mark Shuttleworth, Ubuntu founder
diff --git a/ProtectingYourData.mdwn b/ProtectingYourData.mdwn
new file mode 100644
index 0000000..d4f695a
--- /dev/null
+++ b/ProtectingYourData.mdwn
@@ -0,0 +1,17 @@
+[[!meta title="Protecting Your Data, Privacy and Freedom of Speech"]]
+
+Whether you move to more open systems on your PC and mobile devices or
+not, you need to take more care in protecting yourself in the digital
+sphere. This chapter is about fundamental steps we all can take to
+keep our data secure and prevent prying eyes from following our every
+move, while recognizing that this may well be impossible or, at best,
+impractical. We’ll discuss browser tools, encryption and a variety of
+other safeguards that work on all kinds of operating systems. We’ll
+also look at the pros and cons of using social networks such as
+Facebook, Google+ and Twitter – increasingly becoming a center of
+speech and collaboration but owned by private interests – and see if
+there are any useful alternatives to them.
+
+Sidebar: Bruce Schneier, security expert.
+
+Sidebar: A Syrian activist on the lethal risks of insecure communications.
diff --git a/Publishing.mdwn b/Publishing.mdwn
new file mode 100644
index 0000000..efab06b
--- /dev/null
+++ b/Publishing.mdwn
@@ -0,0 +1,21 @@
+[[!meta title="Open Source Publishing"]]
+
+In the Digital Age we are creators, not just consumers. And as
+creators we have unprecedented opportunities to be heard and seen --
+but those opportunities will be greater if we use open-source methods
+in our publishing. The scholarly journal industry, for example, is
+being challenged by upstarts who want to overturn the closed-in,
+expensive system that has prevailed in favor of an open system that a)
+spreads knowledge more efficiently; and b) is far less expensive for
+libraries and schools. Copyright remains a vital part of the
+publishing ecosystem, meanwhile, but its abuses by the entertainment
+and publishing industries, among others, have led many people to
+Creative Commons, a licensing system that invites sharing while
+protecting creators. CC is just one of the tools we can deploy to make
+our work more open for re-use and re-mixing by others. This chapter
+discusses the reasons why being more open is better for creators in
+most cases, and vastly better for society.
+
+Sidebar: Science Commons, opening up research.
+
+Sidebar: Scholars rebel against high-priced, closed-off academic journals.
diff --git a/TechLiberty.mdwn b/TechLiberty.mdwn
new file mode 100644
index 0000000..694cd0b
--- /dev/null
+++ b/TechLiberty.mdwn
@@ -0,0 +1,9 @@
+[[!meta title="Tech Liberty is a Strategy and Process, Not an End in Itself"]]
+
+Like security, tech liberty is a process, not an outcome. But we all
+need a strategy that aims at a goal. We need to consider the tradeoffs
+and ethical/legal dilemmas. These include ease of use, support, cost
+and many other factors.  This chapter helps create a personal road
+map, or check list, toward tech liberty.
+
+Sidebar: Cory Doctorow, an author and tech libertarian.
diff --git a/TheApps.mdwn b/TheApps.mdwn
new file mode 100644
index 0000000..143e1d6
--- /dev/null
+++ b/TheApps.mdwn
@@ -0,0 +1,8 @@
+[[!meta title="The App(s)"]]
+
+I’m still working through what might be best for apps. One possibility
+is an Android app that anonymizes browsing data. In general, however,
+these tools are best left to the real experts in the field; and our
+best role is to point to them. If it turns out that there’s a major
+gap in this marketplace that no one else seems interested in filling,
+we might create a Kickstarter project to do just that.
diff --git a/TheAudience.mdwn b/TheAudience.mdwn
new file mode 100644
index 0000000..1da3ee9
--- /dev/null
+++ b/TheAudience.mdwn
@@ -0,0 +1,19 @@
+[[!meta title="The Audience"]]
+
+This book is initially for people who are becoming uneasy about
+corporate and governmental intrusions on the freedoms we’ve been
+promised from technology and networks.
+
+Apple’s increasing level of control-freakery plays nicely into the
+project’s themes. Now that it’s the most valuable company in the
+world, journalists are finally paying attention to its behavior beyond
+the design and manufacturing of cool products. Most people will
+continue to love Apple, but there’s growing unease about its power,
+just as Microsoft was confronted in the late 1990s by evidence of
+predatory behavior that, in the end, was damaging to customers and
+competition.
+
+Moreover, the online industry’s contempt for user privacy is getting a
+critical mass of attention, and publicly disclosed hacks into
+sensitive databases are a growing phenomenon. This will not diminish,
+and will become another selling point for the project.
diff --git a/TheWebsite.mdwn b/TheWebsite.mdwn
new file mode 100644
index 0000000..e544cfc
--- /dev/null
+++ b/TheWebsite.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="The Website"]]
+
+Since this book will be published under a Creative Commons license, it
+will be entirely available on the website. The site, however, will be
+much more: a portal to all kinds of specifics on how to find and use
+the best open systems.
+
+I plan to create an exhaustive listing of liberty- and
+privacy-protecting technologies and techniques. But the key value will
+be in the curation and recommendation of what experts in these arenas
+believe are the best ones, but also which are the easiest to use by
+regular people.
+
+This approach is essential for several reasons. First, the
+technologies are changing so rapidly that details in the book will
+become outdated all too quickly. Second, an aggregation approach, plus
+blogging on the latest developments in this arena, are ideally suited
+to a website.
diff --git a/UsingMedia.mdwn b/UsingMedia.mdwn
new file mode 100644
index 0000000..71308c4
--- /dev/null
+++ b/UsingMedia.mdwn
@@ -0,0 +1,24 @@
+[[!meta title="Using Media Your Way"]]
+
+The entertainment industry’s fear of copyright infringement has led to
+stringent curbs on what you can do with the media you buy and
+rent. For example, Amazon’s Kindle format is unreadable on other
+e-readers; you are not legally permitted to make personal backups of
+DVDs you’ve purchased, or “rip” them to other formats so you can watch
+them on other devices or share them with other people; and DVD players
+have “regional coding” that curbs people’s ability to play a disk
+bought in one part of the world from being viewed on a player in
+another part of the world. There are plenty of tools that let you use
+media your own way despite these restrictions, but there are some
+risks (small in some cases, larger in others). This chapter does not
+advocate copyright infringement. It does explain what is possible, and
+encourages readers to make their own, informed decisions.
+
+Sidebar: Cory Doctorow says, “"When someone puts a lock on something
+that belongs to you and won't give you the key, the lock isn't there
+for your benefit." This applies to content providers, who have given
+the keys to their kingdom to companies like Apple, Amazon and Google;
+Digital Rights Management hurts the creators more than it helps them.
+
+Sidebar: Interview with founder of VLC, an open-source, multi-format
+media player.

(Diff truncated)
back to earlier strategy for now
diff --git a/EmergingEmpires.mdwn b/EmergingEmpires.mdwn
new file mode 100644
index 0000000..cde92c4
--- /dev/null
+++ b/EmergingEmpires.mdwn
@@ -0,0 +1,22 @@
+[[!meta title="Emerging Empires (or Apple is Not Your Daddy)"]]
+
+The promise of technology has never been greater. But the future of
+democratized communications and collaboration has never been more in
+doubt. Powerful corporate and political interests are taking control
+of the hardware, software and networks that have given humanity
+unprecedented creative opportunities. They are re-centralizing the
+platforms – the Internet in particular – that have been fountains of
+innovation because of their decentralized nature. Their motives are
+not evil in most cases, even though their actions are causing enormous
+long-term damage. And they are succeeding in part because most of
+their customers either don’t realize what is happening or don’t
+care. The chapter will start with someone’s personal story, or with a
+scenario of a locked-down future.
+
+Sidebar: Apple and me, a love story that went sour.
+
+Sidebar: A representative of the entertainment industry explains why
+online freedom needs stricter limits.
+
+Sidebar: Someone from Electronic Frontier Foundation on why we
+shouldn’t have to ask Hollywood for permission to innovate.
diff --git a/EmergingEmpires/index.mdwn b/EmergingEmpires/index.mdwn
deleted file mode 100644
index cde92c4..0000000
--- a/EmergingEmpires/index.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!meta title="Emerging Empires (or Apple is Not Your Daddy)"]]
-
-The promise of technology has never been greater. But the future of
-democratized communications and collaboration has never been more in
-doubt. Powerful corporate and political interests are taking control
-of the hardware, software and networks that have given humanity
-unprecedented creative opportunities. They are re-centralizing the
-platforms – the Internet in particular – that have been fountains of
-innovation because of their decentralized nature. Their motives are
-not evil in most cases, even though their actions are causing enormous
-long-term damage. And they are succeeding in part because most of
-their customers either don’t realize what is happening or don’t
-care. The chapter will start with someone’s personal story, or with a
-scenario of a locked-down future.
-
-Sidebar: Apple and me, a love story that went sour.
-
-Sidebar: A representative of the entertainment industry explains why
-online freedom needs stricter limits.
-
-Sidebar: Someone from Electronic Frontier Foundation on why we
-shouldn’t have to ask Hollywood for permission to innovate.
diff --git a/Governments.mdwn b/Governments.mdwn
new file mode 100644
index 0000000..f0af3ac
--- /dev/null
+++ b/Governments.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="Governments Push for Security and Control"]]
+
+The same technologies that give us freedom to communicate and
+collaborate can be put to use for ends that governments find
+worrisome. They are also great tools to help governments to spy on
+their own citizens, not just people who threaten security. In
+repressive regimes, the digital networks are a threat to the regimes’
+very existence – one reason why the U.S. State Department is working
+to spread democratized media to those places. But the U.S. government,
+among many others, is also taking steps – often in concert with the
+copyright industry – to restrict these uses at home. The dilemmas are
+real, but security and law-enforcement interests increasingly trump
+free speech and innovation. But the proverbial cure looks to be more
+dangerous than the disease.
+
+Sidebar: Interview with someone from law enforcement.
+
+Sidebar: Activist for democracy from Syria or some other country in turmoil.
diff --git a/Governments/index.mdwn b/Governments/index.mdwn
deleted file mode 100644
index f0af3ac..0000000
--- a/Governments/index.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!meta title="Governments Push for Security and Control"]]
-
-The same technologies that give us freedom to communicate and
-collaborate can be put to use for ends that governments find
-worrisome. They are also great tools to help governments to spy on
-their own citizens, not just people who threaten security. In
-repressive regimes, the digital networks are a threat to the regimes’
-very existence – one reason why the U.S. State Department is working
-to spread democratized media to those places. But the U.S. government,
-among many others, is also taking steps – often in concert with the
-copyright industry – to restrict these uses at home. The dilemmas are
-real, but security and law-enforcement interests increasingly trump
-free speech and innovation. But the proverbial cure looks to be more
-dangerous than the disease.
-
-Sidebar: Interview with someone from law enforcement.
-
-Sidebar: Activist for democracy from Syria or some other country in turmoil.
diff --git a/index.mdwn b/index.mdwn
index 987b48c..11c179b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -71,4 +71,4 @@ Why do I keep using the word “liberty,” anyway? Because this is truly
 about your freedoms. They are in jeopardy now, and the trajectory is
 not a positive one.
 
-[[!inline pagenames="Overview EmergingEmpires/index Governments/index"]]
+[[!inline pagenames="Overview EmergingEmpires Governments"]]

trying other aggregation strategy
diff --git a/index.mdwn b/index.mdwn
index 96ab0e0..987b48c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -71,4 +71,4 @@ Why do I keep using the word “liberty,” anyway? Because this is truly
 about your freedoms. They are in jeopardy now, and the trajectory is
 not a positive one.
 
-[[!inline pagenames="Overview EmergingEmpires/ Governments/"]]
+[[!inline pagenames="Overview EmergingEmpires/index Governments/index"]]

trying a reorganization
diff --git a/EmergingEmpires.mdwn b/EmergingEmpires.mdwn
deleted file mode 100644
index cde92c4..0000000
--- a/EmergingEmpires.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!meta title="Emerging Empires (or Apple is Not Your Daddy)"]]
-
-The promise of technology has never been greater. But the future of
-democratized communications and collaboration has never been more in
-doubt. Powerful corporate and political interests are taking control
-of the hardware, software and networks that have given humanity
-unprecedented creative opportunities. They are re-centralizing the
-platforms – the Internet in particular – that have been fountains of
-innovation because of their decentralized nature. Their motives are
-not evil in most cases, even though their actions are causing enormous
-long-term damage. And they are succeeding in part because most of
-their customers either don’t realize what is happening or don’t
-care. The chapter will start with someone’s personal story, or with a
-scenario of a locked-down future.
-
-Sidebar: Apple and me, a love story that went sour.
-
-Sidebar: A representative of the entertainment industry explains why
-online freedom needs stricter limits.
-
-Sidebar: Someone from Electronic Frontier Foundation on why we
-shouldn’t have to ask Hollywood for permission to innovate.
diff --git a/EmergingEmpires/index.mdwn b/EmergingEmpires/index.mdwn
new file mode 100644
index 0000000..cde92c4
--- /dev/null
+++ b/EmergingEmpires/index.mdwn
@@ -0,0 +1,22 @@
+[[!meta title="Emerging Empires (or Apple is Not Your Daddy)"]]
+
+The promise of technology has never been greater. But the future of
+democratized communications and collaboration has never been more in
+doubt. Powerful corporate and political interests are taking control
+of the hardware, software and networks that have given humanity
+unprecedented creative opportunities. They are re-centralizing the
+platforms – the Internet in particular – that have been fountains of
+innovation because of their decentralized nature. Their motives are
+not evil in most cases, even though their actions are causing enormous
+long-term damage. And they are succeeding in part because most of
+their customers either don’t realize what is happening or don’t
+care. The chapter will start with someone’s personal story, or with a
+scenario of a locked-down future.
+
+Sidebar: Apple and me, a love story that went sour.
+
+Sidebar: A representative of the entertainment industry explains why
+online freedom needs stricter limits.
+
+Sidebar: Someone from Electronic Frontier Foundation on why we
+shouldn’t have to ask Hollywood for permission to innovate.
diff --git a/Governments.mdwn b/Governments.mdwn
deleted file mode 100644
index f0af3ac..0000000
--- a/Governments.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!meta title="Governments Push for Security and Control"]]
-
-The same technologies that give us freedom to communicate and
-collaborate can be put to use for ends that governments find
-worrisome. They are also great tools to help governments to spy on
-their own citizens, not just people who threaten security. In
-repressive regimes, the digital networks are a threat to the regimes’
-very existence – one reason why the U.S. State Department is working
-to spread democratized media to those places. But the U.S. government,
-among many others, is also taking steps – often in concert with the
-copyright industry – to restrict these uses at home. The dilemmas are
-real, but security and law-enforcement interests increasingly trump
-free speech and innovation. But the proverbial cure looks to be more
-dangerous than the disease.
-
-Sidebar: Interview with someone from law enforcement.
-
-Sidebar: Activist for democracy from Syria or some other country in turmoil.
diff --git a/Governments/index.mdwn b/Governments/index.mdwn
new file mode 100644
index 0000000..f0af3ac
--- /dev/null
+++ b/Governments/index.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="Governments Push for Security and Control"]]
+
+The same technologies that give us freedom to communicate and
+collaborate can be put to use for ends that governments find
+worrisome. They are also great tools to help governments to spy on
+their own citizens, not just people who threaten security. In
+repressive regimes, the digital networks are a threat to the regimes’
+very existence – one reason why the U.S. State Department is working
+to spread democratized media to those places. But the U.S. government,
+among many others, is also taking steps – often in concert with the
+copyright industry – to restrict these uses at home. The dilemmas are
+real, but security and law-enforcement interests increasingly trump
+free speech and innovation. But the proverbial cure looks to be more
+dangerous than the disease.
+
+Sidebar: Interview with someone from law enforcement.
+
+Sidebar: Activist for democracy from Syria or some other country in turmoil.
diff --git a/index.mdwn b/index.mdwn
index 11c179b..96ab0e0 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -71,4 +71,4 @@ Why do I keep using the word “liberty,” anyway? Because this is truly
 about your freedoms. They are in jeopardy now, and the trajectory is
 not a positive one.
 
-[[!inline pagenames="Overview EmergingEmpires Governments"]]
+[[!inline pagenames="Overview EmergingEmpires/ Governments/"]]

diff --git a/Governments.mdwn b/Governments.mdwn
index f70d0da..f0af3ac 100644
--- a/Governments.mdwn
+++ b/Governments.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Governments Push for Security and Control']]
+[[!meta title="Governments Push for Security and Control"]]
 
 The same technologies that give us freedom to communicate and
 collaborate can be put to use for ends that governments find

diff --git a/Governments.mdwn b/Governments.mdwn
new file mode 100644
index 0000000..f70d0da
--- /dev/null
+++ b/Governments.mdwn
@@ -0,0 +1,18 @@
+[[meta title="Governments Push for Security and Control']]
+
+The same technologies that give us freedom to communicate and
+collaborate can be put to use for ends that governments find
+worrisome. They are also great tools to help governments to spy on
+their own citizens, not just people who threaten security. In
+repressive regimes, the digital networks are a threat to the regimes’
+very existence – one reason why the U.S. State Department is working
+to spread democratized media to those places. But the U.S. government,
+among many others, is also taking steps – often in concert with the
+copyright industry – to restrict these uses at home. The dilemmas are
+real, but security and law-enforcement interests increasingly trump
+free speech and innovation. But the proverbial cure looks to be more
+dangerous than the disease.
+
+Sidebar: Interview with someone from law enforcement.
+
+Sidebar: Activist for democracy from Syria or some other country in turmoil.

diff --git a/index.mdwn b/index.mdwn
index 6af1468..11c179b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -71,4 +71,4 @@ Why do I keep using the word “liberty,” anyway? Because this is truly
 about your freedoms. They are in jeopardy now, and the trajectory is
 not a positive one.
 
-
+[[!inline pagenames="Overview EmergingEmpires Governments"]]

diff --git a/EmergingEmpires.mdwn b/EmergingEmpires.mdwn
index 312d39c..cde92c4 100644
--- a/EmergingEmpires.mdwn
+++ b/EmergingEmpires.mdwn
@@ -1,8 +1,5 @@
 [[!meta title="Emerging Empires (or Apple is Not Your Daddy)"]]
 
-Emerging Empires (or Apple is Not Your Daddy)
-====
-
 The promise of technology has never been greater. But the future of
 democratized communications and collaboration has never been more in
 doubt. Powerful corporate and political interests are taking control

diff --git a/index.mdwn b/index.mdwn
index 09c3eea..6af1468 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,6 @@
 [[AboutThisVersion]]
 
-Permission Taken: How We can Recapture Control of Our Own Technology and Communications
-====
+[[!meta title="Taking Permission: How We can Recapture Control of Our Own Technology and Communications"]]
 
 by Dan Gillmor
 

diff --git a/EmergingEmpires.mdwn b/EmergingEmpires.mdwn
new file mode 100644
index 0000000..312d39c
--- /dev/null
+++ b/EmergingEmpires.mdwn
@@ -0,0 +1,25 @@
+[[!meta title="Emerging Empires (or Apple is Not Your Daddy)"]]
+
+Emerging Empires (or Apple is Not Your Daddy)
+====
+
+The promise of technology has never been greater. But the future of
+democratized communications and collaboration has never been more in
+doubt. Powerful corporate and political interests are taking control
+of the hardware, software and networks that have given humanity
+unprecedented creative opportunities. They are re-centralizing the
+platforms – the Internet in particular – that have been fountains of
+innovation because of their decentralized nature. Their motives are
+not evil in most cases, even though their actions are causing enormous
+long-term damage. And they are succeeding in part because most of
+their customers either don’t realize what is happening or don’t
+care. The chapter will start with someone’s personal story, or with a
+scenario of a locked-down future.
+
+Sidebar: Apple and me, a love story that went sour.
+
+Sidebar: A representative of the entertainment industry explains why
+online freedom needs stricter limits.
+
+Sidebar: Someone from Electronic Frontier Foundation on why we
+shouldn’t have to ask Hollywood for permission to innovate.

diff --git a/Overview.mdwn b/Overview.mdwn
index 54f6830..864e59c 100644
--- a/Overview.mdwn
+++ b/Overview.mdwn
@@ -12,10 +12,12 @@ protect your privacy and security; mobile devices and apps that give
 you more choices; and much more.
 
 Sprinkled throughout the book will be writing profiles, based on
-interviews and other research, with 1) people who have already made
-the choices I’m urging the rest of us to make; and 2) people who have
-invented some of the tools and systems that give you the ability to
-control more of your own destiny. These folks are often inspiring, and
+interviews and other research, with:
+
+1. people who have already made the choices I’m urging the rest of us to make; and 
+2. people who have invented some of the tools and systems that give you the ability to control more of your own destiny
+
+These folks are often inspiring, and
 always interesting.
 
 This project follows on the great work of (among many others) Rebecca

diff --git a/Overview.mdwn b/Overview.mdwn
new file mode 100644
index 0000000..54f6830
--- /dev/null
+++ b/Overview.mdwn
@@ -0,0 +1,26 @@
+In the first several chapters, I explain why we should prefer
+technological freedom. During the rest of the book I mostly explain
+how (with more of the “why” accompanying the more specific how-to
+descriptions).
+
+Along the way I’ll offer lots of specifics. We’ll look, for example,
+at several versions of Linux; a mobile phone security; free software
+applications that give users the tools they need without reverting to
+the Windows or Mac worlds; alternatives to Facebook, or at least
+settings that preserve more of your privacy; web-browsing tools to
+protect your privacy and security; mobile devices and apps that give
+you more choices; and much more.
+
+Sprinkled throughout the book will be writing profiles, based on
+interviews and other research, with 1) people who have already made
+the choices I’m urging the rest of us to make; and 2) people who have
+invented some of the tools and systems that give you the ability to
+control more of your own destiny. These folks are often inspiring, and
+always interesting.
+
+This project follows on the great work of (among many others) Rebecca
+MacKinnon Consent of the Networked); Jonathan Zittrain (The Future of
+the Internet--and How to Stop It); Doc Searls (“Edging toward the
+fully licensed world”); Richard Stallman (Free Software Foundation);
+and others. It will be fully open-sourced, and published under a
+Creative Commons license.

diff --git a/AboutThisVersion.mdwn b/AboutThisVersion.mdwn
new file mode 100644
index 0000000..faf8b9a
--- /dev/null
+++ b/AboutThisVersion.mdwn
@@ -0,0 +1,5 @@
+This is currently an experimental version of Dan Gillmor's work-in-progress, Taking Permission.
+
+The final project might not end up here at all, as we're looking into other backends or server setups.
+
+This instance is maintained by Daniel Kahn Gillmor (actually a different person from the main author of the book, despite the similar name).

diff --git a/index.mdwn b/index.mdwn
index 6c8b8e7..09c3eea 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,4 @@
-[[AboutThisVersion This is a work in progress, and an experimental version at that]]
+[[AboutThisVersion]]
 
 Permission Taken: How We can Recapture Control of Our Own Technology and Communications
 ====

diff --git a/index.mdwn b/index.mdwn
index fdb5bea..6c8b8e7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,4 @@
-[AboutThisVersion This is a work in progress, and an experimental version at that]
+[[AboutThisVersion This is a work in progress, and an experimental version at that]]
 
 Permission Taken: How We can Recapture Control of Our Own Technology and Communications
 ====

diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..fdb5bea
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,75 @@
+[AboutThisVersion This is a work in progress, and an experimental version at that]
+
+Permission Taken: How We can Recapture Control of Our Own Technology and Communications
+====
+
+by Dan Gillmor
+
+Not many years ago, I was a happy acolyte in the Church of Apple. I
+spent most of the day using a Macintosh laptop. I used an iPhone. I
+had a Facebook account with hundreds of “friends,” and used Google’s
+search engine almost exclusively. While I worried about misuse of my
+information by third parties, I didn’t do much about it. I was so in
+love with technology that I adopted the latest and greatest without
+considering the consequences.
+
+I still love technology, and believe it plays a transformative role in
+our lives. But as I’ve learned more about how it works, and how
+powerful interests want it to work, the more I’ve realized the need to
+make some changes.
+
+So, today, I’m writing this on computer running Linux, the free and
+open operating system. I own an Android smartphone, modified to remove
+restrictions the manufacturer and carrier would prefer to impose. I
+have closed my Facebook account, and use search engines in much
+different ways. And I am much more cautious about what I’ll allow
+third parties to know about me and my activities.
+
+By making these and many related choices, I have made parts of my life
+slightly less easy, or at least less convenient. But I have gained
+something more important: liberty. I use the devices I purchase as I
+choose; I decline to live in the increasingly restricted environments
+that so many technology and communications companies have imposed on
+their customers.  And to the extent that I am able, I’m preventing
+snoops, corporate and governmental, from watching my every move
+without my consent. On balance, I believe, I’ve made my life better.
+
+That’s why I’m doing this project: to help you make your own decisions.
+
+My goal is simple: I’ll try to persuade you to do what I’m doing, or
+to go at least part of the way toward declaring your own
+independence. In the end, you may well prefer to stick with the
+conveniences of the Mac, Windows, iPhone and the rest. (I still use
+all of them for occasional bits of work.) But I hope you’ll at least
+consider what you’re giving up when you make those choices, not just
+what you gain. I want you to have open eyes and an open mind as you
+decide what you want technology to do for you, in the context of your
+own needs and your values.
+
+In this book, and on the accompanying website, I’ll tell you about the
+various options and methods to recapture some privacy and freedom in
+your use of technology (assuming you want them). In several of the
+most popular tools, such as the Linux operating system, I’ll provide a
+basic user’s guide to get you started.
+
+I’ll also note, where appropriate, the irony or maybe even hypocrisy
+inherent in some of my own choices. As a shareholder in Amazon and
+Netflix, I’ve invested in a certain amount of control-freakery. I’ve
+posted this outline, at least temporarily, as a Google Document, and
+am spreading word via Google+ and Twitter, in order to get as much
+participation as I can -- even though I may ultimately conclude that
+Google is itself a serious threat (I’m not there yet and may never
+be).
+
+Using Google to push this project forward is an almost perfect example
+of the convenience/effectiveness trade-offs. Occasionally, however,
+the tools I’ll describe will raise ethical and legal questions, not
+just issues of convenience and ease of use. In all cases, I’ll tell
+you about the trade-offs and dilemmas you will face if you move part
+or all of the way toward technological liberty.
+
+Why do I keep using the word “liberty,” anyway? Because this is truly
+about your freedoms. They are in jeopardy now, and the trajectory is
+not a positive one.
+
+

initial commit
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eecda60
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki