Merge https://github.com/friendica/red into pending_merge

4 files changed, 20 insertions, 23 deletions

diff --git a/doc/Privacy.md b/doc/Privacy.md
index 1898f2a43..60e087e06 100644
--- a/doc/Privacy.md
+++ b/doc/Privacy.md
@@ -54,6 +54,15 @@ Comments to posts that were created by others and posts which are designated as
 
 RedMatrix developers will ensure that any content you provide which is designated as PRIVATE will be protected against eavesdropping - to the best of their ability. Private content is generally hidden or obscured even from hub administrators. It is also stripped from email notifications. It is difficult but NOT impossible for this content to be seen by a hub administrator who is determined to monitor your communications. We consider this like the lock on the door of a house. It will generally keep the house safe, but a determined burgler will ignore the lock on the door and instead break a window. 
 
+##Identity Privacy
+
+Privacy for your identity is another aspect. Because you have a decentralized identity in the Red Matrix, your privacy extends beyond your home hub. If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible.
+
+A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the Red Matrix network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking.
+
+* You can enable [Do Not Track (DNT)](http://donottrack.us/) in your web browser. We respect this new privacy policy proposal. All modern browsers support DNT. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of the Red Matrix. This setting is probably enough for most people.
+*You can [disable publication](settings) of your channel in our channel directory. If you want people to find your channel, you should give your channel address directly to them. We think this is a good indication that you prefer extra privacy and automatically enable "Do Not Track" if this is the case.
+* You can have a blocked hub. That means that all channels and content on that hub is not public, and not visible to the outside world. This is something only your hub administrator can do. We also respect this and automatically enable "Do Not Track" if it is set.
 
 ###Censorship
 
diff --git a/doc/comanche.bb b/doc/comanche.bb
index 2ab1d4337..d329cc34b 100644
--- a/doc/comanche.bb
+++ b/doc/comanche.bb
@@ -28,6 +28,10 @@ Currently there are three layout templates, unless your site provides additional
 			edgestwo - two column layout with fixed side margins

 			edgesthree - three column layout with fixed side margins

 			full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar

+
+	redable
+	 
+	A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column.
 

 [/code]

 

@@ -41,13 +45,16 @@ To choose a layout template, use the 'template' tag.
 To choose the "choklet" template with the "three" flavour:

 

 [code]

-	[template=three]choklet[/template]

+	[template=three]choklet[/template]
+[/code]
+	
+Or the "redable" (sic) template:
+
+[code]

+	[template]redable[/template]

 [/code]

 

 

-

-

-

 The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions.

 

 

diff --git a/doc/main.bb b/doc/main.bb
index c26075857..d67c18319 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -20,7 +20,6 @@ Zot is the great new communicaton protocol invented especially for the Red Matri
 [zrl=[baseurl]/help/channels]Channels[/zrl]

 [zrl=[baseurl]/help/first-post]Your first posting[/zrl]

 [zrl=[baseurl]/help/connecting_to_channels]Connecting To Other Channels[/zrl]

-[zrl=[baseurl]/help/privacy]Network Privacy[/zrl]
 [zrl=[baseurl]/help/permissions]Permissions And Encryption: You Are In Control[/zrl]

 [zrl=[baseurl]/help/cloud]Cloud Storage[/zrl]

 [zrl=[baseurl]/help/remove_account]Remove Account[/zrl]

diff --git a/doc/privacy.bb b/doc/privacy.bb
deleted file mode 100644
index fc05f55a8..000000000
--- a/doc/privacy.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-[b]Network Privacy[/b]
-
-Online privacy has many aspects. The Red Matrix let you control all these aspects. You can fine-tune the privacy of your posts, pages and other items in many ways; from making your content as public as possible to only sharing stuff with yourself. Permissions can be set for messages, web pages, events, photos, every item you can think of. If you make something private in the Red Matrix, it will be really private. [zrl=[baseurl]/help/permissions]See the permissions documentation[/zrl] for comprehensive help with permissions
-
-But privacy goes further than setting permissions for your items. Privacy for your identity is another aspect. Because you have a decentralized identity in the Red Matrix, your privacy extends beyond your home hub.
-
-If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible.
-
-A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the Red Matrix network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily opt-out of this low level and we think, harmless tracking.
-
-[ul]
-[li]You can enable [url=http://donottrack.us/]Do Not Track (DNT)[/url] in your web browser. We respect this new privacy policy proposal. All modern browsers support this. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of the Red Matrix. This setting is probably enough for most people.[/li]
-[li]You can [zrl=[baseurl]/settings]disable publication[/zrl] of your channel in our channel directory. If you want people to find your channel, you should give your channel address directly to them. We think this is a good indication that you prefer extra privacy and automatically enable "Do Not Track" if this is the case.[/li]
-[li]You can have a blocked hub. That means that all channels and content on that hub is not public, and not visible to the outside world. This is something only your hub administrator can do. We also respect this and automatically enable "Do Not Track" if it is set.[/li]
-[/ul]
-
-
-One more thing about hub administrators. Although the Red Matrix software can do everything to respect your privacy, your hub administrator is the one who has the final responsibility. If this admin has bad intentions, he/she can violate your privacy to a certain degree (something that counts for every internet service). So choose wisely, make sure you trust your hub admin or make all your messages encrypted. And again: you can always run your own hub.