Commits

marchael  committed d71800e Merge

merged

  • Participants
  • Parent commits 7a5557f, 90c9f95

Comments (0)

Files changed (4)

File MoinMoin/templates/base.html

     <script src="{{ url_for('serve.files', name='jquery', filename='jquery.min.js') }}"></script>
     <script src="{{ url_for('serve.files', name='svgweb', filename='svg.js') }}"></script>
     <script src="{{ url_for('static', filename='js/common.js') }}"></script>
-    <script type="text/x-mathjax-config">
-  MathJax.Hub.Config({
-    extensions: ["tex2jax.js"],
-    jax: ["input/TeX","output/HTML-CSS"],
-    tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
-  });
-</script>
-<script src="{{ url_for('serve.files', name='mathjax', filename='MathJax.js') }}"> </script>
- 
     {{ scripts }}
     <!--[if lt IE 9]>
         {# TODO: use a local copy later #}

File docs/admin/install.rst

 For moin2, there is currently no packaged download available, you have to get
 it from the repository:
 
-Alternative 1 (using Mercurial DVCS)::
+Alternative 1a (using Mercurial DVCS)::
 
  $ hg clone http://hg.moinmo.in/moin/2.0 moin-2.0
 
+Alternative 1b (using Mercurial DVCS)::
+
+ $ hg clone http://bitbucket.org/thomaswaldmann/moin-2.0 moin-2.0
+
 Alternative 2:
 Visit http://hg.moinmo.in/moin/2.0 with your web browser, download the tgz
 and unpack it.
 -----------------
 Please make sure you have `virtualenv` installed (it includes `pip`).
 
-If you just want to run moin in-place in your mercurial workdir, run this
-from your mercurial moin2 work dir (you should do this using your normal
-user login, no root or Administrator privileges needed)::
+If you just want to run moin in-place in your mercurial workdir, with your
+normal system Python, run this from your mercurial moin2 work dir (you should
+do this using your normal user login, no root or Administrator privileges needed)::
 
  ./quickinstall  # for linux (or other posix OSes)
  # or
 directory, it will run everything from your work dir, so you can modify code
 and directly try it out (you only need to do this installation procedure once).
 
+Using a different Python or a different virtualenv directory
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+See the `quickinstall` script and just modify these lines as needed before
+running it::
+
+    DIR=env
+    PYTHON=python
+
+E.g. if you want to use `pypy` and name the virtualenv directory `env-pypy`,
+use::
+
+    DIR=env-pypy
+    PYTHON=/opt/pypy/bin/pypy
+
+That way, you can have all sorts of Pythons in different virtualenv directories
+within your moin2 workdir.
+
 Installing PIL
 ~~~~~~~~~~~~~~
 For some image processing functions (like resizing, rotating) of moin, you
         'XStatic-svgweb>=2011.2.3.2',
         'XStatic-TWikiDraw-moin>=2004.10.23.2',
         'XStatic-AnyWikiDraw>=0.14.2',
-        'XStatic-MathJax>=1.1.2',
         'XStatic-svg-edit-moin>=2011.07.07.2',
     ],
     # optional features and their list of requirements

File wikiconfig.py

     # we slowly migrate all stuff from above (old) method, to xstatic (new) method,
     # see https://bitbucket.org/thomaswaldmann/xstatic for details:
     from xstatic.main import XStatic
-    mod_names = ['jquery', 'jquery_file_upload', 'ckeditor', 'svgweb', 'svgedit_moin', 'twikidraw_moin', 'anywikidraw', 'mathjax', ]
+    mod_names = ['jquery', 'jquery_file_upload', 'ckeditor', 'svgweb', 'svgedit_moin', 'twikidraw_moin', 'anywikidraw', ]
     pkg = __import__('xstatic.pkg', fromlist=mod_names)
     for mod_name in mod_names:
         mod = getattr(pkg, mod_name)