aboutsummaryrefslogtreecommitdiffstats
path: root/doc/features.bb
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-09-17 19:25:36 +0200
committerMario Vavti <mario@mariovavti.com>2015-09-17 19:25:36 +0200
commitd9e83eb53a866b755fd516dc28949177d213fa0c (patch)
tree5c5e9739bc9db91d0d6099df21ca004248ef74ae /doc/features.bb
parent1cf404177dc3824096e724308f4e26716b6e2c8d (diff)
parented9ffec5bafbf3831701f8a703dbf1867b3c7ff5 (diff)
downloadvolse-hubzilla-d9e83eb53a866b755fd516dc28949177d213fa0c.tar.gz
volse-hubzilla-d9e83eb53a866b755fd516dc28949177d213fa0c.tar.bz2
volse-hubzilla-d9e83eb53a866b755fd516dc28949177d213fa0c.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'doc/features.bb')
-rw-r--r--doc/features.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/features.bb b/doc/features.bb
index 54c587282..06b7fb6b0 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -190,7 +190,7 @@ When creating &quot;Websites&quot;, content may be entered in HTML, Markdown, BB
Any content created in $Projectname remains under the control of the member (or channel) that originally created it. At any time, a member can delete a message, or a range of messages. The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot ($Projectname communication and authentication protocol).
[b]Media[/b]
-Similar to any other modern blogging system, social network, or a micro-blogging service,$Projectname supports the uploading of files, embedding of videos, linking web pages.
+Similar to any other modern blogging system, social network, or a micro-blogging service, $Projectname supports the uploading of files, embedding of videos, linking web pages.
[b]Previewing/Editing[/b]
Post can be previewed prior to sending and edited after sending.