aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-17 17:26:41 -0800
committerfriendica <info@friendica.com>2013-11-17 17:26:41 -0800
commit772e3795bf1513b5f8ac3ab520c6c8cdb68de3af (patch)
tree97faf04633f5b2c207a7e147c2653e0b59c0dafe /doc
parentd6a3465a5b462ad2f29454d6331e1efae03e6166 (diff)
downloadvolse-hubzilla-772e3795bf1513b5f8ac3ab520c6c8cdb68de3af.tar.gz
volse-hubzilla-772e3795bf1513b5f8ac3ab520c6c8cdb68de3af.tar.bz2
volse-hubzilla-772e3795bf1513b5f8ac3ab520c6c8cdb68de3af.zip
typo
Diffstat (limited to 'doc')
-rw-r--r--doc/Features.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Features.md b/doc/Features.md
index f4b26a647..addc57704 100644
--- a/doc/Features.md
+++ b/doc/Features.md
@@ -9,7 +9,7 @@ Remove posts/comments and/or private messages at a future time. An extra button
**Multiple Profiles**
-The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secodnary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned.
+The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned.
**Web Pages**
@@ -42,11 +42,11 @@ Allows previewing posts and comments exactly as they would look on the page befo
**Channel Sources**
-Automatically import channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the author/owner must give you permission to source their channel.
+Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel.
**Even More Encryption**
-Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content end-to-end with a shared secret key. How the recipient learns the key is up to you. You can provide a hint such as "the name of aunt Claire's first dog".
+Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog".
**Search by Date**