Merge branch 'dishub_updates' into 'master'

Dishub updates

See merge request disroot/howto!64

pages/10.DisHub/03.Connections/docs.en.md

@@ -58,13 +58,9 @@ These networks/protocols do not support account migration and location independe
 
 Some communications offer more than one protocol. If you wish to connect with somebody on Mastodon (for instance) they can use either the 'ostatus' or the 'activitypub' protocol for communication. Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but Hubzilla will often choose the first protocol it discovers and this may not be the one you want.
 
-You may connect with somebody over a specific protocol by prepending the protocol name in square brackets to their "webbie". For example
+You may connect with somebody over a specific protocol the same way you would add a contact on hubzilla, but changing his/her address to point to the right protocol instance.
 
-- [activitypub]https://foo.bar/foobar
-- [ostatus]foobar@foo.bar
-- [diaspora]foobar@foo.bar
-- [zot]foobar@foo.bar
-- [rss]https://foo.bar/foobar
+For example if you want to connect to a mastodon user: **username@mastodon.instance**.
 
 
 ### You want to connect with RSS feeds

pages/10.DisHub/05.Posts/02.Tags_and_mentions/docs.en.md

@@ -16,15 +16,12 @@ You can mention a person in a post, so that the mentioned channel receives a not
 
 !!! In the permission settings, **Can forward to all my channel connections via @+ mentions in posts.** must be allowed by a channel to be able to mention it.
 
-To use mention, simply add **@** before the channel name you want to mention. For example **@dishubuser+1813**.
+To use mention, simply add **@** before the channel name you want to mention. For example **@dishubuser**.
 
-The number is different for every user, every connection. If the channel you want to mention allows mentions, then an auto-complete box will appears, so you just have to click on the channel you want to mention.
-![mention](en/Mention.gif)
+You can mention someone using another protocol. For example to mention someone on mastodon: **@{username@mastodon.instance}**
 
 If you write the channel's name manually, if there are only one space in the channel's name, there will be no problem. So, **@Robert Johnson** will tag **Robert Johnson**. If there are more than one space, for example **Blind Lemon Jefferson**, you have to enclose the entire name in double quotes or change the spaces to underscores, **@"Blind Lemon Jefferson"** or **@Blind_Lemon_Jefferson**.
 
-**Important**: At the moment (05/27/2018), the @mention works only if you set a connection with the channel. But it should be available for any channel soon.
-
 ---
 
 ## Deliverable Mentions