aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-05 20:35:46 -0700
committerFriendika <info@friendika.com>2011-05-05 20:35:46 -0700
commit34f3cb68a67110fc75fedca7e5aeb70ab3f9aa4f (patch)
treee79ab46551d89bb0d24694c5706bfbb5ed9b209d
parent26d748f6d8d7616b4a337350df69898716ec043e (diff)
downloadvolse-hubzilla-34f3cb68a67110fc75fedca7e5aeb70ab3f9aa4f.tar.gz
volse-hubzilla-34f3cb68a67110fc75fedca7e5aeb70ab3f9aa4f.tar.bz2
volse-hubzilla-34f3cb68a67110fc75fedca7e5aeb70ab3f9aa4f.zip
document the end-user steps needed to use optional Facebook connector
-rw-r--r--boot.php2
-rw-r--r--doc/Account-Basics.md11
2 files changed, 12 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index cddba996c..b3dd8635c 100644
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.1.969' );
+define ( 'FRIENDIKA_VERSION', '2.1.970' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 );
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index c7be3ebd4..359e9165e 100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -54,6 +54,17 @@ Otherwise, enter your password. This will have been initially provided in your r
After your first login, please visit the 'Settings' page from the top menu bar and change your password to something that you will remember.
+**Facebook Connector**
+
+The Facebook connector is a plugin/addon which allows you to interact with friends on Facebook from within Friendika. If enabled, your Facebook friend list will be imported, and you will see and be able to respond to Facebook posts. Facebook members may also be added to private conversation groups.
+
+Assuming the Facebook plugin/addon has been installed on your system, it can be enabled by going to your Settings page, clicking "Plugin Settings" near the top of the page, and then select "Facebook Connector Settings" on that page. This will only appear if the Facebook plugin/addon has been installed. Follow the instruction to install or remove the Facebook connector.
+
+You may also choose whether your public postings are posted to Facebook by default. You may toggle this setting at any time from the Permissions settings of the status post editor (click the lock icon). This setting has no effect on private conversations - which will always be delivered to Facebook friends who are included in the permissions.
+
+(Note: At this time, Facebook contacts will not be able to view any private photos. This will be resolved in a future release. They may however see any public photos you have uploaded.)
+
+
**See Also**
* [Profiles](help/Profiles)