Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

6 files changed, 8 insertions, 8 deletions

diff --git a/doc/addons.bb b/doc/addons.bb
index a37ecee99..4bfa7a9fd 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -106,7 +106,7 @@ For these reasons we [b]strongly recommend[/b] that you do NOT install addons fr
 We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. 
 
 
-[url=https://framagit.org/hubzilla/core/-addons]https://framagit.org/hubzilla/core/-addons[/url] Main project addon repository
+[url=https://framagit.org/hubzilla/addons]https://framagit.org/hubzilla/addons[/url] Main project addon repository
 
 [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip)
 
diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md
index e966115d0..34dfa8cad 100644
--- a/doc/admin/administrator_guide.md
+++ b/doc/admin/administrator_guide.md
@@ -396,7 +396,7 @@ To immediately clear out all the extra logging stuff you added.  Use the informa
 
 ##### Rotating log files
 
-1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/core/-addons) repo
+1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/addons) repo
 1. Create a directory in your web root called `log` with webserver write permissions
 1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files.
 
diff --git a/doc/ca/general.bb b/doc/ca/general.bb
index 3e46b6136..fb54f0abc 100644
--- a/doc/ca/general.bb
+++ b/doc/ca/general.bb
@@ -7,7 +7,7 @@
 
 [url=https://framagit.org/hubzilla/core/]Lloc Web Principal[/url]
 
-[url=https://framagit.org/hubzilla/core/-addons]Complements del Lloc Web[/url]
+[url=https://framagit.org/hubzilla/addons]Complements del Lloc Web[/url]
 
 [url=[baseurl]/help/credits]Credits en $Projectname[/url]
 
diff --git a/doc/de/general.bb b/doc/de/general.bb
index 3168c4d9b..2ce5533f1 100644
--- a/doc/de/general.bb
+++ b/doc/de/general.bb
@@ -6,7 +6,7 @@
 [zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl]
 
 [url=https://framagit.org/hubzilla/core/]Haupt-Website[/url]
-[url=https://framagit.org/hubzilla/core/-addons]Addons-Website[/url]
+[url=https://framagit.org/hubzilla/addons]Addons-Website[/url]
 
 [url=[baseurl]/help/credits]$Projectname Credits[/url]
 
diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb
index d07b20574..3e98c6ec3 100644
--- a/doc/dev_beginner.bb
+++ b/doc/dev_beginner.bb
@@ -174,8 +174,8 @@ It is a good idea to read the whole manual! Git is different to other version co
 Now you should

 [list]

 [*] create an account at github.com

-[*] fork https://framagit.org/hubzilla/core/

-[*] fork https://framagit.org/hubzilla/core/-addons

+[*] fork https://framagit.org/hubzilla/core

+[*] fork https://framagit.org/hubzilla/addons

 [/list]

 

 If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector".

@@ -416,4 +416,4 @@ surfer@debian:/var/www$ git push
 [/code]

 

 

-#include doc/macros/main_footer.bb;
\ No newline at end of file
+#include doc/macros/main_footer.bb;

diff --git a/doc/general.bb b/doc/general.bb
index ecdaf1dfd..0b80db756 100644
--- a/doc/general.bb
+++ b/doc/general.bb
@@ -7,7 +7,7 @@
 [h3]External resources[/h3]
 [zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl]
 [url=https://framagit.org/hubzilla/core/]Main Website[/url]
-[url=https://framagit.org/hubzilla/core/-addons]Addon Website[/url]
+[url=https://framagit.org/hubzilla/addons]Addon Website[/url]
 [url=[baseurl]/help/credits]$Projectname Credits[/url]
 [h3]About this $Projectname hub[/h3]
 [zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]