aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-14 20:37:42 -0700
committerFriendika <info@friendika.com>2011-04-14 20:37:42 -0700
commit44c47f118c20a22c1540c6c88823b48a357e5ca3 (patch)
treef2332bbfec210ca17c2ffb489ebf1b575262e593 /doc
parentb5ccb8e2055bf08d282ebb0cba2cac0d850fdc5a (diff)
downloadvolse-hubzilla-44c47f118c20a22c1540c6c88823b48a357e5ca3.tar.gz
volse-hubzilla-44c47f118c20a22c1540c6c88823b48a357e5ca3.tar.bz2
volse-hubzilla-44c47f118c20a22c1540c6c88823b48a357e5ca3.zip
"profile locator/address" is now called "Identity Address" to reduce confusion
Diffstat (limited to 'doc')
-rw-r--r--doc/Making-Friends.md12
-rw-r--r--doc/Tags-and-Mentions.md2
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md
index 135f1394a..64f2c53fb 100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -9,7 +9,7 @@ The first thing you can do is look at the Directory for somebody you would like
Click that. It will take you to a "Connect" form.
-This is going to ask you for your profile locator. This is necessary so that this person's website can find yours.
+This is going to ask you for your Identity Address. This is necessary so that this person's website can find yours.
What do you put in the box?
@@ -19,19 +19,19 @@ Notice this looks just like an email address. It was meant to be that way. It's
You *could* also put in the URL of your profile page, such as "http://demo.friendika.com/profile/bob".
-The email-style locator is certainly easier.
+The email-style address is certainly easier.
When you've submitted the connection page, it will take you back to your own site where you must then login (if necessary) and verify the connection request on *your* site. Once you've done this, the two websites can communicate with each other to complete the process (after your new friend has approved the request).
-If you already know somebody's profile location, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
+If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
-You can also use your profile locator or other people's profile locators to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks. (Or you can put in Bob's profile URL if you wish). You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendika.
+You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks. (Or you can put in the URL to Bob's identi.ca page if you wish). You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendika.
-This works from other networks as well. If a friend of yours has an identi.ca account, they can become friends with you by putting your Friendika profile locator into their identi.ca subscription dialog box.
+This works from other networks as well. If a friend of yours has an identi.ca account, they can become friends with you by putting your Friendika Identity Address into their identi.ca subscription dialog box.
If this happens you will receive a notification. You will need to approve this before the friendship is complete.
-Some networks allow people to send you messages without being friends and without your approval. Friendika does not allow this by default. It would open a gateway for spam. So when you've approved a friend request from one of these networks, look at your contact page for that person (this will be displayed as soon as you approve the relationship). They might be marked as an "Ignored" contact.
+Some networks allow people to send you messages without being friends and without your approval. Friendika does not allow this by default, as it would open a gateway for spam. So when you've approved a friend request from one of these networks, look at your contact page for that person (this will be displayed as soon as you approve the relationship). They might be marked as an "Ignored" contact.
This means they can see some of your posts (your public posts), but they aren't permitted to send you anything. You can "Un-ignore" them if you desire to allow them to contact you directly and to have their status updates appear in your Network feed.
diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index d5880254b..404da7465 100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -15,7 +15,7 @@ The following are various ways of indicating a person:
* @mike - indicates a known contact in your social circle whose nickname is "mike"
* @mike_macgirvin - indicates a known contact in your social circle whose full name is "Mike Macgirvin". Note that spaces cannot be used inside tags.
-* @mike@macgirvin.com - indicates the profile locator of a person on a different network, or one that is *not* in your social circle. This can only be an email-style locator, not a web URL.
+* @mike@macgirvin.com - indicates the Identity Address of a person on a different network, or one that is *not* in your social circle. This can only be an email-style locator, not a web URL.
Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts. Please note that Friendika often blocks incoming "mentions" from other networks and especially from people with no relationship to you. This is a spam prevention measure.