Merge pull request #1263 from silke/documentation

Documentation

doc/Developers-Intro.md

@@ -0,0 +1,50 @@
+Where to get started to help improve Friendica?
+===============================================
+
+* [Home](help)
+
+Do you want to help us improve Friendica? Here we have compiled some hints on how to get started and some tasks to help you choose. A project like Friendica is the sum of many different contributions. **Very different skills are required to make good software. Some of them involve coding, others do not.** We are looking for helpers in all areas, whether you write text or code, whether you spread the word to convince people or design new icons. Whether you feel like an expert or like a newbie - join us with your ideas!
+
+**Contact us**
+
+The discussion of Friendica development takes place in the following Friendica forums:
+
+* The main [forum for Friendica development](https://friendika.openmindspace.org/profile/friendicadevelopers)
+* The [forum for Friendica theme development](https://friendica.eu/profile/ftdevs)
+
+**Help other users**
+
+Remember the questions you had when you first tried Friendica? A good place to start can be to help new people find their way around Friendica in the [general support forum](https://helpers.pyxis.uberspace.de/profile/helpers). Welcome them, answer their questions, point them to documentation or ping other helpers directly if you can't help but think you know who can.
+
+**Translations**
+
+The documentation contains help on how to translate Friendica in the /help/translations page.
+
+* Check if the user interface has already been translated to your language.
+* If not, we might want to start with translating the /help pages.
+
+**Design**
+
+Are you good at designing things? If you have seen Friendica you probably have ideas to improve it, haven't you?
+
+* Make plans for a better Friendica interface design and share them with us.
+* Tell us if you are able to realize your ideas or what kind of help you need. We can't promise we have the right skills in the group but we'll try.
+* Choose a thing to start with, e.g. work on the icon set of your favourite theme
+
+**Programming**
+
+* **Issues:** Have a look at our issue tracker on gihub!
+	* Try to reproduce a bug that needs more inquries and write down what you find out.
+	* If a bug looks fixed, ask the bug reporters for feedback to find out if the bug can be closed.
+	* Fix a bug if you can.
+
+* **Web interface:** The thing many people want most is a better interface, preferably a responsive Friendica theme. This is a piece of work! If you want to get involved here:
+	* Look at the first steps that were made (e.g. the clean theme). Ask us to find out whom to talk to about their experiences.
+	* Talk to design people if you know any.
+	* Let us know about your plans [in the dev forum](https://friendika.openmindspace.org/profile/friendicadevelopers) and the [theme developer forum](https://friendica.eu/profile/ftdevs). Do not worry about cross-posting.
+
+* **Client software:** There are free software clients that do somehow work with Friendica but most of them need love and maintenance. Also, they were mostly made for other platforms using the StatusNet API. This means they lack:w
+ the features that are really specific to Friendica. Popular clients you might want to have a look at are:
+	* [Hotot (Linux)](http://hotot.org/) - abandoned
+	* [Friendica for Android](https://github.com/max-weller/friendica-for-android) - abandoned
+	* You can find more working client software in [Wikipedia](https://en.wikipedia.org/wiki/Friendica).

doc/Developers.md

@@ -1,23 +0,0 @@
-Friendica Developer Guide
-===================
-
-**Here is how you can join us.**
-
-First, get yourself a working git package on the system where you will be
-doing development.
-
-Create your own github account.
-
-You may fork/clone the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.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
-
-Then go to your github page and create a "Pull request" when you are ready
-to notify us to merge your work.
-
-**Important**
-
-Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
-
-Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Friendica developer to review the code. 

doc/Github.md

@@ -0,0 +1,36 @@
+Friendica on Github
+===================
+
+* [Home](help)
+
+**Here is how you can work on the code with us**
+
+1. Install git on the system you will be developing on.
+2. Create your own [github](https://github.com) account.
+3. Fork the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.git).
+4. Clone your fork from your Github account to your machine. 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
+5. Commit your changes to your fork. Then go to your github page and create a "Pull request" to notify us to merge your work.
+
+**Branches**
+
+There are two branches in the main repo on Github:
+
+1. master: This branch contains stable releases only.
+2. develop: This branch contains the latest code. This is what you want to work with.
+
+**Important**
+
+Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
+
+Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Friendica developer to review the code. 
+
+**Vagrant**
+
+[Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers. No need to setup up a webserver etc. before actually starting. Vagrant creates a virtual machine (an Ubuntu 12.04) for you that you can just run inside VirtualBox and start to work directly on Friendica. What you need to do:
+
+1. Install VirtualBox and vagrant.
+2. git clone Friendica (note the Vagrantfile inside).
+3. Run vagrant up, have some patience.
+4. Run vagrant ssh to log into the virtual machine.
+5. It depends on the network setup of your host and virtual box guest how you reach the friendica web interface of the VM.
+

doc/Home.md

@@ -1,7 +1,7 @@
 Friendica Documentation and Resources
 =====================================
 
-**Contents**
+**User Manual**
 
 * General functions - first steps
 	* [Account Basics](help/Account-Basics)
@@ -10,7 +10,7 @@ Friendica Documentation and Resources
         * [BBCode tag reference](help/BBCode)
 	* [Comment, sort and delete posts](help/Text_comment)
 	* [Profiles](help/Profiles)
-* You and other user
+* You and other users
 	* [Connectors](help/Connectors)
 	* [Making Friends](help/Making-Friends)
 	* [Groups and Privacy](help/Groups-and-Privacy)
@@ -19,12 +19,11 @@ Friendica Documentation and Resources
 	* [Chats](help/Chats)
 * Further information
 	* [Improve Performance](help/Improve-Performance)
-	* [Move Account](help/Move-Account)
+	* [Move your account](help/Move-Account)
-	* [Remove Account](help/Remove-Account)
+	* [Delete your account](help/Remove-Account)
-	* [Bugs and Issues](help/Bugs-and-Issues)
 	* [Frequently asked questions (FAQ)](help/FAQ)
 
-**Technical Documentation**
+**Admin Manual**
 
 * [Install](help/Install)
 * [Settings](help/Settings)
@@ -32,10 +31,14 @@ Friendica Documentation and Resources
 * [Installing Connectors (Facebook/Twitter/StatusNet)](help/Installing-Connectors)
 * [Message Flow](help/Message-Flow)
 * [Using SSL with Friendica](help/SSL)
-* [Developers](help/Developers)
 * [Twitter/StatusNet API Functions](help/api)
-* [Translation of Friendica](help/translations)
 
+**Developer Manual**
+
+* [Where to get started?](help/Developers-Intro)
+* [Help on Github](help/Github)
+* [How to translate Friendica](help/translations)
+* [Bugs and Issues](help/Bugs-and-Issues)
 
 **External Resources**