Diff being reverted:
diff --git a/ref/author_manual/ipol-am.html b/ref/author_manual/ipol-am.html
index fcce80d..e860d99 100644
--- a/ref/author_manual/ipol-am.html
+++ b/ref/author_manual/ipol-am.html
@@ -3,6 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
+  <meta name="author" content="" />
   <title>IPOL Author Manual</title>
   <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -27,13 +28,13 @@
 </ul>
 <p>The submission, review and publication process is handled in <a href="https://tools.ipol.im/ojs/">the OJS journal management system</a>, as well as all the communication between authors, editors and referees. Additional messages can be sent to the editorial manager at <code>edit@ipol.im</code>.</p>
 <p>At least, an IPOL article contains a manuscript (the printable text and figures document considered as the article in most journals). It can also include one or more software or dataset packages. An online demo is attached to the articles about algorithms.</p>
-<h1 id="editorial-process"><a href="#editorial-process">Editorial Process</a></h1>
+<h1 id="editorial-process">Editorial Process</h1>
 <p>Before publication, an IPOL article progresses in three steps: submission, peer-review and edition.</p>
-<h2 id="submission"><a href="#submission">Submission</a></h2>
+<h2 id="submission">Submission</h2>
 <blockquote>
 <p><strong>For every new IPOL article:</strong></p>
 <ul>
-<li><strong>start a “New Submission” in OJS (<a href="https://tools.ipol.im/ojs/">https://tools.ipol.im/ojs/</a>);</strong></li>
+<li><strong>start a “New Submission” in OJS (<a href="https://tools.ipol.im/ojs/" class="uri">https://tools.ipol.im/ojs/</a>);</strong></li>
 <li><strong>select the “Articles” section;</strong></li>
 <li><strong>upload the PDF file (see LaTeX style in the <a href="https://tools.ipol.im/wiki/ref/manuscript_guidelines/">IPOL Manuscript Guidelines</a>);</strong></li>
 <li><strong>fill the author information, title and abstract;</strong></li>
@@ -41,20 +42,12 @@
 <li><strong>upload the demo Python code as a “Supplementary File” <em>if you already have it</em> and add a link to the live demo in the abstract (see <a href="https://tools.ipol.im/wiki/doc/demo/tutorial/">tutorial</a>).</strong></li>
 </ul>
 </blockquote>
-<p>Connect to OJS (<a href="https://tools.ipol.im/ojs/">https://tools.ipol.im/ojs/</a>) and create a new submission, then upload the submission files. You can start with an early manuscript of your article as a PDF file following the <a href="https://tools.ipol.im/wiki/ref/manuscript_guidelines/">Manuscript Guidelines</a> and a software implementation.</p>
-<p>In the case you did not upload a demo code, a member of the editorial board will be assigned to help you prepare a web demo. Note that to be able to obtain an online demo, code must at least fulfill these minimal conditions:</p>
-<ul>
-<li>written in C89, C99 or C++98, compilable on a Linux 64-bits system;</li>
-<li>use only libtiff, libjpeg, libpng, zlib, fftw, libgsl, eigen, cblas and clapack external libraries or be distributed with any other needed library;</li>
-<li>be usable from the command-line non-interactive interface;</li>
-<li>use at most 1 GB memory and 30 s computation;</li>
-<li>read/write PNG, TIFF, PNM, EPS, SVG, VRML or PLY format.</li>
-</ul>
+<p>Connect to OJS (<a href="https://tools.ipol.im/ojs/" class="uri">https://tools.ipol.im/ojs/</a>) and create a new submission, then upload the submission files. You can start with an early manuscript of your article as a PDF file following the <a href="https://tools.ipol.im/wiki/ref/manuscript_guidelines/">Manuscript Guidelines</a> and a software implementation.</p>
+<p>In the case you did not upload a demo code, a member of the editorial board will be assigned to help you prepare a web demo.</p>
 <p>During the review, your source code will be checked against the more detailed <a href="https://tools.ipol.im/wiki/ref/software_guidelines/">Software Guidelines</a>.</p>
 <!-- add link to axpb -->
-
 <p>Your complete submission (article, software, demo) will be assigned to an IPOL editor who will authorize a public preprint page and lead the peer-review evaluation.</p>
-<h2 id="peer-review"><a href="#peer-review">Peer Review</a></h2>
+<h2 id="peer-review">Peer Review</h2>
 <blockquote>
 <p><strong>After each review round:</strong></p>
 <ul>
@@ -63,7 +56,7 @@
 </ul>
 </blockquote>
 <p>You should send your corrections and answers to the reviewers within six weeks. Before every round of review, your preprint page will be updated.</p>
-<h2 id="edition"><a href="#edition">Edition</a></h2>
+<h2 id="edition">Edition</h2>
 <blockquote>
 <p><strong>After acceptation and before the final edition:</strong></p>
 <ul>
@@ -73,8 +66,7 @@
 <p>Once your article is accepted for publication after review, the editor will check it and can ask you to do some final corrections. Then you must provide the final LaTeX version of your article and the copyediting and layout editing steps will produce the final version of your IPOL article.</p>
 <!-- TODO: datasets -->
 <!-- TODO: tech reports -->
-
-<h1 id="peer-review-1"><a href="#peer-review-1">Peer Review</a></h1>
+<h1 id="peer-review-1">Peer Review</h1>
 <p>The role of the referees is</p>
 <ul>
 <li>to evaluate the quality of the manuscript;</li>
@@ -82,7 +74,7 @@
 <li>to guarantee by intelligent testing and by a careful examination that the software coincides with the algorithm description, and that the experimental results and failure case analysis proposed by the authors are faithful and comprehensive.</li>
 </ul>
 <p>This guaranty is limited to the main algorithm submitted and described in the manuscript, and to the code explicitly mentioned as reviewed.</p>
-<h1 id="pictures"><a href="#pictures">Pictures</a></h1>
+<h1 id="pictures">Pictures</h1>
 <p>Be careful with copyright and privacy issues with the pictures you use in the manuscript, software, dataset or demo. Every picture used in your article must fall into one of these categories:</p>
 <ul>
 <li>you are the copyright holder for the picture;</li>
@@ -92,16 +84,16 @@
 <p>You must detail which case applies, and provide this information (source, license, copyright holder) in a “credits” section of the manuscript for all the pictures you use. You can find some freely reusable materials through <a href="http://search.creativecommons.org/">the Creative Commons search engine</a>.</p>
 <p>Any person recognizable on a picture used in an article must be mentally healthy and have given their written consent. <a href="https://tools.ipol.im/wiki/ref/author_manual/forms/">models of consent forms are provided</a>, to be filled and signed with the photographs attached and sent to IPOL. If such pictures are needed to illustrate your article, we suggest you to use some pictures of yourself when possible.</p>
 <p>Some images are widely used by the image processing community as standard test images (Lenna, …). The copyright is usually owned by the original authors, who allow image processing researchers to use these images. If you use such a standard test image, you must detail its origin. We will suppose the copyright and privacy issues have already been cleared. The University of South California maintains <a href="http://sipi.usc.edu/database/">a database of standard test images</a> with their copyright information.</p>
-<h1 id="software"><a href="#software">Software</a></h1>
-<p>An implementation of the algorithm must be provided and must follow the <a href="https://tools.ipol.im/wiki/ref/software_guidelines/">Software Guidelines</a>. In short, the implementation must be written in standard C/C++, using only a few allowed external libraries, and be very readable and commented.</p>
+<h1 id="software">Software</h1>
+<p>An implementation of the algorithm must be provided and must follow the <a href="https://tools.ipol.im/wiki/ref/software_guidelines/">Software Guidelines</a>. In short, the implementation must be readable, well commented, and must match the descriptions and pseudocodes given in the article.</p>
 <p>This source code will be reviewed, published with the manuscript and used for the online demo. Other materials can also be published with the manuscript, like alternative implementations or binary versions, but will not be reviewed.</p>
-<h1 id="supplementary-materials"><a href="#supplementary-materials">Supplementary Materials</a></h1>
+<h1 id="supplementary-materials">Supplementary Materials</h1>
 <p>Some materials are not adapted to the PDF document format: video, image sequences, or large tables. They should be submitted with the manuscript, as “Supplementary File” in OJS, and mentioned in the manuscript. Supplementary materials will be reviewed and published with the manuscript and software.</p>
 <p>For the moment, authors are free to use the file formats they wish for their supplementary materials. Standard and well known formats are preferred, and these files may be converted during the edition process. The total size of these supplementary materials should not exceed 20MB per submission.</p>
-<h1 id="non-reviewed-supplementary-materials"><a href="#non-reviewed-supplementary-materials">Non-Reviewed Supplementary Materials</a></h1>
+<h1 id="non-reviewed-supplementary-materials">Non-Reviewed Supplementary Materials</h1>
 <p>With the agreement of the editor, additional supplementary materials can be published with the article without being reviewed: alternative versions of the software with more dependencies, compiled versions, wrappers for other programming environments (Matlab, Python, …), support code used in the demo, etc. These materials must be uploaded as “Supplementary File” in OJS.</p>
 <p>Authors can also send to the editor some information to insert in this section, like a link to future versions of the software, to a forum or a bug-tracker, etc.</p>
-<h1 id="copyright-and-license"><a href="#copyright-and-license">Copyright and License</a></h1>
+<h1 id="copyright-and-license">Copyright and License</h1>
 <p>The authors keep the copyright of their articles. The articles are distributed under the CC-BY-NC-SA license for the manuscript, the GPL/LGPL/AGPL or BSD license for the software, and the CC-BY license for the datasets and supplementary materials. The articles are available online without charge to the users or their institutions. See <a href="https://tools.ipol.im/wiki/ref/copyright_license_agreement/">the Copyright and License Agreement</a> for details.</p>
 </body>
 </html>
diff --git a/ref/author_manual/ipol-am.mdwn b/ref/author_manual/ipol-am.mdwn
index d78f27b..799dd40 100644
--- a/ref/author_manual/ipol-am.mdwn
+++ b/ref/author_manual/ipol-am.mdwn
@@ -41,17 +41,7 @@ early manuscript of your article as a PDF file following the
 and a software implementation.
 
 In the case you did not upload a demo code, a member of the editorial
-board will be assigned to help you prepare a web demo. Note that to be
-able to obtain an online demo, code must at least fulfill these
-minimal conditions:
-
-* written in C89, C99 or C++98, compilable on a Linux 64-bits system;
-* use only libtiff, libjpeg, libpng, zlib, fftw, libgsl, eigen, cblas
-  and clapack external libraries or be distributed with any other
-  needed library;
-* be usable from the command-line non-interactive interface;
-* use at most 1 GB memory and 30 s computation;
-* read/write PNG, TIFF, PNM, EPS, SVG, VRML or PLY format.
+board will be assigned to help you prepare a web demo. 
 
 During the review, your source code will be checked against the more
 detailed
@@ -143,9 +133,8 @@ with their copyright information.
  
 An implementation of the algorithm must be provided and must follow the
 [Software Guidelines](https://tools.ipol.im/wiki/ref/software_guidelines/).
-In short, the implementation must be written in standard C/C++, using
-only a few allowed external libraries, and be very readable and
-commented. 
+In short, the implementation must be readable, well commented, and must match 
+the descriptions and pseudocodes given in the article. 
 
 This source code will be reviewed, published with the manuscript and
 used for the online demo. Other materials can also be published with
diff --git a/ref/author_manual/ipol-am.pdf b/ref/author_manual/ipol-am.pdf
index 641b29d..b48f75d 100644
Binary files a/ref/author_manual/ipol-am.pdf and b/ref/author_manual/ipol-am.pdf differ
diff --git a/ref/author_manual/ipol-am.txt b/ref/author_manual/ipol-am.txt
index e88894f..0c57fa6 100644
--- a/ref/author_manual/ipol-am.txt
+++ b/ref/author_manual/ipol-am.txt
@@ -1,15 +1,16 @@
 IPOL Author Manual
 
--   Editorial Process
-    -   Submission
-    -   Peer Review
-    -   Edition
--   Peer Review
--   Pictures
--   Software
--   Supplementary Materials
--   Non-Reviewed Supplementary Materials
--   Copyright and License
+-   [Editorial Process](#editorial-process)
+    -   [Submission](#submission)
+    -   [Peer Review](#peer-review)
+    -   [Edition](#edition)
+-   [Peer Review](#peer-review-1)
+-   [Pictures](#pictures)
+-   [Software](#software)
+-   [Supplementary Materials](#supplementary-materials)
+-   [Non-Reviewed Supplementary
+    Materials](#non-reviewed-supplementary-materials)
+-   [Copyright and License](#copyright-and-license)
 
 The submission, review and publication process is handled in the OJS
 journal management system, as well as all the communication between
@@ -21,27 +22,29 @@ figures document considered as the article in most journals). It can
 also include one or more software or dataset packages. An online demo is
 attached to the articles about algorithms.
 
-Editorial Process
-=================
+
+
+EDITORIAL PROCESS
+
 
 Before publication, an IPOL article progresses in three steps:
 submission, peer-review and edition.
 
+
 Submission
-----------
 
-  For every new IPOL article:
+  FOR EVERY NEW IPOL ARTICLE:
 
-  -   start a “New Submission” in OJS (https://tools.ipol.im/ojs/);
-  -   select the “Articles” section;
-  -   upload the PDF file (see LaTeX style in the IPOL Manuscript
-      Guidelines);
-  -   fill the author information, title and abstract;
-  -   upload the source code as a “Supplementary File” (see examples and
-      IPOL Software Guidelines);