[Pypi-checkins] r824 - trunk/pypi/templates

[martin.von.loewis]

Author: martin.von.loewis
Date: Sun Jul 25 18:47:01 2010
New Revision: 824

Modified:
   trunk/pypi/templates/home.pt
   trunk/pypi/templates/mirrors.pt
Log:
Document mirrors.


Modified: trunk/pypi/templates/home.pt
==============================================================================
--- trunk/pypi/templates/home.pt	(original)
+++ trunk/pypi/templates/home.pt	Sun Jul 25 18:47:01 2010
@@ -39,8 +39,8 @@
 register to submit</a>)</li>
 </ul>
 
-<p>There now is an <a href="http://10tons.tummy.com/pypi/">RPM repository</a>
-that provides RPMs for most of the packages available here on PyPI.</p>
+<p>PyPI now provides a <a href="/mirrors">Mirror infrastructure</a> to allow
+users to continue downloading file even if pypi.python.org is unavailable.</p>
 
 <table class="list">
 <tr><th>Updated</th><th>Package</th><th>Description</th></tr>

Modified: trunk/pypi/templates/mirrors.pt
==============================================================================
--- trunk/pypi/templates/mirrors.pt	(original)
+++ trunk/pypi/templates/mirrors.pt	Sun Jul 25 18:47:01 2010
@@ -6,29 +6,22 @@
       <metal:fill fill-slot="body">
 
  <p>The PyPI repository provides alternative locations that stores the packages.
- A mirror ring is available at this hostname : <b>mirrors.pypi.python.org</b></p>
-
- <p>If you want to register a new mirror, send an email
- to the catalog-SIG mailing list and provide:</p>
+ This service is primarily intended to be used by automated download tools
+ (such as setuptools or pip); ask your tool vendor to make use of this infratructure.
+ </p>
+ <p>You can also manually point these tools to mirrors, or use them in the
+ web browser, by using one of these host names instead of pypi.python.org:</p>
  <ul>
-  <li>The IP of your mirror.</li>
-  <li>The PyPI account name of the maintainer.</li>
+ <li><a href="http://b.pypi.python.org/">b.pypi.python.org</a></li>
+ <li><a href="http://c.pypi.python.org/">c.pypi.python.org</a></li>
+ <li><a href="http://d.pypi.python.org/">d.pypi.python.org</a></li>
  </ul>
 
- <p>The registering is done manually by the PyPI administrator.
- To become a mirror, you need to strictly follow the protocol
- described here:</p>
-
- <a href="http://www.python.org/dev/peps/pep-0381">http://www.python.org/dev/peps/pep-0381</a>
+ <p>More mirrors may get added over time; you can use the DNS CNAME record
+ last.pypi.python.org to find out which mirror is last in alphabetical order.</p>
 
- <p>Notice that the mirror maintainer must provide a permanent IP.</p>
+ <p>The mirroring protocol is defined in <a href="http://www.python.org/dev/peps/pep-0381">http://www.python.org/dev/peps/pep-0381</a></p>
 
- <h2>Current mirror list</h2>
- <ul>
-   <li tal:repeat="mirror app/store/list_mirrors">
-      <tal:block tal:replace="python:mirror[0]"/>
-   </li>
- </ul>
  </metal:fill>
 </html>