Merge pull request #911 from virtualtam/fix/release/composer

[github/shaarli/Shaarli.git] / doc / html / Release-Shaarli / index.html

diff --git a/doc/html/Release-Shaarli/index.html b/doc/html/Release-Shaarli/index.html
index 924332032163adb127eec06e8a089672bf838f0b..fbb06725650e0b45bd8aec04c9e692bc7ae29092 100644 (file)
--- a/doc/html/Release-Shaarli/index.html
+++ b/doc/html/Release-Shaarli/index.html
@@ -94,19 +94,19 @@
     <ul class="subnav">
                 <li class="">
                     
-    <a class="" href="../Docker-101/">Docker 101</a>
+    <a class="" href="../docker/docker-101/">Docker 101</a>
                 </li>
                 <li class="">
                     
-    <a class="" href="../Shaarli-images/">Shaarli images</a>
+    <a class="" href="../docker/shaarli-images/">Shaarli images</a>
                 </li>
                 <li class="">
                     
-    <a class="" href="../Reverse-proxy-configuration/">Reverse proxy configuration</a>
+    <a class="" href="../docker/reverse-proxy-configuration/">Reverse proxy configuration</a>
                 </li>
                 <li class="">
                     
-    <a class="" href="../Docker-resources/">Docker resources</a>
+    <a class="" href="../docker/resources/">Docker resources</a>
                 </li>
     </ul>
            </li>
@@ -337,7 +337,8 @@ releases</a>.</p>
 - maintainer permissions on the main Shaarli repository, to:
     - push the signed tag
     - create a new release
-- <a href="https://getcomposer.org/">Composer</a> and <a href="http://pandoc.org/">Pandoc</a> need to be installed</p>
+- <a href="https://getcomposer.org/">Composer</a> needs to be installed
+- The <a href="https://docs.python.org/3/library/venv.html">venv</a> Python 3 module needs to be installed for HTML documentation generation.</p>
 <h2 id="github-release-draft-and-changelogmd">GitHub release draft and <code>CHANGELOG.md</code></h2>
 <p>See http://keepachangelog.com/en/0.3.0/ for changelog formatting.</p>
 <h3 id="github-release-draft">GitHub release draft</h3>
@@ -368,8 +369,8 @@ TBA
 $ git fetch upstream
 $ git checkout upstream/master -b v0.5.0
 
-# rebuild the documentation from the wiki
-$ make htmldoc
+# rebuild the HTML documentation from Markdown
+$ make htmlpages
 
 # commit the changes
 $ git add doc