[pypy-commit] pypy.org extradoc: Link to pypy/doc/stm from here too

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r482:a0ea9f9091f3
Date: 2014-04-08 17:06 +0200
http://bitbucket.org/pypy/pypy.org/changeset/a0ea9f9091f3/

Log:	Link to pypy/doc/stm from here too

diff --git a/source/tmdonate2.txt b/source/tmdonate2.txt
--- a/source/tmdonate2.txt
+++ b/source/tmdonate2.txt
@@ -276,8 +276,9 @@
 More readings
 -------------
 
-See `our blog posts about STM`__.
+See the `STM page of our documentation`__ and `our blog posts about STM`__.
 
+.. __: http://pypy.readthedocs.org/en/latest/stm.html
 .. __: http://morepypy.blogspot.com/search/label/stm
 
 
@@ -328,7 +329,7 @@
 the caveats.  The current status is written down `in the docs`__ and
 will evolve over time.
 
-.. __: https://pypy.readthedocs.org/en/latest/stm.html
+.. __: http://pypy.readthedocs.org/en/latest/stm.html
 
 For future reference, at the end of March the main identified issues
 are:
@@ -399,7 +400,7 @@
 control of the application, to do things like append an item to a list
 in a "delayed" manner, to avoid conflicts.
 
-.. __: https://pypy.readthedocs.org/en/latest/stm.html
+.. __: http://pypy.readthedocs.org/en/latest/stm.html
 .. _OpenMP: http://en.wikipedia.org/wiki/OpenMP
 
 Similarly, we might need a way to delay some I/O: doing it only at the
diff --git a/tmdonate2.html b/tmdonate2.html
--- a/tmdonate2.html
+++ b/tmdonate2.html
@@ -257,7 +257,7 @@
 </div>
 <div class="section" id="more-readings">
 <h2>More readings</h2>
-<p>See <a class="reference external" href="http://morepypy.blogspot.com/search/label/stm">our blog posts about STM</a>.</p>
+<p>See the <a class="reference external" href="http://pypy.readthedocs.org/en/latest/stm.html">STM page of our documentation</a> and <a class="reference external" href="http://morepypy.blogspot.com/search/label/stm">our blog posts about STM</a>.</p>
 </div>
 </div>
 <div class="section" id="work-plan-and-funding-details">
@@ -292,7 +292,7 @@
 some cases to run existing multithreaded code without a GIL, but not in
 all of them.  There are a number of caveats for the user and missing
 optimizations.  The goal #1 is to improve this case and address
-the caveats.  The current status is written down <a class="reference external" href="https://pypy.readthedocs.org/en/latest/stm.html">in the docs</a> and
+the caveats.  The current status is written down <a class="reference external" href="http://pypy.readthedocs.org/en/latest/stm.html">in the docs</a> and
 will evolve over time.</p>
 <p>For future reference, at the end of March the main identified issues
 are:</p>
@@ -320,7 +320,7 @@
 and libraries accessible from Python programs that want to make use of
 this benefit.</p>
 <p>This goal requires good support for very-long-running transactions,
-started with the <tt class="docutils literal">with atomic</tt> construct documented <a class="reference external" href="https://pypy.readthedocs.org/en/latest/stm.html">here</a>.  This
+started with the <tt class="docutils literal">with atomic</tt> construct documented <a class="reference external" href="http://pypy.readthedocs.org/en/latest/stm.html">here</a>.  This
 approach hides the notion of threads from the end programmer, including
 all the hard multithreading-related issues.  This is not the first
 alternative approach to explicit threads; for example, <a class="reference external" href="http://en.wikipedia.org/wiki/OpenMP">OpenMP</a> is one.