Merge branch 'master' into newdirectives

1 files changed, 19 insertions, 11 deletions

diff --git a/docs/contributing/issues-features.rst b/docs/contributing/issues-features.rst
index 3a1738d7..1c6563b9 100644
--- a/docs/contributing/issues-features.rst
+++ b/docs/contributing/issues-features.rst
@@ -1,10 +1,14 @@
 .. _issues_features:
 
+#######################
 Issues/Feature requests
-=======================
+#######################
+
+.. _bug_report:
 
 Bug Report/Issue
-----------------
+================
+
 Issues or bugs are found in any software project. VyOS is not an exception.
 
 All issues should be reported to the developers. This lets the developers know
@@ -12,7 +16,7 @@ what is not working properly. Without this sort of feedback every developer
 will believe that everything is working correctly.
 
 I have found a bug, what should I do?
-*************************************
+-------------------------------------
 
 When you believe you have found a bug, it is always a good idea to verify the
 issue prior to opening a bug request.
@@ -22,7 +26,7 @@ issue prior to opening a bug request.
 * Get community support via Slack_ or our Forum_
 
 Ensure the problem is reproducible
-**********************************
+----------------------------------
 
 When you are able to verify that it is actually a bug, spend some time to
 document how to reproduce the issue. This documentation can be invaluable.
@@ -38,7 +42,7 @@ information can be very useful.
 * What commands did you use? Use e.g. ``run show configuration commands``
 
 Include output
-**************
+--------------
 
 The output you get when you find a bug can provide lots of information. If you
 get an error message on the screen, copy it exactly. Having the exact message
@@ -47,18 +51,21 @@ messages that also are from the time of the issue, include those. They may
 also contain information that is helpful for the development team.
 
 Report a Bug
-************
+------------
 
-Create an account on VyOS Phabricator_. Phabricator_ is located at
-https://phabricator.vyos.net. To create a bug-report use the quick link in the
-left side under the specific project.
+In order to open up a bug-report/feature request you need to create yourself
+an account on VyOS Phabricator_. On the left side of the specific project (VyOS
+1.2 or VyOS 1.3) you will find quick-links for opening a bug-report/feature
+request.
 
 * Provide as much information as you can
 * Which version of VyOS are you using? ``run show version``
 * How can we reproduce this Bug?
 
+.. _feature_request:
+
 Feature Request
----------------
+===============
 
 You have an idea of how to make VyOS better or you are in need of a specific
 feature which all users of VyOS would benefit from? To send a feature request
@@ -69,4 +76,5 @@ the left side under the specific project.
 .. _documentation: https://docs.vyos.io
 .. _Slack: https://slack.vyos.io
 .. _Forum: https://forum.vyos.io
-.. _Phabricator: https://phabricator.vyos.net
\ No newline at end of file
+
+.. include:: ../common-references.rst
\ No newline at end of file