------------------------------------------------------------ revno: 3615 committer: Bruno Chareyre <[email protected]> timestamp: Thu 2015-03-05 21:44:30 +0100 message: integrate Ning's FEMxDEM doc in yade's doc modified: doc/sphinx/index-toctree.rst doc/sphinx/templates/index.html
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'doc/sphinx/index-toctree.rst' --- doc/sphinx/index-toctree.rst 2014-08-18 15:34:10 +0000 +++ doc/sphinx/index-toctree.rst 2015-03-05 20:44:30 +0000 @@ -7,15 +7,6 @@ Welcome to Yade's documentation! ================================ -.. note:: - - Please consult changes to Yade documention with documentation manager (whoever that is), even if you have commit permissions. - - -See older `tentative contents <http://bazaar.launchpad.net/~eudoxos/%2Bjunk/ydoc/annotate/head%3A/toc>`_ - - - .. toctree:: :maxdepth: 2 @@ -37,18 +28,18 @@ modules.rst + FEMxDEM.rst + citing.rst publications.rst references.rst - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` +.. only:: html and epub + Indices and tables + ================== + * :ref:`genindex` + * :ref:`modindex` + * :ref:`search` === modified file 'doc/sphinx/templates/index.html' --- doc/sphinx/templates/index.html 2014-01-22 16:41:20 +0000 +++ doc/sphinx/templates/index.html 2015-03-05 20:44:30 +0000 @@ -70,6 +70,8 @@ <span class="linkdescr">simulation building blocks, c++ & python</span></p> <p class="biglink"><a class="biglink" href="{{ pathto("modules") }}">Yade modules</a><br/> <span class="linkdescr">python modules extending Yade</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("FEMxDEM") }}">Multiscale FEMxDEM</a><br/> + <span class="linkdescr">Parallel coupling using Escript and Yade</span></p> </td> </tr> <tr>
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
