[pypy-svn] pypy documentation-cleanup: merge heads

berdario commits-noreply at bitbucket.org
Mon Apr 25 16:25:43 CEST 2011


Author: Dario Bertini <berdario at gmail.com>
Branch: documentation-cleanup
Changeset: r43596:729f6067755b
Date: 2011-04-25 16:24 +0200
http://bitbucket.org/pypy/pypy/changeset/729f6067755b/

Log:	merge heads

diff --git a/pypy/doc/statistic/style.css b/pypy/doc/statistic/style.css
deleted file mode 100644
--- a/pypy/doc/statistic/style.css
+++ /dev/null
@@ -1,1083 +0,0 @@
-body,body.editor,body.body {
-    font: 110% "Times New Roman", Arial, Verdana, Helvetica, serif;
-    background: White;
-    color: Black;
-}
-
-a, a.reference {
-	text-decoration: none; 
-}
-a[href]:hover { text-decoration: underline; }
-
-img {
-    border: none;
-	vertical-align: middle;
-}
-
-p, div.text {
-    text-align: left;
-    line-height: 1.5em;
-    margin: 0.5em 0em 0em 0em;
-}
-
-
-
-p a:active {
-	color: Red;
-    background-color: transparent;
-}
-
-p img {
-    border: 0;
-    margin: 0;
-}
-
-img.inlinephoto {
-    padding: 0;
-    padding-right: 1em;
-    padding-top: 0.7em;
-    float: left;
-}
-
-hr {
-    clear: both;
-    height: 1px;
-    color: #8CACBB;
-    background-color: transparent;
-}
-
-
-ul { 
-    line-height: 1.5em;
-    /*list-style-image: url("bullet.gif"); */
-    margin-left: 1.5em;
-    padding:0;
-}
-
-ol {
-    line-height: 1.5em;
-    margin-left: 1.5em;
-    padding:0;
-}
-
-ul a, ol a {
-    text-decoration: underline;
-}
-
-dl {
-}
-
-dt {
-    font-weight: bold;    
-}
-
-dd {
-    line-height: 1.5em;
-    margin-bottom: 1em;
-}
-
-blockquote {
-    font-family: Times, "Times New Roman", serif;
-    font-style: italic;
-    font-size: 120%;
-}
-
-code {
-    color: Black;
-    /*background-color: #dee7ec;*/
-    background-color: #cccccc;
-}
-
-pre {
-    padding: 1em;
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: #dee7ec;
-    background-color: #cccccc;
-    overflow: auto;
-}
-
-
-.netscape4 {
-    display: none;
-}
-
-/* main page styles */
-
-/*a[href]:hover { color: black; text-decoration: underline; }
-a[href]:link { color: black; text-decoration: underline; }
-a[href] { color: black; text-decoration: underline; }
-*/
-
-span.menu_selected {
-	color: black;
-  	font: 120% Verdana, Helvetica, Arial, sans-serif;
-	text-decoration: none;
-    padding-right: 0.3em;
-    background-color: #cccccc;
-}
-
-
-a.menu {
-  	/*color: #3ba6ec; */
-  	font: 120% Verdana, Helvetica, Arial, sans-serif;
-	text-decoration: none;
-    padding-right: 0.3em;
-}
-
-a.menu[href]:visited, a.menu[href]:link{
-  	/*color: #3ba6ec; */
-  	font: 120% Verdana, Helvetica, Arial, sans-serif;
-	text-decoration: none;
-}
-
-a.menu[href]:hover {
-  	/*color: black;*/
-}
-
-div.project_title{
-  /*border-spacing: 20px;*/
-  font: 160% Verdana, Helvetica, Arial, sans-serif;
-  color: #3ba6ec; 
-  vertical-align: center;
-  padding-bottom: 0.3em;
-}
-
-a.wikicurrent {
-  font: 100% Verdana, Helvetica, Arial, sans-serif;
-  color: #3ba6ec; 
-  vertical-align: middle;
-}
-
-
-table.body {
-  border: 0;
-  /*padding: 0;
-  border-spacing: 0px;
-  border-collapse: separate;
-  */
-}
-
-td.page-header-left {
-  padding: 5px;
-  /*border-bottom: 1px solid #444444;*/
-}
-
-td.page-header-top {
-  padding: 0;
-    
-  /*border-bottom: 1px solid #444444;*/
-}
-
-td.sidebar {
-  padding: 1 0 0 1;
-}
-
-td.sidebar p.classblock {
-  padding: 0 5 0 5;
-  margin: 1 1 1 1;
-  border: 1px solid #444444;
-  background-color: #eeeeee;
-}
-
-td.sidebar p.userblock {
-  padding: 0 5 0 5;
-  margin: 1 1 1 1;
-  border: 1px solid #444444;
-  background-color: #eeeeff;
-}
-
-td.content {
-  padding: 1 5 1 5;
-  vertical-align: top;
-  width: 100%;
-}
-
-p.ok-message {
-  background-color: #22bb22;
-  padding: 5 5 5 5;
-  color: white;
-  font-weight: bold;
-}
-p.error-message {
-  background-color: #bb2222;
-  padding: 5 5 5 5;
-  color: white;
-  font-weight: bold;
-}
-
-p:first-child { 
-  margin: 0 ;
-  padding: 0;
-}
-
-/* style for forms */
-table.form {
-  padding: 2;
-  border-spacing: 0px;
-  border-collapse: separate;
-}
-
-table.form th {
-  color: #333388;
-  text-align: right;
-  vertical-align: top;
-  font-weight: normal;
-}
-table.form th.header {
-  font-weight: bold;
-  background-color: #eeeeff;
-  text-align: left;
-}
-
-table.form th.required {
-  font-weight: bold;
-}
-
-table.form td {
-  color: #333333;
-  empty-cells: show;
-  vertical-align: top;
-}
-
-table.form td.optional {
-  font-weight: bold;
-  font-style: italic;
-}
-
-table.form td.html {
-  color: #777777;
-}
-
-/* style for lists */
-table.list {
-  border-spacing: 0px;
-  border-collapse: separate;
-  vertical-align: top;
-  padding-top: 0;
-  width: 100%;
-}
-
-table.list th {
-  padding: 0 4 0 4;
-  color: #404070;
-  background-color: #eeeeff;
-  border-right: 1px solid #404070;
-  border-top: 1px solid #404070;
-  border-bottom: 1px solid #404070;
-  vertical-align: top;
-  empty-cells: show;
-}
-table.list th a[href]:hover { color: #404070 }
-table.list th a[href]:link { color: #404070 }
-table.list th a[href] { color: #404070 }
-table.list th.group {
-  background-color: #f4f4ff;
-  text-align: center;
-  font-size: 120%;
-}
-
-table.list td {
-  padding: 0 4 0 4;
-  border: 0 2 0 2;
-  border-right: 1px solid #404070;
-  color: #404070;
-  background-color: white;
-  vertical-align: top;
-  empty-cells: show;
-}
-
-table.list tr.normal td {
-  background-color: white;
-  white-space: nowrap;
-}
-
-table.list tr.alt td {
-  background-color: #efefef;
-  white-space: nowrap;
-}
-
-table.list td:first-child {
-  border-left: 1px solid #404070;
-  border-right: 1px solid #404070;
-}
-
-table.list th:first-child {
-  border-left: 1px solid #404070;
-  border-right: 1px solid #404070;
-}
-
-table.list tr.navigation th {
-  text-align: right;
-}
-table.list tr.navigation th:first-child {
-  border-right: none;
-  text-align: left;
-}
-
-
-/* style for message displays */
-table.messages {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.messages th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.messages th {
-  font-weight: bold;
-  color: black;
-  text-align: left;
-  border-bottom: 1px solid #afafaf;
-}
-
-table.messages td {
-  font-family: monospace;
-  background-color: #efefef;
-  border-bottom: 1px solid #afafaf;
-  color: black;
-  empty-cells: show;
-  border-right: 1px solid #afafaf;
-  vertical-align: top;
-  padding: 2 5 2 5;
-}
-
-table.messages td:first-child {
-  border-left: 1px solid #afafaf;
-  border-right: 1px solid #afafaf;
-}
-
-/* style for file displays */
-table.files {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.files th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.files th {
-  border-bottom: 1px solid #afafaf;
-  font-weight: bold;
-  text-align: left;
-}
-
-table.files td {
-  font-family: monospace;
-  empty-cells: show;
-}
-
-/* style for history displays */
-table.history {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.history th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-  font-size: 100%;
-}
-
-table.history th {
-  border-bottom: 1px solid #afafaf;
-  font-weight: bold;
-  text-align: left;
-  font-size: 90%;
-}
-
-table.history td {
-  font-size: 90%;
-  vertical-align: top;
-  empty-cells: show;
-}
-
-
-/* style for class list */
-table.classlist {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.classlist th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.classlist th {
-  font-weight: bold;
-  text-align: left;
-}
-
-
-/* style for class help display */
-table.classhelp {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.classhelp th {
-  font-weight: bold;
-  text-align: left;
-  color: #707040;
-}
-
-table.classhelp td {
-  padding: 2 2 2 2;
-  border: 1px solid black;
-  text-align: left;
-  vertical-align: top;
-  empty-cells: show;
-}
-
-
-/* style for "other" displays */
-table.otherinfo {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.otherinfo th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.otherinfo th {
-  border-bottom: 1px solid #afafaf;
-  font-weight: bold;
-  text-align: left;
-}
-
-input {
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: white;
-    vertical-align: middle;
-    margin-bottom: 1px; /* IE bug fix */
-    padding: 0.1em;
-}
-
-select {
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: white;
-    vertical-align: middle;
-    margin-bottom: 1px; /* IE bug fix */
-    padding: 0.1em;
-}
-
-
-a.nonexistent {
-    color: #FF2222;
-}
-a.nonexistent:visited {
-    color: #FF2222;
-}
-a.external {
-    color: #AA6600;
-}
-
-/*
-dl,ul,ol {
-    margin-top: 1pt;
-}
-tt,pre {
-    font-family: Lucida Console,Courier New,Courier,monotype;
-    font-size: 12pt;
-}
-pre.code {
-    margin-top: 8pt;
-    margin-bottom: 8pt;
-    background-color: #FFFFEE;
-    white-space:pre;
-    border-style:solid;
-    border-width:1pt;
-    border-color:#999999;
-    color:#111111;
-    padding:5px;
-    width:100%;
-}
-*/
-div.diffold {
-    background-color: #FFFF80;
-    border-style:none;
-    border-width:thin;
-    width:100%;
-}
-div.diffnew {
-    background-color: #80FF80;
-    border-style:none;
-    border-width:thin;
-    width:100%;
-}
-div.message {
-    margin-top: 6pt;
-    background-color: #E8FFE8;
-    border-style:solid;
-    border-width:1pt;
-    border-color:#999999;
-    color:#440000;
-    padding:5px;
-    width:100%;
-}
-strong.highlight {
-    background-color: #FFBBBB;
-/* as usual, NetScape fucks up with innocent CSS
-    border-color: #FFAAAA;
-    border-style: solid;
-    border-width: 1pt;
-*/
-}
-
-table.navibar {
-    background-color: #C8C8C8;
-    border-spacing: 3px;
-}
-td.navibar {
-    background-color: #E8E8E8;
-    vertical-align: top;
-    text-align: right;
-    padding: 0px;
-}
-
-div.pagename {
-    font-size: 140%;
-    color: blue;
-    text-align: center;
-    font-weight: bold;
-    background-color: white;
-    padding: 0 ;
-}
-
-a.wikiaction, input.wikiaction {
-    color: black; 
-    text-decoration: None;
-    text-align: center;
-    color: black;
-    /*border: 1px solid #3ba6ec; */
-    margin: 4px;
-    padding: 5;
-    padding-bottom: 0;
-    white-space: nowrap;
-}
-
-a.wikiaction[href]:hover { 
-	color: black; 
-	text-decoration: none; 
-	/*background-color: #dddddd; */
-}
-
-span.wikiuserpref {
-    padding-top: 1em;
-    font-size: 120%;
-}
-
-div.wikitrail {
-    vertical-align: bottom;
-    /*font-size: -1;*/
-    padding-top: 1em;
-    display: none;
-}
-
-div.wikiaction {
-    vertical-align: middle;
-    /*border-bottom: 1px solid #8cacbb;*/
-    padding-bottom:1em;
-    text-align: left;
-    width: 100%;
-}
-
-div.wikieditmenu {
-    text-align: right;
-}
-
-form.wikiedit {
-    border: 1px solid #8cacbb;
-    background-color: #f0f0f0;
-    background-color: #fabf00;
-    padding: 1em;
-    padding-right: 0em;
-}
-
-div.legenditem {
-    padding-top: 0.5em;
-    padding-left: 0.3em;
-}
-
-span.wikitoken {
-   background-color: #eeeeee;
-}
-    
-
-div#contentspace h1:first-child, div.heading:first-child { 
-  padding-top: 0;
-  margin-top: 0;
-}
-div#contentspace h2:first-child { 
-  padding-top: 0;
-  margin-top: 0;
-}
-
-/* heading and paragraph text */
-
-div.heading, h1 {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    background-color: #58b3ef;
-    background-color: #FFFFFF; 
-    /*color: #4893cf;*/
-    color: black;
-    padding-top: 1.0em;
-    padding-bottom:0.2em;
-    text-align: left;
-    margin-top: 0em; 
-    /*margin-bottom:8pt;*/
-    font-weight: bold;
-    font-size: 115%;
-    border-bottom: 1px solid #8CACBB;
-}
-
-
-h1, h2, h3, h4, h5, h6 {
-    color: Black;
-    clear: left;
-    font: 100% Verdana, Helvetica, Arial, sans-serif;
-    margin: 0;
-    padding-left: 0em;
-    padding-top: 1em;
-    padding-bottom: 0.2em;
-    /*border-bottom: 1px solid #8CACBB;*/
-}
-/* h1,h2 { padding-top: 0; }*/
-
-
-h1 { font-size: 145%; }
-h2 { font-size: 135%; }
-h3 { font-size: 125%; }
-h4 { font-size: 120%; }
-h5 { font-size: 110%; }
-h6 { font-size: 80%; }
-
-h1 a { text-decoration: None;}
-
-div.exception {
-  background-color: #bb2222;
-  padding: 5 5 5 5;
-  color: white;
-  font-weight: bold;
-}
-pre.exception {
-    font-size: 110%;
-    padding: 1em;
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: #dee7ec;
-    background-color: #cccccc;
-}
-
-/* defines for navgiation bar (documentation) */
-
-
-div.direntry {
-    padding-top: 0.3em;
-    padding-bottom: 0.3em;
-    margin-right: 1em;
-    font-weight: bold;
-    background-color: #dee7ec;
-    font-size: 110%;
-}
-
-div.fileentry {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    padding-bottom: 0.3em;
-    white-space: nowrap;
-    line-height: 150%;
-}
-
-a.fileentry {
-    white-space: nowrap;
-}
-
-
-span.left {
-    text-align: left;
-}
-span.right {
-    text-align: right;
-}
-
-div.navbar {
-  /*margin: 0;*/
-  font-size: 80% /*smaller*/;
-  font-weight: bold;
-  text-align: left;
-  /* position: fixed; */
-  top: 100pt;
-  left: 0pt; /*  auto; */
-  width: 120pt;
-  /* right: auto;
-  right: 0pt;  2em; */
-}
-
-
-div.history a {
-    /* font-size: 70%; */
-}
-
-div.wikiactiontitle { 
-  font-weight: bold;
-}
-
-/*  REST  defines */
-
-div.document {
-    margin: 0;
-}
-
-h1.title {
-    margin: 0;
-}
-
-td.toplist {
-    vertical-align: top;
-}
-
-img#pyimg {
-    position: absolute;
-    top: 4px;
-    left: 4px;
-}
-
-img#extraimg {
-    position: absolute;
-    right: 14px; 
-    top: 4px;
-}
-    
-div#navspace {
-    position: absolute;
-    top: 130px;
-    left: 11px;
-    font-size: 100%;
-    width: 150px;
-    overflow: hidden; /* scroll;  */
-}
-
-div#metaspace {
-    position: absolute;
-    top: 40px;
-    left: 170px;
-}
-
-div#errorline {
-    position: relative;
-    top: 5px; 
-    float: right; 
-}
-
-div#contentspace {
-    position: absolute;
-  	/* font: 120% "Times New Roman", serif;*/
-    font: 110% Verdana, Helvetica, Arial, sans-serif;
-    top: 130px;
-    left: 170px;
-    margin-right: 5px;
-}
-
-div#menubar {
-/*    width: 400px; */
-    float: left;
-}
-
-/* for the documentation page */
-div#docinfoline {
-  position: relative;
-  top: 5px; 
-  left: 0px;
-
-  /*background-color: #dee7ec; */
-  padding: 5pt; 
-  padding-bottom: 1em; 
-  color: black;
-  /*border-width: 1pt;
-  border-style: solid;*/
-
-}
-
-div#docnavlist {
-  /*background-color: #dee7ec; */
-  padding: 5pt; 
-  padding-bottom: 2em; 
-  color: black;
-  border-width: 1pt;
-  /*border-style: solid;*/
-}
-
-
-/* text markup */
-
-div.listtitle {
-    color: Black;
-    clear: left;
-    font: 120% Verdana, Helvetica, Arial, sans-serif;
-    margin: 0;
-    padding-left: 0em;
-    padding-top: 0em;
-    padding-bottom: 0.2em;
-    margin-right: 0.5em;
-    border-bottom: 1px solid #8CACBB;
-}
-
-div.actionbox h3 { 
-  padding-top: 0;
-  padding-right: 0.5em;
-  padding-left: 0.5em;
-  background-color: #fabf00;
-  text-align: center;
-  border: 1px solid black; /* 8cacbb; */
-}
-
-div.actionbox a { 
-  display: block;
-  padding-bottom: 0.5em;
-  padding-top: 0.5em;
-  margin-left: 0.5em;
-}
-
-div.actionbox a.history { 
-  display: block;
-  padding-bottom: 0.5em;
-  padding-top: 0.5em;
-  margin-left: 0.5em;
-  font-size: 90%; 
-}
-
-div.actionbox { 
-  margin-bottom: 2em;
-  padding-bottom: 1em;
-  overflow: hidden; /* scroll;  */
-}
-
-/* taken from docutils (oh dear, a bit senseless) */
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-
-/*
-:Author: David Goodger
-:Contact: goodger at users.sourceforge.net
-:date: $Date: 2003/01/22 22:26:48 $
-:version: $Revision: 1.29 $
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-*/
-/*
-.first {
-  margin-top: 0 }
-
-.last {
-  margin-bottom: 0 }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-dd {
-  margin-bottom: 0.5em }
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  font-size: smaller }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr {
-  width: 75% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
-
-td, th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-th.docinfo-name, th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap }
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: 100% }
-
-tt {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
-*/
-
-div.section {
-  margin-top: 1.0em ;
-}    

diff --git a/pypy/doc/objspace-proxies.rst b/pypy/doc/objspace-proxies.rst
--- a/pypy/doc/objspace-proxies.rst
+++ b/pypy/doc/objspace-proxies.rst
@@ -11,7 +11,7 @@
 behavior of all objects in a running program is easy to implement on
 top of PyPy.
 
-Here is what we implemented so far, in historical order:
+Here is what we have implemented so far, in historical order:
 
 * *Thunk Object Space*: lazily computed objects, computing only when an
   operation is performed on them; lazy functions, computing their result

diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide.rst
@@ -4,8 +4,6 @@
 
 .. contents::
 
-
-
 This document describes coding requirements and conventions for
 working with the PyPy code base.  Please read it carefully and
 ask back any questions you might have. The document does not talk

diff --git a/pypy/doc/discussions.rst b/pypy/doc/discussions.rst
--- a/pypy/doc/discussions.rst
+++ b/pypy/doc/discussions.rst
@@ -7,35 +7,16 @@
 
 
 .. toctree::
+	
+	discussion/cli-optimizations.rst
+	discussion/distribution-implementation.rst
+	discussion/distribution-newattempt.rst
+	discussion/distribution-roadmap.rst
+	discussion/distribution.rst
+	discussion/finalizer-order.rst
+	discussion/howtoimplementpickling.rst
+	discussion/improve-rpython.rst
+	discussion/outline-external-ootype.rst
+	discussion/VM-integration.rst
 
-   discussion/GC-performance.rst
-   discussion/VM-integration.rst
-   discussion/chained_getattr.rst
-   discussion/cli-optimizations.rst
-   discussion/cmd-prompt-translation.rst
-   discussion/compiled-swamp.rst
-   discussion/ctypes_modules.rst
-   discussion/ctypes_todo.rst
-   discussion/distribution.rst
-   discussion/distribution-implementation.rst
-   discussion/distribution-newattempt.rst
-   discussion/distribution-roadmap.rst
-   discussion/emptying-the-malloc-zoo.rst
-   discussion/finalizer-order.rst
-   discussion/gc.rst
-   discussion/howtoimplementpickling.rst
-   discussion/improve-rpython.rst
-   discussion/outline-external-ootype.rst
-   discussion/oz-thread-api.rst
-   discussion/paper-wishlist.rst
-   discussion/parsing-ideas.rst
-   discussion/pypy_metaclasses_in_cl.rst
-   discussion/removing-stable-compiler.rst
-   discussion/security-ideas.rst
-   discussion/somepbc-refactoring-plan.rst
-   discussion/summer-of-pypy-pytest.rst
-   discussion/testing-zope.rst
-   discussion/thoughts_string_interning.rst
-   discussion/translation-swamp.rst
-   discussion/use_case_of_logic.rst
 

diff --git a/pypy/doc/svn-help.rst b/pypy/doc/svn-help.rst
deleted file mode 100644
--- a/pypy/doc/svn-help.rst
+++ /dev/null
@@ -1,153 +0,0 @@
-
-Installing subversion for PyPy
-==============================
-
-Jens-Uwe Mager has prepared some installation files which should
-help you to install subversion on your computer.
-
-+ Download Unix source tarball or prepackaged versions_ for MacOS, Windows, FreeBSD and Linux
-
-+ Additional information for Windows users:
-
-  *  See Microsoft website_ if you have .DLL issues.
-
-  *  Windows Installer file for Tortoise SVN (like Tortoise CVS) GUI_
-     (Pick the UNICODE version for Windows 2000 and XP and
-     see Win_ 2000, NT if you have problems loading it.)
-
-+ Local copy of MacOS_ X binary tar ball
-  (This requires at least OS X 10.3)
-
-+ Debian instructions below...
-
-Getting started
------------------
-
-If you're just getting started with subversion, here's a simple how-to.
-For complete information, you can go read the subversion guide_.
-
-**Download and install the appropriate installation file of subversion above.**
-
-For linux:
-
-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::
-
-  $ apt-get install subversion-tools
-
-People using Debian *stable* first need to add the following line to ``/etc/apt/sources.list`` (thanks backports_!)::
-
-  deb http://fs.cs.fhm.edu/mirror/backports.org/debian stable subversion
-
-Note that you can always go look at the files online_ with your browser, located at: http://codespeak.net/svn/pypy/trunk
-But, you'll want to check out your own local copies to work on.
-
-Check out and Check in
-----------------------------
-
-In order to get the sourcecode and docs downloaded onto your drive, open a shell or commandline and type::
-
-  $ svn co http://codespeak.net/svn/pypy/trunk
-
-If you are behind a dump proxy this may or may not work; see below.
-
-Once you've got the files checked out to your own system, you can use your favorite text editor to change to files. Be sure to read the coding-guide_ and other documentation files before doing a lot of work on the source code. Before doing any work, make sure you're using the most recent update with::
-
-  $ svn up
-
-this will update whichever subdirectory you're in (doc or src).
-
-When you're ready to **check in** a file,
-
-cd to your local checked out sourcecode directory, and if necessary, copy the file over from wherever you worked on it::
-
- $ cp ~/mydir/filename.ext filename.ext
-
-If you're adding a brand-new file::
-
-  $ svn add filename.ext
-
-Then, to **commit** it::
-
- $ svn ci -m "your comments about what changes your committing"
- $ your password: (this may not be necessary)
-
-You'll see something like the following::
-
- Adding         goals/stringcomp.py
- Transmitting file data .
- Committed revision 578.
-
-or::
-
- Sending        coding-guide.txt
- Transmitting file data .
- Committed revision 631.
-
-Check online on the `svn-commit archives`_ and you'll see your revision. Feel free to add a documentation file on any major changes you've made!
-
-.. _`svn-commit archives`: http://codespeak.net/pipermail/pypy-svn/
-
-Some other useful subversion tricks:
---------------------------------------
-
-**Be sure to remember ``svn`` in the commandline in the following commands.**
-
-``$ svn mv filename.ext``
-    to move or rename a file
-
-``$ svn rm filename.ext``
-    to remove (delete) a file
-
-``$ svn status``
-    will let you know what changes you've made compared to the current repository version
-
-``$ svn revert filename.ext``
-    will fix problems if you deleted or moved a file without telling svn.
-
-``$ svn cleanup``
-    last resort to fix it if you've got a totally messed up local copy.
-    Use this if you see error messages about ``locked`` files that you can't fix otherwise.
-
-Circumventing proxies
-----------------------------
-
-Some proxies don't let extended HTTP commands through.  If you have an
-error complaining about a bad request, you should use https: instead of
-http: in the subversion URL. This will make use of SSL encryption, which
-cannot be intercepted by proxies.
-
-Alternatively, if you want to change your proxy configuration, see the
-subversion FAQ: http://subversion.tigris.org/faq.html#proxy
-
-How to Avoid Line-ending Hell
------------------------------
-
-We will assume that whenever you create a .txt or a .py file, you would
-like other people to be able to read it with the line endings their
-OS prefers, even if that is different from the one your OS likes.  This
-could occasionally be wrong -- say when you are specifically testing
-that code you are writing handles line endings properly -- but this is
-what you want by default.  Binary files, on the other hand, should be
-stored exactly as is. This has to be set on every client. Here is how:
-
-In your home directory edit .subversion/config and comment in ::
-
-   [miscellany]
-   enable-auto-props = yes
-
-   [auto-props]
-   *.txt = svn:eol-style=native
-   *.py  = svn:eol-style=native
-
-
-.. _website: http://support.microsoft.com/default.aspx?scid=kb%3Ben-us%3B259403
-.. _GUI: http://tortoisesvn.tigris.org/servlets/ProjectDocumentList?folderID=616
-.. _MacOS: http://codespeak.net/~jum/svn-1.4.0-darwin-ppc.tar.gz
-.. _versions: http://subversion.tigris.org/project_packages.html
-.. _Win: http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=4B6140F9-2D36-4977-8FA1-6F8A0F5DCA8F
-.. _guide: http://svnbook.red-bean.com/book.html#svn-ch-1
-.. _backports: http://www.backports.org
-.. _online: http://codespeak.net/svn/pypy/trunk/
-.. _coding-guide: coding-guide.html

diff --git a/pypy/doc/old_news.rst b/pypy/doc/old_news.rst
deleted file mode 100644
--- a/pypy/doc/old_news.rst
+++ /dev/null
@@ -1,306 +0,0 @@
-The PyPy project aims at producing a flexible and fast Python_
-implementation.  The guiding idea is to translate a Python-level
-description of the Python language itself to lower level languages.
-Rumors have it that the secret goal is being faster-than-C which is
-nonsense, isn't it?  `more...`_
-
-.. _Python: http://www.python.org/doc/current/ref/ref.html
-.. _`more...`: architecture.html#mission-statement 
-
-
-Leysin Winter Sports Sprint, 12th - 19th January 2008
-==================================================================
-
-.. raw:: html
-
-   <table border=0><tr><td colspan="3">
-
-The next PyPy sprint will be held in Leysin, Switzerland, for
-the fifth time.  The overall idea of the sprint is to continue
-working on making PyPy ready for general use. 
-
-.. raw:: html
-
-   </td></tr><tr><td valign="top">
-
-The proposed topics are: ctypes, JIT, testing, LLVM.  This is
-a fully public sprint, so newcomers and other topics are
-welcome.  And like previous winters, the main side goal is to
-have fun in winter sports :-) See the `sprint announcement`__
-for details.
-
-.. raw:: html
-
-   </td><td>&nbsp;
-   </td><td><img src="http://www.ermina.ch/002.JPG"></td></tr></table>
-
-.. __: http://codespeak.net/pypy/extradoc/sprintinfo/leysin-winter-2008/announcement.html
-
-
-PyPy blog started
-=================
-
-A few days ago some of the PyPy developers started a `PyPy Status Blog`_. Let's
-see how this works out. *(November 13th, 2007)*
-
-.. _`PyPy Status Blog`: http://morepypy.blogspot.com
-
-
-PyPy/Squeak Sprint in Bern finished
-===================================
-
-The Bern sprint, being the first Squeak-PyPy-collaboration-sprint is finished.
-The week was very intense and productive, see `Bern Sprint Summary blog post`_
-for a list of things we accomplished. We covered most of what happened during
-the sprint in quite some detail on the `PyPy Squeak blog`_.  The sprint was
-hosted by the Software Composition Group of the University of Bern from the
-22nd to the 26th of October 2007.
-
-.. _`Bern sprint announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/bern2007/announce.html
-.. _`people that are known to come`: http://codespeak.net/pypy/extradoc/sprintinfo/bern2007/people.html
-.. _`Bern Sprint Summary blog post`: http://pypysqueak.blogspot.com/2007/10/bern-sprint-finished-summary.html
-.. _`PyPy Squeak blog`: http://pypysqueak.blogspot.com
-
-
-
-PyPy Sprint in Gothenburg: 19nd-25th November 2007
-==================================================================
-
-
-The next post-EU-project PyPy sprint will be in Gothenburg, Sweden. It will
-focus on cleaning up the PyPy codebase and making it ready for the next round
-of improvements. It is a "public" sprint but it will probably be more suitable
-for people already somewhat acquainted with PyPy.  For more information see the
-`Gothenburg sprint announcement`_ or a list of the `people that are known to
-come to Gothenburg`_.
-
-.. _`Gothenburg sprint announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/gothenburg-2007/announce.html
-.. _`people that are known to come to Gothenburg`: http://codespeak.net/pypy/extradoc/sprintinfo/gothenburg-2007/people.html
-
-
-
-
-PyPy Sprint at EuroPython, Vilnius is finished
-==================================================================
-
-The sprint at the last EuroPython_ conference in Vilnius from the 9th to
-the 11th of July, 2007 is finished. For more information
-see the `Vilnius sprint announcement`_.
-
-
-.. _EuroPython: http://europython.org
-.. _`Vilnius sprint announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/post-ep2007/announcement.html
-
-
-Review passed with flying colours
-=================================
-
-On the 31st of May 2007 the PyPy project was reviewed by the EU
-Commission in Brussels. Reviewers were Roel Wuyts, Unversit&#233; Libre de
-Bruxelles and Aki Lumiaho, Ramboll, Finland. Present was also our
-Project Officer, Charles McMillan. After 6 hours of presentations of
-the various aspects of the project, it only took the reviewers a few
-minutes to decide that the project was accepted, without any further
-work being required. Professor Wuyts, who has dynamic programming
-languages as his main field of research was very enthusiastic about
-the entire project and the results with the Just In Time Compiler
-Generator in particular. He offered his help in establishing
-collaborations with the communities around Prolog, Smalltalk, Lisp and
-other dynamic languages, as well as giving hints on how to get our
-results most widely publicized.
-
-The preparations for the review left the team rather exhausted so
-development progress will be rather slow until the sprint at
-Europython in the second week of July.
-
-PyPy EU funding period over, Review ahead 
-===========================================================
-
-The 28 month EU project period of PyPy is over and new things are to come!  
-On 11th May we `submitted last documents`_ to the European Union and are now 
-heading towards a 31st May Review Meeting in Bruxelles.  The `PyPy EU Final
-Activity Report`_ summarizes what we did and what we have in mind
-on technical, scientific and community levels.  It also contains reflections 
-and recommendations possibly interesting to other projects aiming at 
-EU funded Open Source research. *(12th May, 2007)* 
-
-.. _`submitted last documents`: http://codespeak.net/pypy/dist/pypy/doc/index-report.html 
-.. _`PyPy EU Final Activity Report`: http://codespeak.net/pypy/extradoc/eu-report/PYPY-EU-Final-Activity-Report.pdf
-
-PyPy 1.0: JIT compiler generator, optimizations and more
-==================================================================
-
-We are proud to release PyPy 1.0.0, our sixth public release (Download_).  See
-the `release announcement <release-1.0.0.html>`__ to read about the
-many new features in this release, especially the results of our
-JIT generation technology.  See also our detailed instructions on
-how to `get started`_. *(March 27th, 2007)*
-
-.. _Download: getting-started.html#just-the-facts
-.. _`get started`: getting-started.html
-
-
-
-
-PyPy Trillke Sprints (25-28th Feb and 1-5th March 2007) finished
-==================================================================
-
-Both of the sprints that mark the end of the EU period are over. There were very
-good results, both on a `report level`_ as well as on a `technical level`_.
-The sprint also had a good discussion about the future of PyPy after the EU
-project ends, see the `mail Armin wrote`_ and `the meeting's minutes`_. You can
-also look at the pictures that `Carl Friedrich`_ and that `Lene took`_ during
-the sprint or read the `sprint announcement`_. *(March 10th, 2007)*
-
-.. _`sprint announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/trillke-2007/announcement.html
-.. _`report level`: http://codespeak.net/pipermail/pypy-dev/2007q1/003578.html 
-.. _`technical level`: http://codespeak.net/pipermail/pypy-dev/2007q1/003579.html
-.. _`Carl Friedrich`: http://codespeak.net/~cfbolz/hildesheim3-sprint-pictures/
-.. _`Lene took`: http://codespeak.net/~lene/trillke-sprint-web/Page1.html
-.. _`mail Armin wrote`: http://codespeak.net/pipermail/pypy-dev/2007q1/003577.html
-.. _`the meeting's minutes`: http://codespeak.net/svn/pypy/extradoc/minute/post-eu-structure.txt
-
-
-
-
-PyPy 0.99.0: optimizations, backends, new object spaces and more
-==================================================================
-
-We are proud to release PyPy 0.99.0, our fifth public release.  See
-the `release announcement <release-0.99.0.html>`__ to read about the
-many new features in this release.  See also our detailed instructions on
-how to `get started`_. *(February 17th, 2007)*
-
-.. _`get started`: getting-started.html
-
-
-py lib 0.9.0: py.test, distributed execution, greenlets and more
-==================================================================
-
-Our development support and testing library was publically released, see the 
-`0.9 release announcement <http://codespeak.net/py/dist/release-0.9.0.html>`__
-and its extensive `online documentation <http://codespeak.net/py/dist/>`__. 
-*(February 15th, 2007)*
-
-
-
-Leysin Winter Sports Sprint, 8th - 14th January 2007
-==================================================================
-
-.. raw:: html
-
-   <table border=0><tr><td>
-
-The PyPy Leysin sprint is over. We worked hard on various topics, including
-preparing the upcoming py-lib and PyPy releases. For more details, see the
-`Leysin sprint report`_, the `Leysin announcement`_ and the
-`list of people present`_.
-
-
-.. raw:: html
-
-   </td><td><img src="http://www.ermina.ch/002.JPG"></td></tr></table>
-
-.. _`Leysin announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/leysin-winter-2007/announcement.html
-.. _`Leysin sprint report`: http://codespeak.net/pipermail/pypy-dev/2007q1/003481.html
-.. _`list of people present`: http://codespeak.net/svn/pypy/extradoc/sprintinfo/leysin-winter-2007/people.txt
-
-
-Massive Parallelism and Translation Aspects
-========================================================
-
-Our next big `EU report`_ about Stackless features, optimizations, and
-memory management is finished.  You can download it `as pdf`_.
-
-.. _`EU report`: index-report.html
-.. _`as pdf`: http://codespeak.net/pypy/extradoc/eu-report/D07.1_Massive_Parallelism_and_Translation_Aspects-2007-02-28.pdf
-
-
-Duesseldorf sprint #2, 30th October - 5th November over
-==================================================================
-
-The Duesseldorf sprint is over. It was a very productive sprint with work done
-in various areas. Read the `sprint report`_ for a detailed description of what
-was achieved and the `full announcement`_ for various details.
-
-.. _`full announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/ddorf2006b/announce.html
-.. _`sprint report`: http://codespeak.net/pipermail/pypy-dev/2006q4/003396.html
-
-
-
-Dynamic Languages Symposium (OOPSLA, 23rd October)
-==================================================================
-
-We will present a paper at the `Dynamic Languages Symposium`_ describing
-`PyPy's approach to virtual machine construction`_.  The DLS is a
-one-day forum within OOPSLA'06 (Portland, Oregon, USA).  The paper is a
-motivated overview of the annotation/rtyping translation tool-chain,
-with experimental results.
-
-As usual, terminology with PyPy is delicate :-)  Indeed, the title is
-both correct and misleading - it does not describe "the" PyPy virtual
-machine, since we have never hand-written one.  This paper focuses on
-how we are generating such VMs, not what they do.
-
-.. _`Dynamic Languages Symposium`: http://www.oopsla.org/2006/submission/tracks/dynamic_languages_symposium.html
-.. _`PyPy's approach to virtual machine construction`: http://codespeak.net/svn/pypy/extradoc/talk/dls2006/pypy-vm-construction.pdf
-
-
-
-Summer of PyPy: Calls for proposals open now! 
-==================================================================
-
-Happily, we are able to offer students mentoring and full sprint
-participant's funding if we receive a proposal outlining an
-interesting project related to PyPy and its development tools.  This
-follows up on the "Summer of Code" campaign from Google but is
-completely independent from it and also works differently. 
-See the full call for details: 
-
-    http://codespeak.net/pypy/dist/pypy/doc/summer-of-pypy.html
-
-
-Ireland sprint 21st-27th August 
-==================================================================
-
-The last PyPy sprint happened in the nice city of 
-Limerick in Ireland from 21st till 27th August.  
-The main focus of the sprint was on JIT compiler works, 
-various optimization works, porting extension modules, 
-infrastructure works like a build tool for PyPy and
-extended (distributed) testing. 
-Read the full `announcement`_ for more details. 
-
-.. _`announcement`: http://codespeak.net/pypy/extradoc/sprintinfo/ireland-2006/announce.html
-
-Release of PyPy video documentation
-==================================================================
-
-The PyPy team is happy to announce that the first bunch of PyPy videos
-can now be downloaded from:
-
-http://codespeak.net/pypy/dist/pypy/doc/video-index.html
-
-The videos introduce involved people and contain different talks, tutorials and
-interviews and can be downloaded via bittorrent. **29th June 2006**
-
-PyPy 0.9.0
-==================================================================
-
-We are proud to release PyPy 0.9.0, our fourth public release.  See
-the `release announcement <release-0.9.0.html>`__ to read about the
-many new features in this release.
-
-PyPy and Summer of Code 2006
-==================================================================
-
-PyPy will again mentor students through Google's `Summer of Code`_
-campaign. Three students will kick-off their work on PyPy by
-participating in the Duesseldorf sprint. They will be exploring a
-back-end for Microsoft.NET, work on ways to build web applications
-with Javascript code (in this case by translating RPython to
-Javascript) and porting some CPython modules to use ctypes. Welcome to
-the team!
-
-.. _`Summer of Code`: http://code.google.com/soc/psf/about.html
-

diff --git a/pypy/doc/maemo.rst b/pypy/doc/maemo.rst
deleted file mode 100644
--- a/pypy/doc/maemo.rst
+++ /dev/null
@@ -1,187 +0,0 @@
-How to run PyPy on top of maemo platform
-========================================
-
-This howto explains how to use Scratchbox_ to cross-compile PyPy's 
-Python Interpreter to an `Internet-Tablet-OS`_, more specifically 
-the Maemo_ platform.  This howto should work well for getting
-a usable Python Interpreter for Nokia's N810_ device. 
-
-setup cross-compilation environment
--------------------------------------
-
-The main steps are to install scratchbox and the Maemo SDK.  Please refer 
-to Nokia's `INSTALL.txt`_ for more detail. 
-
-Adjust linux kernel settings
-+++++++++++++++++++++++++++++++++
-
-In order to install and run scratchbox you will need to adjust
-your Linux kernel settings.  Note that the VDSO setting may
-crash your computer - if that is the case, try running without
-this setting. You can try it like this::
-
-   $ echo 4096 | sudo tee /proc/sys/vm/mmap_min_addr
-   $ echo 0 | sudo tee /proc/sys/vm/vdso_enabled 
-
-If that works fine for you (on some machines the vdso setting can freeze machines) 
-you can make the changes permanent by editing ``/etc/sysctl.conf`` to contain::
-
-    vm.vdso_enabled = 0
-    vm.mmap_min_addr = 4096
-
-install scratchbox packages
-+++++++++++++++++++++++++++++++++
-
-Download 
-
-	http://repository.maemo.org/stable/diablo/maemo-scratchbox-install_4.1.1.sh
-
-and run this script as root::
-
-  $ sh maemo-scratchbox-install_4.1.1.sh -s /scratchbox -u ACCOUNTNAME 
-
-The script will automatically download Debian packages or tarballs 
-and pre-configure a scratchbox environment with so called "devkits" 
-and "toolchains" for performing cross-compilation.  It's fine
-and recommended to use your linux account name as a scratchbox 
-ACCOUNTNAME. 
-
-It also sets up an "sbox" group on your system and makes you
-a member - giving the right to login to a scratchbox environment. 
-
-testing that scratchbox environment works
-+++++++++++++++++++++++++++++++++++++++++++++++
-
-Login freshly to your Linux account in order to activate 
-your membership in the "sbox" unix group and then type::
-
-  $ /scratchbox/login 
-
-This should warn you with something like "sb-conf: no current
-target" because we have not yet created a cross-compilation
-target.  
-
-Note that Scratchbox starts daemon services which 
-can be controlled via::
-
-    /scratchbox/sbin/sbox_ctl start|stop
-
-
-Installing the Maemo SDK 
-+++++++++++++++++++++++++++++++
-
-To mimic the specific N810_ environment we now install the Maemo-SDK.  
-This will create an target within our new scratchbox environment 
-that we then use to compile PyPy.  
-
-Make sure that you are a member of the "sbox" group - this might
-require logging out and in again. 
-
-Then, download 
-
-   http://repository.maemo.org/stable/diablo/maemo-sdk-install_4.1.1.sh
-
-and execute it with user privileges::
-
-   $ sh maemo-sdk-install_4.1.1.sh
-
-When being asked select the default "Runtime + Dev" packages.  You do not need 
-Closed source Nokia binaries for PyPy.  This installation
-script will download "rootstraps" and create so called
-"targets" and preselect the "DIABLO_ARMEL" target for ARM
-compilation.  Within the targets a large number of packages
-will be pre-installed resulting in a base scratchbox
-environment that is usable for cross compilation of PyPy.  
-
-Customizing the DIABLO_ARMEL target for PyPy
-++++++++++++++++++++++++++++++++++++++++++++++++
-
-As PyPy does not yet provide a debian package description
-file for use on Maemo, we have to install some dependencies manually
-into our Scratchbox target environment.  
-
-1. Go into your scratchbox by executing ``/scratchbox/login``
-   (this should bring you to a shell with the DIABLO_ARMEL target) 
-
-2. Add these lines to ``/etc/apt/sources.list``::
-
-    deb http://repository.maemo.org/extras/ diablo free non-free
-    deb http://repository.maemo.org/extras-devel/ diablo free non-free
-
-   NOTE: if you have an older version of Maemo on your device you 
-   can try substitute "chinook" for "diablo" in the above lines 
-   and/or update your firmware.  You can probably see which version
-   you are using by looking at the other content of the ``sources.list``. 
-
-3. Perform ``apt-get update``.
-
-4. Install some necessary packages::
-
-     apt-get install python2.5-dev libffi4-dev zlib1g-dev libbz2-dev libgc-dev libncurses5-dev 
-
-   The "libgc-dev" package is only needed if you want to use the Boehm
-   garbage collector. 
-
-5. Leave the scratchbox shell again with ``exit``. 
-
-
-Translating PyPy for the Maemo platform
-------------------------------------------
-
-You at least need "gcc" and "libc-dev" packages on your host system 
-to compile pypy.  The scratchbox and its DIABLO_ARMEL target contains 
-its own copies of GCC, various C libraries and header files
-which pypy needs for successful cross-compilation.  
-
-Now, on the host system, perform a mercurial clone of PyPy::
-
-    hg clone ssh://hg@bitbucket.org/pypy/pypy
-
-Several revisions since about 9d7b7ecb9144 are known to work and
-the last manually tested one is currently 7f267e4b7861.  
-
-Change to the ``pypy-trunk/pypy/translator/goal`` directory and execute::
-
-    python translate.py --platform=maemo --opt=3
-
-You need to run translate.py using Python 2.5.  This will last some 30-60
-minutes on most machines.  For compiling the C source code PyPy's tool chain
-will use our scratchbox/Maemo cross-compilation environment. 
-
-When this step succeeds, your ``goal`` directory will contain a binary called
-``pypy-c`` which is executable on the Maemo device. To run this binary
-on your device you need to also copy some support files. A good way to 
-perform copies to your device is to install OpenSSH on the
-mobile device and use "scp" or rsync for transferring files.
-
-You can just copy your whole pypy-trunk directory over to your mobile 
-device - however, only these should be needed::
-
-    lib/pypy1.2/lib_pypy
-    lib/pypy1.2/lib-python
-    pypy/translator/goal/pypy-c
-
-It is necessary that the ``pypy-c`` can find a "lib-python" and "lib_pypy" directory
-if you want to successfully startup the interpreter on the device. 
-
-Start ``pypy-c`` on the device. If you see an error like "setupterm: could not find terminal" 
-you probably need to perform this install on the device::
-
-    apt-get install ncurses-base
-
-Eventually you should see something like::
-
-    Nokia-N810-51-3:~/pypy/trunk# ./pypy-c
-    Python Python 2.5.2 (pypy 1.0.0 build 59527) on linux2
-    Type "help", "copyright", "credits" or "license" for more information.
-    And now for something completely different: ``E09 2K @CAA:85?''
-    >>>> 
-
-    
-.. _N810: http://en.wikipedia.org/wiki/Nokia_N810
-.. _`Internet-Tablet-OS`: http://en.wikipedia.org/wiki/Internet_Tablet_OS
-.. _Maemo: http://www.maemo.org 
-.. _Scratchbox: http://www.scratchbox.org 
-.. _`INSTALL.txt`: http://tablets-dev.nokia.com/4.1/INSTALL.txt
-
-

diff --git a/pypy/doc/dev_method.rst b/pypy/doc/dev_method.rst
--- a/pypy/doc/dev_method.rst
+++ b/pypy/doc/dev_method.rst
@@ -20,7 +20,7 @@
 Main tools for achieving this is:
 
   * py.test - automated testing
-  * Subversion - version control
+  * Mercurial - version control
   * Transparent communication and documentation (mailinglists, IRC, tutorials
     etc etc) 
 
@@ -237,124 +237,3 @@
 interested in using sprints as away of making contact with active developers
 (Python/compiler design etc)!
 
-If you have questions about our sprints and EU-funding - please send an email
-to pypy-funding at codespeak.net, our mailinglist for project coordination.
-
-Previous sprints?
-+++++++++++++++++
-
-The PyPy team has been sprinting on the following occasions::
-
-    * Hildesheim                      Feb     2003
-    * Gothenburg                      May     2003
-    * Europython/Louvain-La-Neuve     June    2003
-    * Berlin                          Sept    2003
-    * Amsterdam                       Dec     2003
-    * Europython/Gothenburg           June    2004
-    * Vilnius                         Nov     2004
-    * Leysin                          Jan     2005
-    * PyCon/Washington                March   2005     
-    * Europython/Gothenburg           June    2005
-    * Hildesheim                      July    2005
-    * Heidelberg                      Aug     2005
-    * Paris                           Oct     2005
-    * Gothenburg                      Dec     2005
-    * Mallorca                        Jan     2006
-    * PyCon/Dallas                    Feb     2006
-    * Louvain-La-Neuve                March   2006
-    * Leysin                          April   2006
-    * Tokyo                           April   2006
-    * D&#252;sseldorf                      June    2006
-    * Europython/Geneva               July    2006
-    * Limerick                        Aug     2006
-    * D&#252;sseldorf                      Oct     2006
-    * Leysin                          Jan     2007
-    * Hildesheim                      Feb     2007
-    
-People who have participated and contributed during our sprints and thus
-contributing to PyPy (if we have missed someone here - please contact us 
-so we can correct it):
-
-    Armin Rigo
-    Holger Krekel
-    Samuele Pedroni
-    Christian Tismer
-    Laura Creighton
-    Jacob Hall&#233;n
-    Michael Hudson
-    Richard Emslie
-    Anders Chrigstr&#246;m
-    Alex Martelli
-    Ludovic Aubry
-    Adrien DiMascio
-    Nicholas Chauvat
-    Niklaus Haldimann
-    Anders Lehmann
-    Carl Friedrich Bolz
-    Eric Van Riet Paap
-    Stephan Diel
-    Dinu Gherman
-    Jens-Uwe Mager
-    Marcus Denker
-    Bert Freudenberg
-    Gunther Jantzen
-    Henrion Benjamin
-    Godefroid Chapelle
-    Anna Ravenscroft
-    Tomek Meka
-    Jonathan David Riehl
-    Patrick Maupain
-    Etienne Posthumus
-    Nicola Paolucci
-    Albertas Agejevas
-    Marius Gedminas
-    Jesus Cea Avion
-    Olivier Dormond
-    Jacek Generowicz
-    Brian Dorsey
-    Guido van Rossum
-    Bob Ippolito
-    Alan McIntyre
-    Lutz Paelike
-    Michael Chermside
-    Beatrice D&#252;ring
-    Boris Feigin
-    Amaury Forgeot d'Arc 
-    Andrew Thompson      
-    Valentino Volonghi   
-    Aurelien Campeas
-    Stephan Busemann
-    Johan Hahn
-    Gerald Klix
-    Gene Oden
-    Josh Gilbert
-    Geroge Paci
-    Martin Blais
-    Stuart Williams
-    Jiwon Seo
-    Michael Twomey 
-    Wanja Saatkamp
-    Alexandre Fayolle
-    Rapha&#235;l Collet
-    Gr&#233;goire Dooms
-    Sanghyeon Seo
-    Yutaka Niibe
-    Yusei Tahara
-    George Toshida
-    Koichi Sasada
-    Guido Wesdorp        
-    Maciej Fijalkowski   
-    Antonio Cuni          
-    Lawrence Oluyede    
-    Fabrizio Milo        
-    Alexander Schremmer  
-    David Douard       
-    Michele Frettoli     
-    Simon Burton         
-    Aaron Bingham        
-    Pieter Zieschang     
-    Sad Rejeb 
-    Brian Sutherland
-    Georg Brandl
-
-

diff --git a/pypy/doc/style.css b/pypy/doc/style.css
deleted file mode 100644
--- a/pypy/doc/style.css
+++ /dev/null
@@ -1,1091 +0,0 @@
-body,body.editor,body.body {
-    font: 90% "Times New Roman", Arial, Verdana, Helvetica, serif;
-    background: White;
-    color: Black;
-}
-
-a, a.reference {
-	text-decoration: none; 
-}
-a[href]:hover { text-decoration: underline; }
-
-img {
-    border: none;
-	vertical-align: middle;
-}
-
-p, div.text {
-    text-align: left;
-    line-height: 1.5em;
-    margin: 0.5em 0em 0em 0em;
-}
-
-
-
-p a:active {
-	color: Red;
-    background-color: transparent;
-}
-
-p img {
-    border: 0;
-    margin: 0;
-}
-
-img.inlinephoto {
-    padding: 0;
-    padding-right: 1em;
-    padding-top: 0.7em;
-    float: left;
-}
-
-hr {
-    clear: both;
-    height: 1px;
-    color: #8CACBB;
-    background-color: transparent;
-}
-
-
-ul { 
-    line-height: 1.5em;
-    /*list-style-image: url("bullet.gif"); */
-    margin-left: 1.5em;
-    padding:0;
-}
-
-ol {
-    line-height: 1.5em;
-    margin-left: 1.5em;
-    padding:0;
-}
-
-ul a, ol a {
-    text-decoration: underline;
-}
-
-dl {
-}
-
-dt {
-    font-weight: bold;    
-}
-
-dd {
-    line-height: 1.5em;
-    margin-bottom: 1em;
-}
-
-blockquote {
-    font-family: Times, "Times New Roman", serif;
-    font-style: italic;
-    font-size: 120%;
-}
-
-code {
-    color: Black;
-    /*background-color: #dee7ec;*/
-    background-color: #cccccc;
-}
-
-pre {
-    padding: 1em;
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: #dee7ec;
-    background-color: #cccccc;
-    overflow: auto;
-}
-
-
-.netscape4 {
-    display: none;
-}
-
-/* main page styles */
-
-/*a[href]:hover { color: black; text-decoration: underline; }
-a[href]:link { color: black; text-decoration: underline; }
-a[href] { color: black; text-decoration: underline; }
-*/
-
-span.menu_selected {
-	color: black;
-  	font: 120% Verdana, Helvetica, Arial, sans-serif;
-	text-decoration: none;
-    padding-right: 0.3em;
-    background-color: #cccccc;
-}
-
-
-a.menu {
-  	/*color: #3ba6ec; */
-  	font: 120% Verdana, Helvetica, Arial, sans-serif;
-	text-decoration: none;
-    padding-right: 0.3em;
-}
-
-a.menu[href]:visited, a.menu[href]:link{
-  	/*color: #3ba6ec; */
-  	font: 120% Verdana, Helvetica, Arial, sans-serif;
-	text-decoration: none;
-}
-
-a.menu[href]:hover {
-  	/*color: black;*/
-}
-
-div.project_title{
-  /*border-spacing: 20px;*/
-  font: 160% Verdana, Helvetica, Arial, sans-serif;
-  color: #3ba6ec; 
-  vertical-align: center;
-  padding-bottom: 0.3em;
-}
-
-a.wikicurrent {
-  font: 100% Verdana, Helvetica, Arial, sans-serif;
-  color: #3ba6ec; 
-  vertical-align: middle;
-}
-
-
-table.body {
-  border: 0;
-  /*padding: 0;
-  border-spacing: 0px;
-  border-collapse: separate;
-  */
-}
-
-td.page-header-left {
-  padding: 5px;
-  /*border-bottom: 1px solid #444444;*/
-}
-
-td.page-header-top {
-  padding: 0;
-    
-  /*border-bottom: 1px solid #444444;*/
-}
-
-td.sidebar {
-  padding: 1 0 0 1;
-}
-
-td.sidebar p.classblock {
-  padding: 0 5 0 5;
-  margin: 1 1 1 1;
-  border: 1px solid #444444;
-  background-color: #eeeeee;
-}
-
-td.sidebar p.userblock {
-  padding: 0 5 0 5;
-  margin: 1 1 1 1;
-  border: 1px solid #444444;
-  background-color: #eeeeff;
-}
-
-td.content {
-  padding: 1 5 1 5;
-  vertical-align: top;
-  width: 100%;
-}
-
-p.ok-message {
-  background-color: #22bb22;
-  padding: 5 5 5 5;
-  color: white;
-  font-weight: bold;
-}
-p.error-message {
-  background-color: #bb2222;
-  padding: 5 5 5 5;
-  color: white;
-  font-weight: bold;
-}
-
-p:first-child { 
-  margin: 0 ;
-  padding: 0;
-}
-
-/* style for forms */
-table.form {
-  padding: 2;
-  border-spacing: 0px;
-  border-collapse: separate;
-}
-
-table.form th {
-  color: #333388;
-  text-align: right;
-  vertical-align: top;
-  font-weight: normal;
-}
-table.form th.header {
-  font-weight: bold;
-  background-color: #eeeeff;
-  text-align: left;
-}
-
-table.form th.required {
-  font-weight: bold;
-}
-
-table.form td {
-  color: #333333;
-  empty-cells: show;
-  vertical-align: top;
-}
-
-table.form td.optional {
-  font-weight: bold;
-  font-style: italic;
-}
-
-table.form td.html {
-  color: #777777;
-}
-
-/* style for lists */
-table.list {
-  border-spacing: 0px;
-  border-collapse: separate;
-  vertical-align: top;
-  padding-top: 0;
-  width: 100%;
-}
-
-table.list th {
-  padding: 0 4 0 4;
-  color: #404070;
-  background-color: #eeeeff;
-  border-right: 1px solid #404070;
-  border-top: 1px solid #404070;
-  border-bottom: 1px solid #404070;
-  vertical-align: top;
-  empty-cells: show;
-}
-table.list th a[href]:hover { color: #404070 }
-table.list th a[href]:link { color: #404070 }
-table.list th a[href] { color: #404070 }
-table.list th.group {
-  background-color: #f4f4ff;
-  text-align: center;
-  font-size: 120%;
-}
-
-table.list td {
-  padding: 0 4 0 4;
-  border: 0 2 0 2;
-  border-right: 1px solid #404070;
-  color: #404070;
-  background-color: white;
-  vertical-align: top;
-  empty-cells: show;
-}
-
-table.list tr.normal td {
-  background-color: white;
-  white-space: nowrap;
-}
-
-table.list tr.alt td {
-  background-color: #efefef;
-  white-space: nowrap;
-}
-
-table.list td:first-child {
-  border-left: 1px solid #404070;
-  border-right: 1px solid #404070;
-}
-
-table.list th:first-child {
-  border-left: 1px solid #404070;
-  border-right: 1px solid #404070;
-}
-
-table.list tr.navigation th {
-  text-align: right;
-}
-table.list tr.navigation th:first-child {
-  border-right: none;
-  text-align: left;
-}
-
-
-/* style for message displays */
-table.messages {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.messages th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.messages th {
-  font-weight: bold;
-  color: black;
-  text-align: left;
-  border-bottom: 1px solid #afafaf;
-}
-
-table.messages td {
-  font-family: monospace;
-  background-color: #efefef;
-  border-bottom: 1px solid #afafaf;
-  color: black;
-  empty-cells: show;
-  border-right: 1px solid #afafaf;
-  vertical-align: top;
-  padding: 2 5 2 5;
-}
-
-table.messages td:first-child {
-  border-left: 1px solid #afafaf;
-  border-right: 1px solid #afafaf;
-}
-
-/* style for file displays */
-table.files {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.files th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.files th {
-  border-bottom: 1px solid #afafaf;
-  font-weight: bold;
-  text-align: left;
-}
-
-table.files td {
-  font-family: monospace;
-  empty-cells: show;
-}
-
-/* style for history displays */
-table.history {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.history th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-  font-size: 100%;
-}
-
-table.history th {
-  border-bottom: 1px solid #afafaf;
-  font-weight: bold;
-  text-align: left;
-  font-size: 90%;
-}
-
-table.history td {
-  font-size: 90%;
-  vertical-align: top;
-  empty-cells: show;
-}
-
-
-/* style for class list */
-table.classlist {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.classlist th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.classlist th {
-  font-weight: bold;
-  text-align: left;
-}
-
-
-/* style for class help display */
-table.classhelp {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.classhelp th {
-  font-weight: bold;
-  text-align: left;
-  color: #707040;
-}
-
-table.classhelp td {
-  padding: 2 2 2 2;
-  border: 1px solid black;
-  text-align: left;
-  vertical-align: top;
-  empty-cells: show;
-}
-
-
-/* style for "other" displays */
-table.otherinfo {
-  border-spacing: 0px;
-  border-collapse: separate;
-  width: 100%;
-}
-
-table.otherinfo th.header{
-  padding-top: 10px;
-  border-bottom: 1px solid gray;
-  font-weight: bold;
-  background-color: white;
-  color: #707040;
-}
-
-table.otherinfo th {
-  border-bottom: 1px solid #afafaf;
-  font-weight: bold;
-  text-align: left;
-}
-
-input {
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: white;
-    vertical-align: middle;
-    margin-bottom: 1px; /* IE bug fix */
-    padding: 0.1em;
-}
-
-select {
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: white;
-    vertical-align: middle;
-    margin-bottom: 1px; /* IE bug fix */
-    padding: 0.1em;
-}
-
-
-a.nonexistent {
-    color: #FF2222;
-}
-a.nonexistent:visited {
-    color: #FF2222;
-}
-a.external {
-    color: #AA6600;
-}
-
-/*
-dl,ul,ol {
-    margin-top: 1pt;
-}
-tt,pre {
-    font-family: Lucida Console,Courier New,Courier,monotype;
-    font-size: 12pt;
-}
-pre.code {
-    margin-top: 8pt;
-    margin-bottom: 8pt;
-    background-color: #FFFFEE;
-    white-space:pre;
-    border-style:solid;
-    border-width:1pt;
-    border-color:#999999;
-    color:#111111;
-    padding:5px;
-    width:100%;
-}
-*/
-div.diffold {
-    background-color: #FFFF80;
-    border-style:none;
-    border-width:thin;
-    width:100%;
-}
-div.diffnew {
-    background-color: #80FF80;
-    border-style:none;
-    border-width:thin;
-    width:100%;
-}
-div.message {
-    margin-top: 6pt;
-    background-color: #E8FFE8;
-    border-style:solid;
-    border-width:1pt;
-    border-color:#999999;
-    color:#440000;
-    padding:5px;
-    width:100%;
-}
-strong.highlight {
-    background-color: #FFBBBB;
-/* as usual, NetScape fucks up with innocent CSS
-    border-color: #FFAAAA;
-    border-style: solid;
-    border-width: 1pt;
-*/
-}
-
-table.navibar {
-    background-color: #C8C8C8;
-    border-spacing: 3px;
-}
-td.navibar {
-    background-color: #E8E8E8;
-    vertical-align: top;
-    text-align: right;
-    padding: 0px;
-}
-
-div.pagename {
-    font-size: 140%;
-    color: blue;
-    text-align: center;
-    font-weight: bold;
-    background-color: white;
-    padding: 0 ;
-}
-
-a.wikiaction, input.wikiaction {
-    color: black; 
-    text-decoration: None;
-    text-align: center;
-    color: black;
-    /*border: 1px solid #3ba6ec; */
-    margin: 4px;
-    padding: 5;
-    padding-bottom: 0;
-    white-space: nowrap;
-}
-
-a.wikiaction[href]:hover { 
-	color: black; 
-	text-decoration: none; 
-	/*background-color: #dddddd; */
-}
-
-span.wikiuserpref {
-    padding-top: 1em;
-    font-size: 120%;
-}
-
-div.wikitrail {
-    vertical-align: bottom;
-    /*font-size: -1;*/
-    padding-top: 1em;
-    display: none;
-}
-
-div.wikiaction {
-    vertical-align: middle;
-    /*border-bottom: 1px solid #8cacbb;*/
-    padding-bottom:1em;
-    text-align: left;
-    width: 100%;
-}
-
-div.wikieditmenu {
-    text-align: right;
-}
-
-form.wikiedit {
-    border: 1px solid #8cacbb;
-    background-color: #f0f0f0;
-    background-color: #fabf00;
-    padding: 1em;
-    padding-right: 0em;
-}
-
-div.legenditem {
-    padding-top: 0.5em;
-    padding-left: 0.3em;
-}
-
-span.wikitoken {
-   background-color: #eeeeee;
-}
-    
-
-div#contentspace h1:first-child, div.heading:first-child { 
-  padding-top: 0;
-  margin-top: 0;
-}
-div#contentspace h2:first-child { 
-  padding-top: 0;
-  margin-top: 0;
-}
-
-/* heading and paragraph text */
-
-div.heading, h1 {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    background-color: #58b3ef;
-    background-color: #FFFFFF; 
-    /*color: #4893cf;*/
-    color: black;
-    padding-top: 1.0em;
-    padding-bottom:0.2em;
-    text-align: left;
-    margin-top: 0em; 
-    /*margin-bottom:8pt;*/
-    font-weight: bold;
-    font-size: 115%;
-    border-bottom: 1px solid #8CACBB;
-}
-
-
-h1, h2, h3, h4, h5, h6 {
-    color: Black;
-    clear: left;
-    font: 100% Verdana, Helvetica, Arial, sans-serif;
-    margin: 0;
-    padding-left: 0em;
-    padding-top: 1em;
-    padding-bottom: 0.2em;
-    /*border-bottom: 1px solid #8CACBB;*/
-}
-/* h1,h2 { padding-top: 0; }*/
-
-
-h1 { font-size: 145%; }
-h2 { font-size: 135%; }
-h3 { font-size: 125%; }
-h4 { font-size: 120%; }
-h5 { font-size: 110%; }
-h6 { font-size: 80%; }
-
-h1 a { text-decoration: None;}
-
-div.exception {
-  background-color: #bb2222;
-  padding: 5 5 5 5;
-  color: white;
-  font-weight: bold;
-}
-pre.exception {
-    font-size: 110%;
-    padding: 1em;
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: #dee7ec;
-    background-color: #cccccc;
-}
-
-/* defines for navgiation bar (documentation) */
-
-
-div.direntry {
-    padding-top: 0.3em;
-    padding-bottom: 0.3em;
-    margin-right: 1em;
-    font-weight: bold;
-    background-color: #dee7ec;
-    font-size: 110%;
-}
-
-div.fileentry {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    padding-bottom: 0.3em;
-    white-space: nowrap;
-    line-height: 150%;
-}
-
-a.fileentry {
-    white-space: nowrap;
-}
-
-
-span.left {
-    text-align: left;
-}
-span.right {
-    text-align: right;
-}
-
-div.navbar {
-  /*margin: 0;*/
-  font-size: 80% /*smaller*/;
-  font-weight: bold;
-  text-align: left;
-  /* position: fixed; */
-  top: 100pt;
-  left: 0pt; /*  auto; */
-  width: 120pt;
-  /* right: auto;
-  right: 0pt;  2em; */
-}
-
-
-div.history a {
-    /* font-size: 70%; */
-}
-
-div.wikiactiontitle { 
-  font-weight: bold;
-}
-
-/*  REST  defines */
-
-div.document {
-    margin: 0;
-}
-
-h1.title {
-    margin: 0;
-}
-
-td.toplist {
-    vertical-align: top;
-}
-
-img#pyimg {
-    position: absolute;
-    top: 0px;
-    left: 20px;
-    margin: 20px;
-}
-
-img#extraimg {
-    position: absolute;
-    right: 14px; 
-    top: 4px;
-}
-    
-div#navspace {
-    position: absolute;
-    top: 130px;
-    left: 11px;
-    font-size: 100%;
-    width: 150px;
-    overflow: hidden; /* scroll;  */
-}
-
-div#metaspace {
-    position: absolute;
-    top: 40px;
-    left: 210px;
-}
-
-div#errorline {
-    position: relative;
-    top: 5px; 
-    float: right; 
-}
-
-div#contentspace {
-    position: absolute;
-  	/* font: 120% "Times New Roman", serif;*/
-    font: 110% Verdana, Helvetica, Arial, sans-serif;
-    top: 140px;
-    left: 130px;
-    margin-right: 140px;
-}
-
-div#menubar {
-/*    width: 400px; */
-    float: left;
-}
-
-/* for the documentation page */
-div#docinfoline {
-  position: relative;
-  top: 5px; 
-  left: 0px;
-
-  /*background-color: #dee7ec; */
-  padding: 5pt; 
-  padding-bottom: 1em; 
-  color: black;
-  /*border-width: 1pt;
-  border-style: solid;*/
-
-}
-
-div#docnavlist {
-  /*background-color: #dee7ec; */
-  padding: 5pt; 
-  padding-bottom: 2em; 
-  color: black;
-  border-width: 1pt;
-  /*border-style: solid;*/
-}
-
-
-/* text markup */
-
-div.listtitle {
-    color: Black;
-    clear: left;
-    font: 120% Verdana, Helvetica, Arial, sans-serif;
-    margin: 0;
-    padding-left: 0em;
-    padding-top: 0em;
-    padding-bottom: 0.2em;
-    margin-right: 0.5em;
-    border-bottom: 1px solid #8CACBB;
-}
-
-div.actionbox h3 { 
-  padding-top: 0;
-  padding-right: 0.5em;
-  padding-left: 0.5em;
-  background-color: #fabf00;
-  text-align: center;
-  border: 1px solid black; /* 8cacbb; */
-}
-
-div.actionbox a { 
-  display: block;
-  padding-bottom: 0.5em;
-  padding-top: 0.5em;
-  margin-left: 0.5em;
-}
-
-div.actionbox a.history { 
-  display: block;
-  padding-bottom: 0.5em;
-  padding-top: 0.5em;
-  margin-left: 0.5em;
-  font-size: 90%; 
-}
-
-div.actionbox { 
-  margin-bottom: 2em;
-  padding-bottom: 1em;
-  overflow: hidden; /* scroll;  */
-}
-
-/* taken from docutils (oh dear, a bit senseless) */
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-
-/*
-:Author: David Goodger
-:Contact: goodger at users.sourceforge.net
-:date: $Date: 2003/01/22 22:26:48 $
-:version: $Revision: 1.29 $
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-*/
-/*
-.first {
-  margin-top: 0 }
-
-.last {
-  margin-bottom: 0 }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-dd {
-  margin-bottom: 0.5em }
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  font-size: smaller }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr {
-  width: 75% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
-
-td, th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-th.docinfo-name, th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap }
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: 100% }
-
-tt {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
-*/
-
-div.section {
-  margin-top: 1.0em ;
-}    
-
-div.abstract {
-  margin: 2em 4em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }

diff --git a/pypy/doc/navlist b/pypy/doc/navlist
deleted file mode 100644
--- a/pypy/doc/navlist
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    'architecture.html', 
-    'getting-started.html', 
-    'coding-guide.html', 
-    'objspace.html',
-    'translation.html',
-#    'misc.html', 
-    'theory.html', 
-]

diff --git a/pypy/doc/cleanup.rst b/pypy/doc/cleanup.rst
--- a/pypy/doc/cleanup.rst
+++ b/pypy/doc/cleanup.rst
@@ -5,30 +5,12 @@
 
 .. doc-index: This needs merging somehow
 
-.. svn-help.rst: Needs merging/replacing with hg stuff:
-
-
 .. toctree::
 
    distribution.rst
 
-   objspace-proxies.rst
-
-   old_news.rst
-
-   rffi.rst
-
-   sandbox.rst
-
-   statistic/index.rst
-
-   docindex.rst
-
-   svn-help.rst
-
    dot-net.rst
 
-   maemo.rst
 
 
 


More information about the Pypy-commit mailing list