diff --git a/Makefile b/Makefile
index 41c0fffd26..ff58645262 100644
--- a/Makefile
+++ b/Makefile
@@ -340,8 +340,8 @@ find_gitignores:
 	if [ $${FIND_GITIGNORES} -gt 1 ] ;then echo "More than one .gitignore found."; fi
 
 build:
-	docker rm -f mayan-edms-ng-build || true && \
-	docker run --rm --name mayan-edms-ng-build -v $(HOME):/host_home:ro -v `pwd`:/host_source -w /source python:2-alpine3.7 /bin/busybox sh -c "\
+	docker rm -f mayan-edms-build || true && \
+	docker run --rm --name mayan-edms-build -v $(HOME):/host_home:ro -v `pwd`:/host_source -w /source python:2-alpine3.7 /bin/busybox sh -c "\
 	rm /host_source/dist -R || true && \
 	mkdir /host_source/dist || true && \
 	export LC_ALL=en_US.UTF-8 && \
diff --git a/docs/mercs/0001-merc-process.rst b/docs/mercs/0001-merc-process.rst
index a131fcc709..764389ac45 100644
--- a/docs/mercs/0001-merc-process.rst
+++ b/docs/mercs/0001-merc-process.rst
@@ -4,7 +4,7 @@ MERC 1: Purpose and Guidelines
 
 :MERC: 1
 :Author: Michael Price
-:Status: Draft
+:Status: Accepted
 :Type: Process
 :Created: 2018-02-17
 :Last-Modified: 2018-02-17
diff --git a/docs/mercs/test-writing.rst b/docs/mercs/0002-test-writing.rst
similarity index 96%
rename from docs/mercs/test-writing.rst
rename to docs/mercs/0002-test-writing.rst
index bfaac78aa1..0e7a542863 100644
--- a/docs/mercs/test-writing.rst
+++ b/docs/mercs/0002-test-writing.rst
@@ -1,13 +1,13 @@
 =====================
-MERC XX: Test writing
+MERC 2: Test writing
 =====================
 
-:MERC: XX
+:MERC: 2
 :Author: Michael Price
-:Status: Draft
-:Type: Process
+:Status: Accepted
+:Type: Feature
 :Created: 2018-02-22
-:Last-Modified: 2018-02-22
+:Last-Modified: 2018-04-01
 
 .. contents:: Table of Contents
    :depth: 3
diff --git a/docs/mercs/index.rst b/docs/mercs/index.rst
index d3ce507dad..26c719ce41 100644
--- a/docs/mercs/index.rst
+++ b/docs/mercs/index.rst
@@ -11,14 +11,21 @@ Mayan EDMS Request For Comment documents index.
 Status
 ======
 
+Accepted
+--------
+
+.. toctree::
+   :maxdepth: 1
+
+   0001-merc-process
+   0002-test-writing
+
 Draft
 -----
 
 .. toctree::
    :maxdepth: 1
 
-   0001-merc-process
-   test-writing
    merging-roles-and-groups
    support-forum
    using-javascript-libraries
@@ -35,3 +42,10 @@ Process
 
    0001-merc-process
 
+
+Feature
+-------
+.. toctree::
+   :maxdepth: 1
+
+   0002-test-writing