[pypy-svn] r16223 - in pypy/branch/dist-newdoc/pypy/doc: . tool

hpk at codespeak.net hpk at codespeak.net
Mon Aug 22 18:50:51 CEST 2005


Author: hpk
Date: Mon Aug 22 18:50:50 2005
New Revision: 16223

Modified:
   pypy/branch/dist-newdoc/pypy/doc/_ref.txt
   pypy/branch/dist-newdoc/pypy/doc/coding-guide.txt
   pypy/branch/dist-newdoc/pypy/doc/index.txt
   pypy/branch/dist-newdoc/pypy/doc/svn-help.txt
   pypy/branch/dist-newdoc/pypy/doc/tool/makeref.py
Log:
- more steps towards referential integrity
  inside a verision of the documentation
- get rid of non-ascii char in svn-help



Modified: pypy/branch/dist-newdoc/pypy/doc/_ref.txt
==============================================================================
--- pypy/branch/dist-newdoc/pypy/doc/_ref.txt	(original)
+++ pypy/branch/dist-newdoc/pypy/doc/_ref.txt	Mon Aug 22 18:50:50 2005
@@ -1,54 +1,53 @@
-.. _`demo/`: http://codespeak.net/svn/pypy/dist/demo
-.. _`lib-python/`: http://codespeak.net/svn/pypy/dist/lib-python
-.. _`pypy/annotation`:
-.. _`annotation/`: http://codespeak.net/svn/pypy/dist/pypy/annotation
-.. _`annotation/binaryop.py`: http://codespeak.net/svn/pypy/dist/pypy/annotation/binaryop.py
-.. _`documentation/`: http://codespeak.net/svn/pypy/dist/pypy/documentation
-.. _`documentation/revreport/`: http://codespeak.net/svn/pypy/dist/pypy/documentation/revreport
-.. _`documentation/website/`: http://codespeak.net/svn/pypy/dist/pypy/documentation/website
-.. _`pypy/interpreter`:
-.. _`interpreter/`: http://codespeak.net/svn/pypy/dist/pypy/interpreter
-.. _`pypy/interpreter/argument.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/argument.py
-.. _`pypy/interpreter/function.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/function.py
-.. _`pypy/interpreter/gateway.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/gateway.py
-.. _`pypy/interpreter/generator.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/generator.py
-.. _`pypy/interpreter/mixedmodule.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/mixedmodule.py
-.. _`pypy/interpreter/nestedscope.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/nestedscope.py
-.. _`pypy/interpreter/pyopcode.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/pyopcode.py
-.. _`pypy/interpreter/typedef.py`: http://codespeak.net/svn/pypy/dist/pypy/interpreter/typedef.py
+.. _`demo/`: ../../demo
+.. _`lib-python/`: ../../lib-python
+.. _`annotation/`:
+.. _`pypy/annotation`: ../../pypy/annotation
+.. _`annotation/binaryop.py`: ../../pypy/annotation/binaryop.py
+.. _`doc/`: ../../pypy/doc
+.. _`doc/revreport/`: ../../pypy/doc/revreport
+.. _`interpreter/`:
+.. _`pypy/interpreter`: ../../pypy/interpreter
+.. _`pypy/interpreter/argument.py`: ../../pypy/interpreter/argument.py
+.. _`pypy/interpreter/function.py`: ../../pypy/interpreter/function.py
+.. _`pypy/interpreter/gateway.py`: ../../pypy/interpreter/gateway.py
+.. _`pypy/interpreter/generator.py`: ../../pypy/interpreter/generator.py
+.. _`pypy/interpreter/mixedmodule.py`: ../../pypy/interpreter/mixedmodule.py
+.. _`pypy/interpreter/nestedscope.py`: ../../pypy/interpreter/nestedscope.py
+.. _`pypy/interpreter/pyopcode.py`: ../../pypy/interpreter/pyopcode.py
+.. _`pypy/interpreter/typedef.py`: ../../pypy/interpreter/typedef.py
 .. _`lib/`:
-.. _`pypy/lib/`: http://codespeak.net/svn/pypy/dist/pypy/lib
+.. _`pypy/lib/`: ../../pypy/lib
 .. _`lib/test2/`:
-.. _`pypy/lib/test2`: http://codespeak.net/svn/pypy/dist/pypy/lib/test2
+.. _`pypy/lib/test2`: ../../pypy/lib/test2
 .. _`module/`:
-.. _`pypy/module`: http://codespeak.net/svn/pypy/dist/pypy/module
-.. _`module/__builtin__/`: http://codespeak.net/svn/pypy/dist/pypy/module/__builtin__
-.. _`pypy/module/__builtin__/__init__.py`: http://codespeak.net/svn/pypy/dist/pypy/module/__builtin__/__init__.py
-.. _`module/_sre_pypy/`: http://codespeak.net/svn/pypy/dist/pypy/module/_sre_pypy
-.. _`module/parser/`: http://codespeak.net/svn/pypy/dist/pypy/module/parser
-.. _`module/recparser/`: http://codespeak.net/svn/pypy/dist/pypy/module/recparser
-.. _`module/sys/`: http://codespeak.net/svn/pypy/dist/pypy/module/sys
-.. _`pypy/objspace`:
-.. _`objspace/`: http://codespeak.net/svn/pypy/dist/pypy/objspace
-.. _`objspace/flow/`: http://codespeak.net/svn/pypy/dist/pypy/objspace/flow
-.. _`pypy/objspace/std`:
-.. _`objspace/std/`: http://codespeak.net/svn/pypy/dist/pypy/objspace/std
-.. _`objspace/thunk.py`: http://codespeak.net/svn/pypy/dist/pypy/objspace/thunk.py
+.. _`pypy/module`: ../../pypy/module
+.. _`module/__builtin__/`: ../../pypy/module/__builtin__
+.. _`pypy/module/__builtin__/__init__.py`: ../../pypy/module/__builtin__/__init__.py
+.. _`module/_sre_pypy/`: ../../pypy/module/_sre_pypy
+.. _`module/parser/`: ../../pypy/module/parser
+.. _`module/recparser/`: ../../pypy/module/recparser
+.. _`module/sys/`: ../../pypy/module/sys
+.. _`objspace/`:
+.. _`pypy/objspace`: ../../pypy/objspace
+.. _`objspace/flow/`: ../../pypy/objspace/flow
+.. _`objspace/std/`:
+.. _`pypy/objspace/std`: ../../pypy/objspace/std
+.. _`objspace/thunk.py`: ../../pypy/objspace/thunk.py
 .. _`objspace/trace.py`:
-.. _`pypy/objspace/trace.py`: http://codespeak.net/svn/pypy/dist/pypy/objspace/trace.py
-.. _`rpython/`: http://codespeak.net/svn/pypy/dist/pypy/rpython
-.. _`rpython/lltype.py`: http://codespeak.net/svn/pypy/dist/pypy/rpython/lltype.py
-.. _`rpython/rint.py`: http://codespeak.net/svn/pypy/dist/pypy/rpython/rint.py
-.. _`rpython/rlist.py`: http://codespeak.net/svn/pypy/dist/pypy/rpython/rlist.py
-.. _`rpython/rmodel.py`: http://codespeak.net/svn/pypy/dist/pypy/rpython/rmodel.py
-.. _`pypy/test_all.py`: http://codespeak.net/svn/pypy/dist/pypy/test_all.py
-.. _`tool/`: http://codespeak.net/svn/pypy/dist/pypy/tool
-.. _`tool/pytest/`: http://codespeak.net/svn/pypy/dist/pypy/tool/pytest
-.. _`tool/tb_server/`: http://codespeak.net/svn/pypy/dist/pypy/tool/tb_server
-.. _`pypy/translator`:
-.. _`translator/`: http://codespeak.net/svn/pypy/dist/pypy/translator
-.. _`pypy/translator/annrpython.py`: http://codespeak.net/svn/pypy/dist/pypy/translator/annrpython.py
-.. _`translator/c/`: http://codespeak.net/svn/pypy/dist/pypy/translator/c
-.. _`translator/java/`: http://codespeak.net/svn/pypy/dist/pypy/translator/java
-.. _`translator/llvm2/`: http://codespeak.net/svn/pypy/dist/pypy/translator/llvm2
-.. _`translator/tool/`: http://codespeak.net/svn/pypy/dist/pypy/translator/tool
\ No newline at end of file
+.. _`pypy/objspace/trace.py`: ../../pypy/objspace/trace.py
+.. _`rpython/`: ../../pypy/rpython
+.. _`rpython/lltype.py`: ../../pypy/rpython/lltype.py
+.. _`rpython/rint.py`: ../../pypy/rpython/rint.py
+.. _`rpython/rlist.py`: ../../pypy/rpython/rlist.py
+.. _`rpython/rmodel.py`: ../../pypy/rpython/rmodel.py
+.. _`pypy/test_all.py`: ../../pypy/test_all.py
+.. _`tool/`: ../../pypy/tool
+.. _`tool/pytest/`: ../../pypy/tool/pytest
+.. _`tool/tb_server/`: ../../pypy/tool/tb_server
+.. _`translator/`:
+.. _`pypy/translator`: ../../pypy/translator
+.. _`pypy/translator/annrpython.py`: ../../pypy/translator/annrpython.py
+.. _`translator/c/`: ../../pypy/translator/c
+.. _`translator/java/`: ../../pypy/translator/java
+.. _`translator/llvm2/`: ../../pypy/translator/llvm2
+.. _`translator/tool/`: ../../pypy/translator/tool
\ No newline at end of file

Modified: pypy/branch/dist-newdoc/pypy/doc/coding-guide.txt
==============================================================================
--- pypy/branch/dist-newdoc/pypy/doc/coding-guide.txt	(original)
+++ pypy/branch/dist-newdoc/pypy/doc/coding-guide.txt	Mon Aug 22 18:50:50 2005
@@ -696,8 +696,6 @@
 This allows us to quickly test our python-coded reimplementations
 against CPython.
 
-.. _`pypy/lib/test2`: http://codespeak.net/svn/pypy/dist/pypy/lib/test2
-
 Testing modules in ``pypy/module``
 ----------------------------------
 

Modified: pypy/branch/dist-newdoc/pypy/doc/index.txt
==============================================================================
--- pypy/branch/dist-newdoc/pypy/doc/index.txt	(original)
+++ pypy/branch/dist-newdoc/pypy/doc/index.txt	Mon Aug 22 18:50:50 2005
@@ -53,11 +53,9 @@
 ============================   =========================================== 
 `annotation/`_                 `type inferencing code`_ for `RPython`_ programs 
 
-`documentation/`_              text versions of PyPy `documentation`_ files shown on the website 
+`doc/`_                        text versions of PyPy developer documentation
 
-`documentation/revreport/`_    the source code for the `revision report`_ 
-
-`documentation/website/`_      text versions of the navigation webpages 
+`doc/revreport/`_              the source code for the `revision report`_ 
 
 `interpreter/`_                `bytecode interpreter`_ and related objects (frames, functions, modules,...) 
 

Modified: pypy/branch/dist-newdoc/pypy/doc/svn-help.txt
==============================================================================
--- pypy/branch/dist-newdoc/pypy/doc/svn-help.txt	(original)
+++ pypy/branch/dist-newdoc/pypy/doc/svn-help.txt	Mon Aug 22 18:50:50 2005
@@ -30,7 +30,7 @@
 
 For linux:
 
-download the tarball.  unzip and untar it.  Then type *./configure*.  Then, as root, *make* followed by *make install*.  Voilà ... a subversion client.
+download the tarball.  unzip and untar it.  Then type *./configure*.  Then, as root, *make* followed by *make install*.  Voila ... a subversion client.
 
 For Debian users::
 

Modified: pypy/branch/dist-newdoc/pypy/doc/tool/makeref.py
==============================================================================
--- pypy/branch/dist-newdoc/pypy/doc/tool/makeref.py	(original)
+++ pypy/branch/dist-newdoc/pypy/doc/tool/makeref.py	Mon Aug 22 18:50:50 2005
@@ -7,8 +7,8 @@
 dist_url = 'http://codespeak.net/svn/pypy/dist/' 
 issue_url = 'http://codespeak.net/issue/pypy-dev/' 
 
-docdir = pypydir.join('documentation') 
-reffile = pypydir.join('documentation', '_ref.txt') 
+docdir = pypydir.join('doc') 
+reffile = pypydir.join('doc', '_ref.txt') 
 
 linkrex = py.std.re.compile('`(\S+)`_')
 
@@ -27,7 +27,9 @@
             for startloc in ('', 'pypy'): 
                 cand = distdir.join(startloc, linkname)
                 if cand.check(): 
-                    target = dist_url + cand.relto(distdir)
+                    rel = cand.relto(distdir)
+                    # we are in pypy/doc/x.txt 
+                    target = '../../' + cand.relto(distdir)
                     addlink(linkname, target) 
                     break
             else: 



More information about the Pypy-commit mailing list