Update status and assign number to MERCs 5 and 6

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>

docs/mercs/0001-merc-process.rst

@@ -31,9 +31,9 @@ for Mayan EDMS. Most MERCs will be Feature MERCs.
 2. An **Informational** MERC describes a Mayan EDMS design issue, or
 provides general guidelines or information to the Mayan EDMS community,
 but does not propose a new feature. Informational MERCs do not
-necessarily represent a community consensus or
-recommendation, so users and implementers are free to ignore
-Informational MERCs or follow their advice.
+necessarily represent a community consensus or recommendation, so users
+and implementers are free to ignore Informational MERCs or follow their
+advice.
 
 3. A **Process** MERC describes a process surrounding Mayan EDMS, or
 proposes a change to (or an event in) a process.  Process MERCs are

docs/mercs/0002-test-writing.rst

@@ -1,6 +1,6 @@
-=====================
+====================
 MERC 2: Test writing
-=====================
+====================
 
 :MERC: 2
 :Author: Michael Price

docs/mercs/0005-explicit-arguments.rst

@@ -1,13 +1,13 @@
-===========================
-MERC XX: Explicit arguments
-===========================
+==========================
+MERC 5: Explicit arguments
+==========================
 
-:MERC: XX
+:MERC: 5
 :Author: Roberto Rosario
-:Status: Draft
-:Type: Process
+:Status: Accepted
+:Type: Feature
 :Created: 2018-12-30
-:Last-Modified: 2018-12-30
+:Last-Modified: 2018-12-31
 
 .. contents:: Table of Contents
    :depth: 3
@@ -144,6 +144,6 @@ callable's interface.
 .. code-block:: python
 
     url(
-        regex=r'^documents/(?P<pk>[0-9]+)/versions/(?P<version_pk>[0-9]+)/pages/(?P<page_pk>[0-9]+)/image/$',
+        regex=r'^documents/(?P<pk>[0-9]+)/versions/(?P<document_version_pk>[0-9]+)/pages/(?P<document_page_pk>[0-9]+)/image/$',
         name='documentpage-image', view=APIDocumentPageImageView.as_view()
     ),

docs/mercs/0006-lower-information-disclose.rst

@@ -1,13 +1,13 @@
-===================================
-MERC XX: Lower information disclose
-===================================
+==================================
+MERC 6: Lower information disclose
+==================================
 
-:MERC: XX
+:MERC: 6
 :Author: Michael Price
-:Status: Draft
-:Type: Process
+:Status: Accepted
+:Type: Feature
 :Created: 2018-12-30
-:Last-Modified: 2018-12-30
+:Last-Modified: 2018-12-31
 
 .. contents:: Table of Contents
    :depth: 3

docs/mercs/index.rst

@@ -20,6 +20,8 @@ Accepted
    ../mercs/0001-merc-process
    ../mercs/0002-test-writing
    ../mercs/0003-using-javascript-libraries
+   ../mercs/0005-explicit-arguments
+   ../mercs/0006-lower-information-disclose
 
 Draft
 -----
@@ -27,8 +29,6 @@ Draft
 .. toctree::
    :maxdepth: 1
 
-   ../mercs/draft-explicit-arguments
-   ../mercs/draft-lower-information-disclose
    ../mercs/merging-roles-and-groups
 
 
@@ -51,3 +51,5 @@ Feature
 
    ../mercs/0002-test-writing
    ../mercs/0003-using-javascript-libraries
+   ../mercs/0005-explicit-arguments
+   ../mercs/0006-lower-information-disclose