Bugfix for Parameter mismatch

[friendica.git] / doc / Developers-Intro.md

diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 3cda8ab4662b96bac0a3a5c75b3c5df025cfe9e3..0707d5ba51cadd9cb293424b45ddb8669e92bd9d 100644 (file)
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@@ -15,14 +15,14 @@ Contact us
 
 The discussion of Friendica development takes place in the following Friendica forums:
 
 
 The discussion of Friendica development takes place in the following Friendica forums:
 

-* The main [forum for Friendica development](https://helpers.pyxis.uberspace.de/profile/developers)
+* The main [forum for Friendica development](https://forum.friendi.ca/profile/developers)

 * The [forum for Friendica theme development](https://friendica.eu/profile/ftdevs)
 
 Help other users
 ---
 
 Remember the questions you had when you first tried Friendica?
 * 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).
+A good place to start can be to help new people find their way around Friendica in the [general support forum](https://forum.friendi.ca/prufile/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.
 
 Translation
 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.
 
 Translation


@@ -64,6 +64,7 @@ Here's a few primers if you are new to Friendica or to the PSR-2 coding standard
  * By default, strings are enclosed in single quotes, but feel free to use double quotes if it makes more sense (SQL queries, adding tabs and line feeds).
  * Operators are wrapped by spaces, e.g. `$var === true`, `$var = 1 + 2` and `'string' . $concat . 'enation'`
  * Braces are mandatory in conditions
  * By default, strings are enclosed in single quotes, but feel free to use double quotes if it makes more sense (SQL queries, adding tabs and line feeds).
  * Operators are wrapped by spaces, e.g. `$var === true`, `$var = 1 + 2` and `'string' . $concat . 'enation'`
  * Braces are mandatory in conditions

+ * Boolean operators are `&&` and `||` for PHP conditions, `AND` and `OR` for SQL queries

  * No closing PHP tag
  * No trailing spaces
 
  * No closing PHP tag
  * No trailing spaces
 


@@ -125,7 +126,7 @@ 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.
 * 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://helpers.pyxis.uberspace.de/profile/developers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
+* Let us know about your plans [in the dev forum](https://forum.friendi.ca/profile/developers) or the [theme developer forum](https://friendica.eu/profile/ftdevs).

 Do not worry about cross-posting.
 
 ###Client software
 Do not worry about cross-posting.
 
 ###Client software