6 files changed, 152 insertions, 2 deletions
diff --git a/doc/developer/building-frr-for-archlinux.rst b/doc/developer/building-frr-for-archlinux.rst
new file mode 100644
index 0000000000..7ede35ad9c
--- /dev/null
+++ b/doc/developer/building-frr-for-archlinux.rst
@@ -0,0 +1,129 @@
+Arch Linux
+================
+
+Installing Dependencies
+-----------------------
+
+.. code-block:: console
+
+   sudo pacman -Syu
+   sudo pacman -S \
+      git autoconf automake libtool make cmake pcre readline texinfo \
+      pkg-config pam json-c bison flex python-pytest \
+      c-ares python systemd python2-ipaddress python-sphinx \
+      systemd-libs net-snmp perl libcap
+
+.. include:: building-libyang.rst
+
+Protobuf
+^^^^^^^^
+
+.. code-block:: console
+
+   sudo pacman -S protobuf-c
+
+ZeroMQ
+^^^^^^
+
+.. code-block:: console
+
+   sudo pacman -S zeromq
+
+Building & Installing FRR
+-------------------------
+
+Add FRR user and groups
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: console
+
+   sudo groupadd -r -g 92 frr
+   sudo groupadd -r -g 85 frrvty
+   sudo useradd --system -g frr --home-dir /var/run/frr/ \
+   -c "FRR suite" --shell /sbin/nologin frr
+   sudo usermod -a -G frrvty frr
+
+Compile
+^^^^^^^
+
+.. include:: include-compile.rst
+
+Install FRR configuration files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: console
+
+   sudo install -m 775 -o frr -g frr -d /var/log/frr
+   sudo install -m 775 -o frr -g frrvty -d /etc/frr
+   sudo install -m 640 -o frr -g frrvty tools/etc/frr/vtysh.conf /etc/frr/vtysh.conf
+   sudo install -m 640 -o frr -g frr tools/etc/frr/frr.conf /etc/frr/frr.conf
+   sudo install -m 640 -o frr -g frr tools/etc/frr/daemons.conf /etc/frr/daemons.conf
+   sudo install -m 640 -o frr -g frr tools/etc/frr/daemons /etc/frr/daemons
+
+Tweak sysctls
+^^^^^^^^^^^^^
+
+Some sysctls need to be changed in order to enable IPv4/IPv6 forwarding and
+MPLS (if supported by your platform). If your platform does not support MPLS,
+skip the MPLS related configuration in this section.
+
+Edit :file:`/etc/sysctl.conf`[*Create the file if it doesn't exist*] and 
+append the following values (ignore the other settings):
+
+::
+
+   # Enable packet forwarding for IPv4
+   net.ipv4.ip_forward=1
+
+   #  Enable packet forwarding for IPv6
+   net.ipv6.conf.all.forwarding=1
+
+Reboot or use ``sysctl -p`` to apply the same config to the running system.
+
+Add MPLS kernel modules
+"""""""""""""""""""""""
+
+To
+enable, add the following lines to :file:`/etc/modules-load.d/modules.conf`:
+
+::
+
+   # Load MPLS Kernel Modules
+   mpls_router
+   mpls_iptunnel
+
+
+And load the kernel modules on the running system:
+
+.. code-block:: console
+
+   sudo modprobe mpls-router mpls-iptunnel
+
+Enable MPLS Forwarding
+""""""""""""""""""""""
+
+Edit :file:`/etc/sysctl.conf` and the following lines. Make sure to add a line
+equal to :file:`net.mpls.conf.eth0.input` for each interface used with MPLS.
+
+::
+
+   # Enable MPLS Label processing on all interfaces
+   net.mpls.conf.eth0.input=1
+   net.mpls.conf.eth1.input=1
+   net.mpls.conf.eth2.input=1
+   net.mpls.platform_labels=100000
+
+Install service files
+^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: console
+
+   sudo install -m 644 tools/frr.service /etc/systemd/system/frr.service
+   sudo systemctl enable frr
+
+Start FRR
+^^^^^^^^^
+
+.. code-block:: shell
+
+   systemctl start frr
diff --git a/doc/developer/building-frr-for-centos6.rst b/doc/developer/building-frr-for-centos6.rst
index 04c6b922ce..b730a5ee32 100644
--- a/doc/developer/building-frr-for-centos6.rst
+++ b/doc/developer/building-frr-for-centos6.rst
@@ -116,7 +116,19 @@ Update rpm database & Install newer sphinx
    sudo yum update
    sudo yum install python27-sphinx
 
-.. include:: building-libyang.rst
+Install libyang and its dependencies:
+
+.. code-block:: shell
+
+   sudo yum install pcre-devel doxygen cmake
+   git clone https://github.com/CESNET/libyang.git
+   cd libyang
+   git checkout 090926a89d59a3c4000719505d563aaf6ac60f2
+   mkdir build ; cd build
+   cmake -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr -D CMAKE_BUILD_TYPE:String="Release" ..
+   make build-rpm
+   sudo yum install ./rpms/RPMS/x86_64/libyang-0.16.111-0.x86_64.rpm ./rpms/RPMS/x86_64/libyang-devel-0.16.111-0.x86_64.rpm
+   cd ../..
 
 Get FRR, compile it and install it (from Git)
 ---------------------------------------------
diff --git a/doc/developer/building.rst b/doc/developer/building.rst
index 859f612313..ef55954ac2 100644
--- a/doc/developer/building.rst
+++ b/doc/developer/building.rst
@@ -26,3 +26,4 @@ Building FRR
    building-frr-for-ubuntu1404
    building-frr-for-ubuntu1604
    building-frr-for-ubuntu1804
+   building-frr-for-archlinux
diff --git a/doc/developer/ospf-sr.rst b/doc/developer/ospf-sr.rst
index d798ba78ef..070465db5b 100644
--- a/doc/developer/ospf-sr.rst
+++ b/doc/developer/ospf-sr.rst
@@ -22,7 +22,7 @@ Interoperability
 ----------------
 
 * Tested on various topology including point-to-point and LAN interfaces
-  in a mix of Free Range Routing instance and Cisco IOS-XR 6.0.x
+  in a mix of FRRouting instance and Cisco IOS-XR 6.0.x
 * Check OSPF LSA conformity with latest wireshark release 2.5.0-rc
 
 Implementation details
diff --git a/doc/developer/topotests.rst b/doc/developer/topotests.rst
index 33ebe06d2f..7e627781e0 100644
--- a/doc/developer/topotests.rst
+++ b/doc/developer/topotests.rst
@@ -360,6 +360,7 @@ This is the recommended test writing routine:
 - Write a topology (Graphviz recommended)
 - Obtain configuration files
 - Write the test itself
+- Format the new code using `black <https://github.com/psf/black>`_
 - Create a Pull Request
 
 Topotest File Hierarchy
@@ -760,6 +761,8 @@ Requirements:
   inside folders named after the equipment.
 - Tests must be able to run without any interaction. To make sure your test
   conforms with this, run it without the :option:`-s` parameter.
+- Use `black <https://github.com/psf/black>`_ code formatter before creating
+  a pull request. This ensures we have a unified code style.
 
 Tips:
 
diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst
index 8ce3bdeeb2..e36b57a5aa 100644
--- a/doc/developer/workflow.rst
+++ b/doc/developer/workflow.rst
@@ -992,6 +992,11 @@ Miscellaneous
 When in doubt, follow the guidelines in the Linux kernel style guide, or ask on
 the development mailing list / public Slack instance.
 
+JSON Output
+^^^^^^^^^^^
+
+All JSON keys are to be camelCased, with no spaces.
+
 
 .. _documentation: