aboutsummaryrefslogtreecommitdiffstats
path: root/doc/network.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/network.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/network.md')
-rw-r--r--doc/network.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/network.md b/doc/network.md
new file mode 100644
index 000000000..f445b0055
--- /dev/null
+++ b/doc/network.md
@@ -0,0 +1,9 @@
+This is your Network Tab. If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.
+
+This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
+
+Now we need to fill it up, the first step, is to <a href = "/help/peopleyouknow"> add people you already know from Facebook</a>.
+
+<iframe src="/network" width="950" height = "600"></iframe>
+
+