[Python-checkins] python/dist/src/Doc/html style.css,1.23,1.23.2.1 index.html.in,1.16,1.16.2.1 about.html,1.5,1.5.2.1
jhylton@users.sourceforge.net
jhylton@users.sourceforge.net
Mon, 28 Apr 2003 10:40:08 -0700
Update of /cvsroot/python/python/dist/src/Doc/html
In directory sc8-pr-cvs1:/tmp/cvs-serv27228/Doc/html
Modified Files:
Tag: ast-branch
style.css index.html.in about.html
Log Message:
Merge head to this branch.
Merge all sorts of changes from just before 2.3b1 into the ast
branch. This should make the eventual merge back to the trunk easier.
The merge is almost entirely porting changes into the ast-branch.
There was no attempt to get changes to compile.c into newcompile.c.
That work should be done when newcompile.c is closer to completion.
The only significant conflicts appeared to be in pythonrun.c.
Index: style.css
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/html/style.css,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** style.css 14 Jun 2002 13:47:58 -0000 1.23
--- style.css 28 Apr 2003 17:38:03 -0000 1.23.2.1
***************
*** 68,74 ****
margin-right: 2em; }
! div.warning .label { font-size: 110%;
margin-right: 0.5em; }
.release-info { font-style: italic; }
--- 68,84 ----
margin-right: 2em; }
! div.warning .label { font-family: sans-serif;
! font-size: 110%;
margin-right: 0.5em; }
+ div.note { background-color: #fffaf0;
+ border: thin solid black;
+ padding: 0.5em;
+ margin-left: 2em;
+ margin-right: 2em; }
+
+ div.note .label { margin-right: 0.5em;
+ font-family: sans-serif; }
+
.release-info { font-style: italic; }
***************
*** 80,83 ****
--- 90,97 ----
font-size: 90%; }
.verbatim { margin-left: 2em; }
+ .verbatim .footer { padding: 0.05in;
+ font-size: 85%;
+ background-color: #99ccff;
+ margin-right: 0.5in; }
.grammar { background-color: #99ccff;
Index: index.html.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/html/index.html.in,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** index.html.in 1 Apr 2002 18:49:45 -0000 1.16
--- index.html.in 28 Apr 2003 17:38:04 -0000 1.16.2.1
***************
*** 6,10 ****
--- 6,14 ----
content="Top-level index to the standard documentation for
Python @RELEASE@.">
+ <link rel="SHORTCUT ICON" href="icons/pyfav.gif" type="image/gif">
<link rel="STYLESHEET" href="lib/lib.css" type="text/css">
+ <link rel="author" href="acks.html" title="Acknowledgements">
+ <link rel="help" href="about.html" title="About the Python Documentation">
+ <link rel="index" href="modindex.html" title="Global Module Index">
<style type="text/css">
a.title { font-weight: bold; font-size: 110%; }
Index: about.html
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/html/about.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** about.html 17 Apr 2002 01:40:56 -0000 1.5
--- about.html 28 Apr 2003 17:38:04 -0000 1.5.2.1
***************
*** 6,9 ****
--- 6,14 ----
content="Overview information about the Python documentation">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <link rel="contents" href="index.html" title="Python Documentation Index">
+ <link rel="index" href="modindex.html" title="Global Module Index">
+ <link rel="start" href="index.html" title="Python Documentation Index">
+ <link rel="up" href="index.html" title="Python Documentation Index">
+ <link rel="SHORTCUT ICON" href="icons/pyfav.gif" type="image/gif">
<link rel="STYLESHEET" href="lib/lib.css">
</head>