Merge remote branch 'upstream/master'

7 files changed, 43 insertions, 25 deletions

diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index 5791dce78..48584764a 100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -18,7 +18,7 @@ Please provide your full name as you would like it to be displayed on this syste
 
 *Email Address*
 
-Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these once from your Settings page once you have logged in.     
+Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.     
 
 *Nickname*
 
diff --git a/doc/Connectors.md b/doc/Connectors.md
index 9b2430d09..6bbf15b2c 100644
--- a/doc/Connectors.md
+++ b/doc/Connectors.md
@@ -20,6 +20,12 @@ Instructions For Connecting To People On Specific Services
 
 You may connect by providing your Identity Address on the 'Connect' page of any Friendika member. You may also put their Identity Address into the Connect box on your [Contacts](contacts) page. 
 
+
+**Diaspora**
+
+Add the Diaspora 'handle' to the 'Connect/Follow' text box on your [Contacts](contacts) page. 
+
+
 **Identi.ca/StatusNet/GNU-Social**
 
 These are described as the "federated social web" or OStatus contacts. 
@@ -45,10 +51,6 @@ This will allow you to _connect_ with millions of pages on the internet. All tha
 
 To follow a Twitter member, put the URL of the Twitter member's main page into the Connect box on your [Contacts](contacts) page. To reply, you must have the Twitter connector installed, and reply using your own status editor. Begin the message with @twitterperson replacing with the Twitter username.
 
-**Diaspora**
-
-To follow a Diaspora member, put either the URL or the pod address (Identity Address) of the Diaspora member into the Connect box on your [Contacts](contacts) page. It is not currently possible to reply to Diaspora members. This will be provided in a future release (once the Diaspora communication protocols stabilise and are published). 
-
 **Email**
 
 Configure the email connector from your [Settings](settings) page. Once this has been done, you may enter an email addres to connect with using the Connect box on your [Contacts](contacts) page. They must be the sender of a message which is currently in your INBOX for the connect to succeed. You may include email contacts in private conversations.
diff --git a/doc/Developers.md b/doc/Developers.md
index ebfaf97c3..744a76a8b 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -7,7 +7,7 @@ doing development.
 
 Create your own github account.
 
-You may fork/clone the Friendika repository from [https://github.com/friendika/friendika.git](https://github.com/friendika/friendika.git).
+You may fork/clone the Friendika repository from [https://github.com/friendika/Free-Friendika.git](https://github.com/friendika/Free-Friendika.git).
 
 Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/)
 to create and use your own tracking fork on github
diff --git a/doc/Install.md b/doc/Install.md
index 3538d7bfa..b5ab1ef6f 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -36,14 +36,28 @@ you might have trouble getting everything to work.]
 
     - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be 
 
-    `git clone http://github.com/friendika/friendika.git mywebsite`
-
-    and then you can pick up the latest changes at any time with
-
-    `git pull`
-
-
- 
+        `git clone https://github.com/friendika/Free-Friendika.git mywebsite`
+
+    - and then you can pick up the latest changes at any time with
+
+        `git pull`
+    
+    - For installing addons
+    
+        - First you should be **on** your website folder
+        
+            `cd mywebsite`
+            
+        - Then you should clone the addon repository (separtely)
+        
+            `git clone https://github.com/friendika/friendika-addons.git addon`
+            
+        - For keeping the addon tree updated, you should be on you addon tree and issue a git pull
+        
+            `cd mywebsite/addon`
+            
+            `git pull`
+            
     - If you copy the directory tree to your webserver, make sure
     that you also copy .htaccess - as "dot" files are often hidden
     and aren't normally copied.
diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md
index c8fc8e790..cb56383ce 100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
@@ -12,7 +12,7 @@ All three of these plugins require an account on the target network. In addition
 
 **Site Configuration**
 
-Plugins must be installed by the site administrator before they can be use. This is accomplished through the site
+Plugins must be installed by the site administrator before they can be used. This is accomplished through the site
 configuration file ".htconfig.php".
 
 The configuration directive looks like:
@@ -84,7 +84,7 @@ To get the OAuth Consumer key pair the user has to
 (a) ask her Friendika admin if a pair already exists or 
 (b) has to register the Friendika server as a client application on the StatusNet server. 
 
-This can be done from the account settings under "Settings -> Connections -> Register an OAuth client application -> Register new application".
+This can be done from the account settings under "Settings -> Connections -> Register an OAuth client application -> Register a new application".
 
 During the registration of the OAuth client remember the following:
 
@@ -133,8 +133,8 @@ d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set Site URL
 to yoursubdomain.yourdomain.com.  Set Site Domain to your yourdomain.com.
 
 
-Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
-and click 'Install Facebook Connector'.
+Visit the Facebook Settings section of the "Settings->Plugin Settings" page. 
+And click 'Install Facebook Connector'.
 
 This will ask you to login to Facebook and grant permission to the
 plugin to do its stuff. Allow it to do so.
diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md
index 4bb05872e..70c7731cc 100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -29,19 +29,21 @@ You can also use your Identity Address or other people's Identity Addresses to b
 
 If you have supplied your mailbox connection information on your Settings page, you can enter the email address of anybody that has sent you a message recently and have their email messages show up in your social stream. You can also reply to them from within Friendika.  
 
-People can also become friends with you from other networks. 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. 
+People can also become friends with you from other networks. 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. A similar mechanism is available for Diaspora members, by putting your iendtity address into their search bar. 
 
-If this happens you will receive a notification. You will need to approve this before the friendship is complete.
+Note: Some versions of StatusNet software may require the full URL to your profile and may not work with the identity address.
 
-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. 
+When somebody requests friendship you will receive a notification. You will need to approve this before the friendship is complete.
 
-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. 
+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. 
 
-When you receive a friendship notification from another Friendika member, you will have the option of allowing them as a "fan" or as a "friend". If they are a fan, they can see what you have to say, including private communications that you send to them, but not vice versa. As a friend, you can both communicate with each other.
+When you receive a friendship notification from another Friendika member, you will have the option of allowing them as a "fan" or as a "friend". If they are a fan, they can see what you have to say, including private communications that you send to them, but not vice versa. As a friend, you can both communicate with each other. 
+
+Diaspora uses a different terminology, and you are given the option of allowing them to "share with you",  or being full friends. 
 
 Once you have become friends, if you find the person constantly sends you spam or worthless information, you can "Ignore" them - without breaking off the friendship or even alerting them to the fact that you aren't interested in anything they are saying. In many ways they are like a "fan" - but they don't know this. They think they are a friend. 
 
-You can also "block" a person. This completely blocks communications with that person. They may still be able to see your public posts, as can anybody in the world, but they cannot communicate with you directly in any way.  They will know or be able to discover that they have been blocked but there's nothing they can do about it. 
+You can also "block" a person. This completely blocks communications with that person. They may still be able to see your public posts, as can anybody in the world, but they cannot communicate with you directly. 
 
 You can also delete a friend no matter what the friendship status - which complete removes everything relating to that person from your website. 
 
diff --git a/doc/Profiles.md b/doc/Profiles.md
index 631a4331b..45db9b9ca 100644
--- a/doc/Profiles.md
+++ b/doc/Profiles.md
@@ -43,7 +43,7 @@ Although you may have multiple profiles, you only have one profile photo. This i
 
 On the site Directory page, you may search for people with published profiles who are on this site. The search is typically for your nickname or part of your full name. However this search will also match against other profile fields - such as gender, location, "about", work, and education. You may also include "Keywords" in your default profile - which may be used to search for common interests with other members. You have two sets of keywords available - public and private. Private keywords are *not* visible to anybody. You could use these keywords to locate people who share membership in secret societies, or that share a love of fishing (for example) - without making this information visible on your public profile. Public keywords are used in the friend suggestion tool and although they aren't readily visible, they may be seen by viewing the HTML of your profile page.
 
-Directory searches are also able to use "boolean" logic so that you can search for "+lesbian +Florida" and find those who's sexual preference (or keywords) contain the world "lesbian" and that live in Florida. See the section on "Topical Tags" on the [[Tags-and-Mentions]] page for more information on performing boolean searches. 
+Directory searches are also able to use "boolean" logic so that you can search for "+lesbian +Florida" and find those who's sexual preference (or keywords) contain the world "lesbian" and that live in Florida. See the section on "Topical Tags" on the [Tags-and-Mentions](help/Tags-and-Mentions) page for more information on performing boolean searches. 
 
 On your Contacts page is a link to "Find People with Shared Interests" (unless your site administrator has disabled the global directory). This will combine both your public and private keywords, and find people in the global directory who have matching and/or similar keywords. (Your private keywords are not identified or stored on the global directory). The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance. You may discover that you are the first person on the list - because you are very likely the most relevant match for your keywords in the directory.