Merge pull request #1292 from silke/develop

Script now installs missing add-apt-repository tool.

diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index 2c3c05e8bf44f1ec1dc64885af398e48e5373a76..91e19b64933600e937557f344601daf85985e418 100644 (file)
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -59,7 +59,7 @@ After your first login, please visit the 'Settings' page from the top menu bar a
 
 **Getting Started**
 
-A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information.
+A ['Tips for New Members'](newmember) link will show up on your network and home pages for two weeks to provide some important Getting Started information.
 
 
 **Retrieving Personal Data**

diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index 251f91e9361ee59527d3839e5675a392d76e442b..c9f845c001602c1fcc7f296dcdd8d4a7af7922b9 100644 (file)
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -11,21 +11,3 @@ If you're a technical user, or your site doesn't have a support page, you'll nee
 Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible.  It's generally better to provide too much information than not enough.
 
 <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">See this article</a> to learn more about submitting **good** bug reports.
-
-
-**Bug Sponsorship**
-
-If you find a bug, and it is caused by a problem in main branch (ie, is not specific to our site), you may sponsor it.
-
-The bug/issue database allows you to sponsor issues. This provides an incentive for developers to work on your issue. This isn't necessary - we don't like bugs and will try to fix them. This has more importance for future development projects and feature requests.
-
-Bug sponsorship works on the honour system. If you agree to pay $10 to fix a bug, when the fix has been checked in and verified you should send a paypal payment to the developer assigned to the bug. Don't ever think you can get away with not paying a developer for work performed. Some of these guys could hack into your credit card account if you make them mad.
-
-At the present time, one has to be approved as a "developer" to be able to assign themselves to a sponsored bug. This requires the developer to have some history fixing Friendica bugs. This is for everybody's assurance that the bug fix will work well with Friendica. If you wish to become approved as a developer, work on and check in some non-sponsored issues or your own projects and we will move you up the ladder.
-
-If you truly feel you have the solution to a sponsored bug but aren't an approved developer, you risk a sponsored developer assigning the bug to themselves before you check it in, but if they haven't done so - include a short note with your pull request. Assuming that it meets our code standards, we'll see that you get credit. 
-
-If you sponsor a project at greater than a $50 level, you may be requested by the developer for payment up front before work has begun (typically half). Again this is on the honour system - and is mostly to avoid payment issues and disagreements later. You should also expect to see some progress updates or demonstrations if the work takes more than a week or two. If the work is not completed within a reasonable time (as decided by those involved), you are entitled to get your money back. 
-
-Friendica is not involved in these transactions. It is purely a personal agreement between sponsors and developers. If there are any issues, the parties will need to work it out between themselves. We're just providing some guidelines to help avoid potential problems.     
-

diff --git a/doc/Github.md b/doc/Github.md
index a59f574cfbd4e10fbfc235f80f77d32b03defb8f..efee32d5baa9b3a4c2842cebeefdc56320f1559f 100644 (file)
--- a/doc/Github.md
+++ b/doc/Github.md
@@ -24,13 +24,5 @@ Please pull in any changes from the project repository and merge them with your
 
 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.
+Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!
 

diff --git a/doc/Home.md b/doc/Home.md
index 62fd216659ce8195f930e42ab13a7e7e048c944e..031bec8058a8af3a6e803ba6fa7fc9961bc028e5 100644 (file)
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -37,6 +37,7 @@ Friendica Documentation and Resources
 
 * [Where to get started?](help/Developers-Intro)
 * [Help on Github](help/Github)
+* [Help on Vagrant](help/Vagrant)
 * [How to translate Friendica](help/translations)
 * [Bugs and Issues](help/Bugs-and-Issues)
 

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
new file mode 100644 (file)
index 0000000..dec8112
--- /dev/null
+++ b/doc/Vagrant.md
@@ -0,0 +1,15 @@
+Vagrant for Friendica Developers
+===================
+
+* [Home](help)
+
+[Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers. No need to setup up a webserver, database 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 your Friendica repository. Inside, you'll find a "Vagrantfile" and some scripts in the utils folder.
+3. Run "vagrant up" from inside the friendica clone. Be patient: When it runs for the first time, it downloads an Ubuntu Server image.
+4. Run "vagrant ssh" to log into the virtual machine to log in to the VM.
+5. Open 192.168.22.10 in a browser to finish the Friendica installation. The mysql database is called "friendica", the mysql user and password both are "root".
+6. Work on Friendica's code in your git clone on your machine (not in the VM).
+7. Check the changes in your browser in the VM. Debug via the "vagrant ssh" login.
+8. Commit and push your changes directly back to Github.