aboutsummaryrefslogtreecommitdiffstats
path: root/doc/peopleyouknow.md
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-01 23:56:13 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-01 23:56:13 -0400
commit5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch)
tree5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /doc/peopleyouknow.md
parent9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff)
parent5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff)
downloadvolse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz
volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2
volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: add title to D* posts allow users to set categories on their posts Modified peopleyouknow to handle sites without Facebook better diabook-themes: add link to global dir in "find friends" at right_aside modified: mod/newmember.php New user quick start. check for style.php existence before inclusion Moved Diaspora notes away from top, per user request * master:
Diffstat (limited to 'doc/peopleyouknow.md')
-rw-r--r--doc/peopleyouknow.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md
new file mode 100644
index 000000000..143c49217
--- /dev/null
+++ b/doc/peopleyouknow.md
@@ -0,0 +1,13 @@
+This is your connector settings page. If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.
+
+This is the bit that makes Friendica unique. You can connect to <i>anybody on the internet</i> from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages.
+
+The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can <a href = "https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="new">fine tune this</a> or experiment with the other connectors too. If you need help, you can always ask at <a href = "http://helpers.pyxis.uberspace.de/profile/helpers" target="new">Friendica Support</a> or <a href = "/help/Connectors" target="new">see the instructions here</a>.
+
+When you're ready, we can move on to <a href = "/help/makingnewfriends">making new friends</a>.
+
+
+
+<iframe src="/settings/connectors" width="950" height = "600"></iframe>
+
+