? 090308_KJS_debian-www.diff
? debhome.css
? debian-61.png
? debian-simple.css
? debian-www.diff
? gradient.png
? greydot.png
? CD/http-ftp/cdimage_mirrors.list
? CD/mirroring/cdimage_mirrors.list
? Pics/openlogo-50.png
? consultants/consultant.inc
? mirror/list-footer.inc
? mirror/list-full.inc
? mirror/list-non-US.inc
? mirror/list-primary.inc
? mirror/list-secondary.inc
? mirror/official_sponsors.list
? mirror/sponsors.list
? template/debian/release_data.wml
? volatile/volatile-mirrors.inc
Index: contact.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/contact.wml,v
retrieving revision 1.44
diff -r1.44 contact.wml
14,16c14
< <hrline>
< 
< <ul>
---
> <ul class="toc">
27,28d24
< <hrline>
< 
Index: debian-en.css
===================================================================
RCS file: /cvs/webwml/webwml/english/debian-en.css,v
retrieving revision 1.4
diff -r1.4 debian-en.css
1,35d0
< /* Debian language css file for english - en */
< /* please do not touch for now! - Jutta Wrage 2005 */
< 
< html[lang|=en] #serverselect {
< 	width: 13em;
< }
< html[lang|=en] #maincol {
< 	margin-left: 10em;
< }
< html[lang|=en] #leftcol ul.cdmenu {
< 	width: 10em;
< }
< 	
< q { font-style: italic; }
< /* quotes */
< html[lang|=en] q:before { content: "\201C"; }
< html[lang|=en] q:after { content: "\201D"; } 
< html[lang|=en] q q:before { content: "\2018"; }
< html[lang|=en] q q:after { content: "\2019"; }
< 
< /* html[lang|=en] blockquote p:first-child:before { content: "\201C"; }
< html[lang|=en] blockquote p.notlast:after { content: ""; }
< html[lang|=en] blockquote p:after { content: "\201D"; }
< 
< html[lang|=en] blockquote.question p:before { content: ""; }
< html[lang|=en] blockquote.question p:after, blockquote.documentquote p:after{ content: ""; }
< html[lang|=en] blockquote { font-style: italic; }
< */
< 
< /*
< html[lang=en] .en2 q:before { content: "\2018"; }
< html[lang=en] .en2 q:after { content: "\2019"; }
< html[lang=en] .en2 q q:before { content: "\201C"; }
< html[lang=en] .en2 q q:after { content: "\201D"; } 
< */
Index: debian.css
===================================================================
RCS file: /cvs/webwml/webwml/english/debian.css,v
retrieving revision 1.70
diff -r1.70 debian.css
1,16c1,22
< /* css file for debian web site - Jutta Wrage 2004 */
< /* please see README_CSS.txt for more information */
< 
< html, body {
< 	color: #000000;
< 	background-color: #FFFFFF;
< 	margin: 0 4px 0 4px;
< 	padding: 0;
< }
< 
< img { border: 0; }
< 
< h1 { text-align: center; }
< 
< acronym {
< 	border-bottom: 1px dotted #000000;
---
> /*
>  *      www.debian.org stylesheet proposal
>  *
>  *      Kalle Soderman, 2008 debian-simple.css
>  *
>  *      Copyleft : This work is free, you can copy, spread, and modify it under
>  *      the terms of the Free Art License http://artlibre.org/licence/lal/en/
>  */
> 
> html {
> 	background-color: transparent;
> }
> 
> body {
> 	margin: 0px 10px 60px 62px;
> 	font: normal 14px sans-serif;
> 	background-color: white;
> 	color: black;
> 	background-image:url('gradient.png');
> 	background-position: 0 0;
> 	background-repeat: repeat-x;
> 	line-height: 1.8em;
19,25c25,27
< hr.hidecss {
< 	border: 0;
< }
< 
< hr {
< 	border-bottom: 0;
< 	border-top: 1px solid #BFC3DC;
---
> a:link	{
> 	text-decoration: none;
> 	color: #0035c7;
28,47c30,32
< samp {
< 	display: block;
< 	margin-left: 2em;
< }
< div.sampleblock {
< 	width: 80%;
< 	margin: auto;
< 	font-family:courier, serif;
< 	font-size: 90%;
< }
< .centerblock {
<         width: 90%;
< 	margin-left: auto;
< 	margin-right: auto;
< }		
< div.quoteblock {
< 	width: 75%;
< 	margin: auto;
< 	font-size: 90%;
< 	text-align: justify;
---
> a:visited {
> 	color: #54638c;
> 	text-decoration: none;
50,67c35,37
< .quoteblock div.preimg {
< 	float: left;
< 	margin-top: 0.2em;
< }
< .quoteblock cite {
< 	display: block;
< 	text-align: right;
< }
< blockquote.question {
< 	font-style: italic;
< }
< blockquote.question p span {
< 	font-style: normal;
< 	width: 10%;
< }
< #pagewidth {
< 	width: 100%;
< 	text-align: left;
---
> a:hover {
> 	text-decoration: underline;
> 	color: #00207a;
70,74c40,41
< /* now the header*/
< #header {
< 	margin-left: -3px;
< 	width: 100%;
< 	height: auto;
---
> a:active {
> 	color:#c2c3c7;
77,82c44,45
< /* upper nested header box*/
< #upperheader {
< 	width: 100%;
< 	margin-top: 11px;
< 	height: auto;
< 	background: #FFFFFF;
---
> a img {
> 	border:0;
85,88c48,51
< #logo {
< 	float: left;
< 	margin-left: 6px;
< 	background: #FFFFFF;
---
> hr {
> 	border: none;
> 	background-color: #bbb;
> 	height: 1px;
91,99c54,55
< #serverselect {
< 	float: right;
< 	display: block;
< 	padding-top: 1px;
< 	margin-right: 6px;
< 	margin-left: auto;
< 	text-align: right;
< 	top: 0;
< 	right: 0;
---
> .hidecss {
> 	display: none;
102,105c58,82
< #serverselect p {
< 	color: #990000;
< 	font-size: 0.8em;
< 	font-weight: normal;
---
> p.section {
> 	font-family:monospace;
> 	font-size: 11px;
> 	position:absolute;
> 	top: 0px;
> 	left:10px;
> 	text-transform: uppercase;
> 	letter-spacing: 0.08em;
> 	background-color: #c70036;
> 	line-height: 16px;
> 	color:white;
> 	padding: 0 5px 0 5px;
> 	margin:0;
> }
> 
> #navbar{
> 	background-color: transparent;
> 	list-style:none;
> 	display:block;
> 	border-bottom:1px solid #c70036;
> 	text-indent:0;
> 	margin-bottom:0;
> 	padding: 0;
> 	margin-top:0;
> 	line-height:1em;
108,109c85,89
< #serverselect p select {
< 	font-size: 88%;
---
> #navbar ul {
> 	margin:0 ;
> 	padding:0 ;
> 	height: 54px;
> 	clear: both;
112,122c92,97
< #serverselect p input {
< 	font-size: 88%;
< }
< .centerlogo {
< 	margin-left: 260px;
< 	margin-right: auto;
< 	width: 125px;
< 	text-align: center;
< 	vertical-align: bottom;
< }
< #cdlogo {
---
> #navbar li {
> 	list-style: none;
> 	float: left;
> 	padding: 0 0 0 0;
> 	margin:0;
> 	font-size: 10pt;
125c100,103
< #hpacketsearch {
---
> #navbar a:link, #navbar a:visited {
> 	padding: 32px 1em 10px 1em;
> 	border-left: 1px solid transparent;
> 	border-right: 1px solid transparent;
127,134d104
< 	padding-top: 1px;
< 	padding-left: 5px;
< 	margin-right: 0.2em;
< 	margin-left: auto;
< 	text-align: left;
< 	width: 25em;
< 	top: 0em;
< 	right: 0em;
137,140c107,121
< #hpacketsearch p small {
< 	color: #990000;
< 	font-size: 0.8em;
< 	font-weight: normal;
---
> #navbar a:hover, #navbar a:visited:hover {
> 	background-color: #efefef;
> 	border-left: 1px solid  #d2d3d7;
> 	border-right: 1px solid #d2d3d7;
> }
> #sitetools {
> 	text-align:left;
> 	margin: 0 10px 0 0;
> 	padding: 0px 0 1px 0;
> 	position: absolute;
> 	top:0;
> 	right:0;
> 	border-right: 1px solid white;
> 	border-left: 1px solid #d2d3d7;
> 	line-height: 1em;
141a123
> 	
143,145d124
< #hpacketsearch p select {
< 	font-size: 88%;
< }
147,149c126,128
< #hpacketsearch p input {
< 	font-size: 88%;
< }
---
> /*
>  *     Page elements
>  */
151,196c130,133
< #navbar {
< 	/* margin-top: 1em; */
< 	clear: both;
< 	padding-left: 0px;
< 	/* margin-top: 5px; */
< 	padding-top: 6px;
< 	padding-bottom: 4px;
< 	width: 100%;
< 	height: auto;
< 	text-align: center;
< 	background: #BF1238;
< }
< #navbar ul {
< 	display: inline;
< 	list-style-type: none; 
< 	padding-left: 0px;
< 	line-height: 1.5em;
< }
< #navbar ul li {
< 	display: inline;
< 	margin: 0;
< 	white-space: nowrap;
< }
< #navbar a {
< 	color: #FFFFFF;
< 	text-decoration: none;
< 	padding: 0.2em 0.4em 0.2em 0.4em;
< 	background-color: #000084;
< 	border: 1px solid #000084;
< 	font-family: Arial, Helvetica, sans-serif;
< 	font-weight: bold;
< 	font-size: 0.9em;
< }
< #navbar a:hover {
< 	background: #0000CC;
< }
< #navbar .hidecss, .hidecss {
< 	display: none;
< }
< 
< /* the rest of page out of two nested boxes around */
< 
< #outer {
< 	background-color: #FFFFFF;
< 	width: auto;
< 	/* border:solid white 2px; */
---
> #header {
> 	margin:0;
> 	padding:0;
> 	font-size: 11px;
199,204c136,138
< #inner {
< 	margin: -2px;
< 	margin-top: 0;
< 	width: 100%;
< 	background: #FFFFFF;
< 	/* overflow: auto; */
---
> #upperheader {
> 	margin:0;
> 	padding:0;
207,227c141,144
< #leftcol {
< 	float: left;
< 	margin: 0em 0.4em 0 0;
< 	padding-left: 0;
< 	padding-bottom: 1em;
< 	width: auto;
< 	background: #BBDDFF;
< 	font-size: 0.9em;
< 	font-family: Arial, Helvetica, sans-serif;
< 	border: 1px solid #BBDDFF;
< 	/* overflow: auto; */
< }
< #leftcol a:link, #leftcol a:visited {
< 	display: block;
< }
< #leftcol a:hover {
< 	background-color: #DDEEFF;
< 	/* background-color: #FFFFFF; */
< }
< #leftcol ul {
< 	margin: 2px;
---
> #logo {
> 	position:absolute;
> 	top:0;
> 	left:0;
229,233c146,148
< 	list-style-type: none;
< 	font-weight: bold;
< }
< #leftcol ul.votemenu {
< 	width: 11em;
---
> 	background-color: transparent;
> 	border: 1px solid transparent;
> 	border-top: 0;
235,236c150,153
< #leftcol ul.cdmenu {
< 	width: 12em;
---
> #logo a {
> 	display: block;
> 	height:73px;
> 	padding: 8px 5px 0 5px;
238,239c155,161
< #leftcol ul.votemenu ul li, #leftcol ul.cdmenu ul li {
< 	padding-bottom: 0.4em;
---
> #logo img {
> 	margin-top: 5px;
> 	}
> #logo:hover {
> 	border: 1px solid #d2d3d7 ;
> 	border-top: 0;
> 	background-color: #eee;
241,242c163,170
< #leftcol li ul {
< 	display: inline;
---
> #leftcol {
> 	width: 16em;
> 	float:right;
> 	padding:0 0 0 2em;
> 	margin: 1em 0 10px 1em;
> 	border-left:1px solid #d3d6df;
> 	font-size:11px;
> 	line-height: 1.5em;
244,245c172,175
< #leftcol ul li {
< 	padding: 0.2em 0;
---
> #leftcol ul {
> 	padding:0;
> 	margin:0;
> 	list-style:none;
248,254c178
< 	font-size: 0.9em;
< 	margin: 0;
< }
< #leftcol ul li a {
< 	line-height: 1.2em;
< 	padding-right: 0.5em;
< 	/* padding: 0.2em 0 0.3em 0em; */
---
> 	margin-left: 1em;
256c180
< #leftcol ul ul li a {
---
> #leftcol li {
258,262c182
< 	padding: 0.1em 0.5em;
< 	line-height: 1.1em;
< }
< #leftcol ul ul li {
< 	padding-top: 0;
---
> 	margin-top:0.5em;
263a184
> 
265,279c186,187
< 	margin-left: 2px;
< 	margin-right: 2px;
< }
< #leftcol p a {
< 	display: block;
< 	margin: 0;
< }
< #leftcol p img {
< 	margin-left: 1em;
< }
< #leftcol .menuselected {
< 	color: #BF1238;
< }
< #leftcol ul ul .menuselected {
< 	text-indent: 0.5em;
---
> 	line-height: 1em;
> 	font-weight: bold;
281,285c189,190
< #maincol {
< 	background: #FFFFFF;
< 	margin-left: 12em;
< 	margin-right: 0.5em;
< 	margin-bottom: 1em;
---
> #leftcol h2 {
> 	margin:0;
287,291c192,198
< 
< #lefthalfcol {
< 	float: left;
< 	margin-left: 0em;
< 	width: 49%;
---
> #footer {
> 	font-size: 11px;
> 	border: 2px solid #d2d3d7;
> 	border-top: 1px solid #dfdfe0;
> 	border-left: 1px solid #dfdfe0;
> 	padding:1em;
> 	background-color: #f2f3f6;
294,295c201,204
< #lefthalfcol h4, #lefthalfcol h3 , #righthalfcol h4, #righthalfcol h3 {
< 	margin: 0em;
---
> #footer hr {
> 	border-top: 1px solid #d2d3d7;
> 	border-bottom: 1px solid white;
> 	height: 0;
298,319d206
< #lefthalfcol dl {
< 	margin-top: 0em;
< }
< 
< #righthalfcol {
< 	margin-left: 50%;
< 	width: 49%;
< }
< 
< #righthalfcol dl {
< 	margin-right: 0.2em;
< }
< 
< #footer {
< 	clear: both;
< 	width: 100%;
< 	padding-top: 3px;
< 	bottom: 0;
< 	text-align: center;
< 	margin: 0px;
< }
< 
321,348c208
< 	margin-top: 0.2em;
< 	padding-top: 3px;
< 	text-align: center;
< 	font-size: 0.85em;
< }
< 
< #outer>#inner { border-bottom: 1px solid #BFC3DC; }
< .bordertop { border-top: 1px solid #BFC3DC; }
< 
< dl.gloss dt {
< 	font-weight: bold;
< }
< 
< #footer ul {
< 	display: inline;
< 	list-style-type: none;
< }
< 
< #footer ul li {
< 	display: inline;
< }
< 
< #footer ul li a, table.y2k td {
< 	white-space: nowrap;
< }
< 
< #footer p {
< 	margin: 0px;
---
> 	margin-bottom: 1em;
351,353c211,229
< #main {
< 	background: #bbddff;
< 	padding: 1em 0; /* have some padding to get rid of collapsed margins */
---
> #breadcrumbs {
> 	background-color: transparent;
> 	margin:0;	
> 	padding: 6px 0.25em 7px  0.25em;
> 	border-bottom: 1px solid #d2d3d7 ;
> 	text-transform:lowercase;
> 	line-height: 13px;
> }
> 
> .toc {
> 	font-size: 11px;
> 	list-style:none;
> 	margin: 1em 0 1em 0;
> 	background-image: url('greydot.png');
> 	background-position: bottom left;
> 	background-repeat: repeat-x;
> 	line-height:1.5em;
> 	padding: 0;
> 	max-width: 50em;
356c232,258
< /* classes for cards */
---
> .toc li {
> 	background-image: url('greydot.png');
> 	background-position: top left;
> 	background-repeat: repeat-x;
> 	padding: 0.25em 0 0.25em 0;
>  }
> .toc a {
> 	display:block;
> }
> .toc a:hover {
> 	display:block;
> 	background-color: #f0f0f4;
> }
> /*
>  * 	Sitemap 
>  */
> 
> .clear {
> 	clear:both
> }
> 
> #clear {
> 	clear:both;
> 	border:0;
> 	height:1px;
> 	display:block;
>  }
358,366d259
< .cardleft {
< 	margin: 0 0 1em;
< 	float: left;
< 	width: 49%;
< }
< .cardright {
< 	margin-left: 50%
< 	/*margin: 0 1% 2em 50%; */
< }
368,369c261,265
< 	clear: left;
< 	margin: 0 0 1em;
---
> 	clear:both;
> 	margin:2em 0 2em 0;
> 	background-position: 0 -50px;
> 	background-repeat: repeat-x;
> 	padding:8px 0 8px 0;
372,380c268,269
< .cardleft h2, .cardright h2, .card h2 {
< 	font-size: 120%;
< 	background: #000000;
< 	color: #FFD400;
< 	display: inline;
< 	padding: 0.2em 0.4em;
< 	margin: 0 10px;
< 	font-family: Arial, Helvetica, sans-serif;
< 	letter-spacing: 0.2em;
---
> .card ul {
> 	margin:0.5em 0 1em 0;
383,385c272,274
< .cardleft dl dd, .cardright dl dd , .card dl dd {
< 	padding-bottom: 0.5em;
< }
---
> .card ul li {
> 	list-style:none;
> 	}
387,393c276,277
< .cardleft div, .cardright div, .card div {
< 	border: 2px solid #000000;
< 	background: #FFFFFF;
< 	padding: 0.5em;
< 	margin: 2px 10px;
< 	/* the next two lines xpand the div to heigth of left inner div */
< 	overflow: auto;
---
> .card h2 {
> 	margin:0;
396,401c280,281
< div.lefthalf {
< 	float: left;
< 	width: 49%;
< 	border: 0;
< 	margin: 0; 
< 	padding: 0;
---
> .lefthalf {
> 	float:left;
404,407c284,285
< div.righthalf {
< 	border: 0;
< 	margin: 0;
< 	padding: 0;
---
> .righthalf {
> 	margin-left:50%;
409d286
< /* classes and div names for package pages */
411,413c288,289
< #pdesc, #pdeps, #pdownload, #pmoreinfo {
< 	margin-left: 1em;
< 	margin-right: 1em;
---
> .lefthalf ul {
> 	margin-top:0;
416,418d291
< #pdesc p {
< 	text-align: justify;
< }
420,424c293,295
< .pdescshort {
< 	text-align: left;
< 	font-size: large;
< 	font-weight: bold;
< }
---
> /*
>  *	Typography
>  */
426,427c297,298
< #pdeps table tr td {
< 	font-size: 0.9em;
---
> p {
> 	margin: 0 0 1em 0;
430,432c301,304
< #pdeps ul {
< 	list-style-type: none;
< 	padding-left: 2em;
---
> h1, h2, h3, h4 {
> 	font-weight: 600;
> 	margin-bottom: 0.5em;
> 	margin-top: 1em;
435,436c307,308
< #pdeps li {
< 	text-indent: -2em;
---
> h4 {
> 	font-size: 12px;
439,441c311,312
< #pdeps ul.uldep, #pdeps ul.uladep {
< 	list-style-type: disc;
< 	list-style-image: url(http://packages.debian.org/Pics/dep.gif);
---
> h3 {
> 	font-size: 14px;
444,446c315,316
< #pdeps ul.ulrec, #pdeps ul.ulidep {
< 	list-style-type: disc;
< 	list-style-image: url(http://packages.debian.org/Pics/rec.gif);
---
> h2 {
> 	font-size: 16px;
449,451c319,320
< #pdeps ul.ulsug {
< 	list-style-type: disc;
< 	list-style-image: url(http://packages.debian.org/Pics/sug.gif);
---
> h1 {
> 	font-size: 24px;
454,459d322
< #pdeps ul.uldep li, #pdeps ul.ulrec li, #pdeps ul.ulsug li, #pdeps ul.uladep li, #pdeps ul.ulidep li {
< 	padding-left: 2em;
< }
< #pdeps dl {
< 	margin: 0;
< }
461,462c324,326
< #pdownload p, #pdownload form, #pdownload submit {
< 	display: inline;
---
> ol,ul {
> 	padding-left: 2em;
> 	margin-left:0;
464,467c328,332
< 
< #pdownload td {
< 	font-size: 0.85em;
< 	text-align: center;
---
> table {
> 	}
> #sitetools form {
> 	margin:0;
> 	padding:0;
470,471c335,339
< #pmoreinfo p {
< 	font-size: 0.85em;
---
> #sitetools input {
> 	margin: 0 0 0 0.25em;
> 	padding-left: 4px;
> 	font-size: 11px;
> 	padding-right: 4px;
474,476c342,344
< /* colors for packages, warnings and news in ports */
< .pred, .warning, dt.new, .no {
< 	color: red; /* FF0000 */
---
> #sitetools select {
> 	font-size: 11px;
> 	margin-left: 0.5em;
479,482c347,357
< .psmallcenter, .psmalltrademark {
< 	clear: both;
< 	font-size: 0.85em;
< 	text-align: center;
---
> #sitetools form p {
> 	display: inline;
> 	line-height: 1em;
> 	margin:0;
> 	padding:0;
> 	font-size: 12px;
> }
> .sitetool a {
> 	margin: 0.5em 0 0.5em 1em;
> 	padding: 0 0 0 0;
> 	float: left;
485,557c360,366
< .psmalltrademark {
< 	color: green;
< }
< #pdownload table, table.ridgetable, table.reltable {
< 	border-width: 4px;
< 	border-color: gray;
< 	margin: 0 1em 1em 1em;
< 	border-style: ridge;
< 	border-collapse: collapse;
< }
< table.vote {
< 	margin: 0 auto;
< 	border-width: 3px;
< 	border-color: gray;
< 	border-style: ridge;
< 	border-collapse: collapse;
< }
< #pdownload th, #pdownload td, table.ridgetable th, table.ridgetable td,
< 	table.reltable td, table.reltable th {
< 	border: 2px gray;
< 	border-style: ridge;
< 	padding: 0.1em;
< }
< table.reltable th {
< 	background-color: #44CCCC;
< }
< table.vote th {
< 	border: 1px solid gray;
< 	background-color: #DDDDDD;
< }
< table.vote td {
< 	border: 1px solid gray;
< 	padding: 4px;
< }
< table.reltable tr.odd {
< 	background-color: #FFFFFF;
< }
< table.reltable tr.even {
< 	background-color: #DDDDDD;
< }
< table.stattrans {
< 	margin: 0 auto;
< 	width: 95%;
< 	border: 1px solid black;
< 	background-color: #cdc9c9;
< }
< table.stattrans th {
< 	text-align: center;
< 	padding: 2px;
< }
< table.stattrans td {
< 	text-align: right;
< 	padding: 2px;
< }
< table.stattrans tbody th {
< 	text-align: left;
< 	font-weight: normal;
< }
< table.volatile {
< 	border-collapse: collapse;
< }
< .volatile th, .volatile td {
< 	text-align: left;
< 	border: 1px solid black;
< 	padding: 0.2em;
< }
< .volatile thead {
< 	background-color: silver;
< 	color: #000000;
< }
< table.volatile tr.country {
< 	color: #ffffff;
< 	background-color: #df0451;
---
> .sitetool {
> 	margin:0;
> 	padding: 2px 5px 2px 5px;
> 	border-left: 1px solid white;
> 	border-right: 1px solid #d2d3d7;
> 	display:block;
> 	float:left;
560,564c369,378
< /* partners */
< .partnertype {
< 	background-color: #DD0000;
< 	padding: 0.2em 0 0.2em 1em;
< 	color: #FFFFFF;
---
> /*
> #serverselect {
> 	margin: 0 0 2em 0;
> 	padding: 2px 5px 2px 5px;
> 	font-size: 11px;
> 	border: 1px solid #d2d3d7;
> 	border-bottom: 1px solid #d2d3d7;
> 	background-image:url('gradient.png');
> 	background-position: 0 -35px;
> 	background-repeat: repeat-x;
567,586c381
< div.partnerlogo {
< 	display: table-cell;
< 	vertical-align: middle;
< 	text-align: center;
< 	width: 30%;
< }
< div.partnerdesc {
< 	display: table-cell;
< 	font-size: 85%;
< }
< div.cdflash {
< 	background-color: #E09E86;
< 	width: 80%;
< 	margin: auto;
< 	text-align: center;
< }
< .cdrsync {
< 	color: #6B1300;
< }
< /* debian installer */
---
> */
588,589c383,384
< .dierror {
< 	background-color: #FF6060;
---
> #serverselect input, #serverselect option , #serverselect select {
> 		font-size: 11px;
591,598d385
< .dibad {
< 	background-color: #F7FF60;
< }
< .digood {
< 	background-color: #7AFF71;
< }
< 
< /* useful classes */
600,607c387,389
< th.eventheader {
< 	background-color: #BBDDFF;
< }
< .center {
< 	text-align: center;
< }
< .right {
< 	text-align: right;
---
> #serverselect ul {
> 		display: inline;
> 		margin-left: 2em;
609,652c391,395
< ul.circlelist {
< 	list-style-type: circle;
< }
< .centerdiv table {
< 	margin-left: auto;
< 	margin-right: auto;
< }
< ul.discless {
< 	list-style-type: none;
< }
< .top, img.ico {
< 	vertical-align: top;
< }
< img.ico {
< 	float: left;
< 	margin: 0 0.2em 0 0;
< }
< img.rightico {
< 	float: right;
< 	vertical-align: top;
< 	margin: 0 0 0 0.2em;
< }
< img.cve {
< 	vertical-align: -25px;
< }
< .y2kok, .yes {
< 	color: #00BB00;
< }
< .y2kok2 {
< 	color: #00BBBB;
< }
< .bluehead {
< 	color: #0000FF !important;
< }
< span.halfsize {
< 	font-size: 80%;
< }
< span.ddpbooktitle, span.merchtitle {
< 	font-size: larger;
< }
< a:link { color: #0000FF; }
< a:visited { color: #800080; }
< a:hover { color: #F000FF; }
< a:active { color: #FF0000; }
---
> #serverselect li {
> 		list-style: none;
> 		display: inline;
> 		padding:0 1em 0 1em;
> 		margin:0;
654,656d396
< .navpara a, col.y2k {
< 	white-space: nowrap;
< 	/* this is to keep from breaking at whitespace in anchors */
659,668c399,402
< 
< .underline { text-decoration: underline; }
< .clr { clear:both; }
< /*.content{padding:5px;} */ /*padding for content */
< /* #header .content{padding-bottom:0;} */ /*padding bottom 0 to remove space in IE5 Mac*/
< 
< /* for l10n-arabic */
< .bidi {
< 	direction: rtl;
< 	text-align: right;
---
> #serverselect form p {
> 	margin:0;
> 	padding:0;
> 	line-height: 1em;
670,675c404,412
< 
< #leftcol, #navbar, #navbar a {
< 	-moz-border-radius: 15px;
< 	-webkit-border-radius: 15px;
< 	/* these go to the end as the css validator does not like them
< 	will be replaced by border-radius with css3 */
---
> #footermap {
> 	list-style:none;
> 	margin: 0 0 0 0;
> 	padding: 0;
> 	width:100%;
> 	font-size: 11px;
> 	overflow: hidden;
> 	line-height: 1.6em;
> 	border: 0;
678,682c415,416
< /* /CD/vendors/ */
< table.vendors {
< 	width: 100%;
< 	border-collapse: collapse;
< 	border: 1px solid #AAAAAA;
---
> ul#footermap-cola a, ul#footermap-colb a, ul#footermap-colc a, ul#footermap-cold a, ul#footermap-cole a {
> 	padding-left: 0;
685,693c419,436
< table.vendors th {
< 	background: #BBDDFF;
< 	font-size: 0.9em;
< 	font-family: Arial, Helvetica, sans-serif;
< 	color: #3e4955;
< 	padding: 0.2em;
< 	border: 1px solid #AAAAAA;
< 	border-bottom: none;
< 	text-align: left;
---
> ul#footermap-cola, ul#footermap-colb,ul#footermap-colc, ul#footermap-cold, ul#footermap-cole {
> 	float:left;
> 	width: 19%;
> 	min-width: 11em;
> 	height: 12em; /* Update when adding items */
> 	margin:0 1% 0 0;
> 	padding: 10px 0 0 0;
> 	list-style: none;
> }
> 
> ul#footermap-cole {
> 	width: 18.9%;
> 	margin-right:0;
> }
> 
> #footermap-wrap {
> 	padding:1em 1em 1em 1em;
> 	border-top: 1px solid white;
695,697c438,439
< 
< table.vendors tr.b td {
< 	background-color: #EEEEEE;
---
> #footermap a {
> 	margin: 0;
700,702c442,465
< table.vendors td {
< 	padding: 0.2em;
< 	vertical-align: top;
---
> #footermap ul{
> 		list-style: none;
> 		padding:0;
> }
> #footermap li {
> 	text-indent:0;
> 	background-color: transparent;
> 	font-weight:bold;
> 	margin-top: 0.5em;
> }
> #footermap li ul {
> 		margin: 0;
> 		padding: 0:
> 
> }
> #footermap li li {
> 	margin:0;
> 	text-indent:0;
> 	padding:0;
> 	font-weight:normal;
> 	line-height: 1.5em;
> 	border:0;
> 	background-image:none;
> 	background-color:transparent;
Index: donations.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/donations.wml,v
retrieving revision 1.62
diff -r1.62 donations.wml
3c3
< <ul>
---
> <ul class="toc">
Index: support.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/support.wml,v
retrieving revision 1.56
diff -r1.56 support.wml
5d4
< <hrline />
Index: Bugs/Developer.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/Bugs/Developer.wml,v
retrieving revision 1.80
diff -r1.80 Developer.wml
17d16
< <hrline />
19c18
< <ul>
---
> <ul class="toc">
33d31
< <hrline />
Index: Bugs/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/Bugs/index.wml,v
retrieving revision 1.73
diff -r1.73 index.wml
3c3,13
< {#style#:<link rel="stylesheet" href="http://bugs.debian.org/css/bugs.css" type="text/css">:##}
---
> <div id="leftcol">
> <h4>Bug tracking system documentation</h4>
> <ul>
>   <li><a href="Developer">Advanced information on how to use the system</a></li>
>   <li><a href="server-control">Information on manipulating bugs by email</a></li>
>   <li><a href="server-refcard">Mailservers' reference card</a></li>
>   <li><a href="Access">Ways of accessing the bug report logs</a></li>
>   <li><a href="server-request">Requesting bug reports by email</a></li>
> </ul>
> </div>
> 
9d18
< 
15,24d23
< <h2>Bug tracking system documentation</h2>
< 
< <ul>
<   <li><a href="Developer">Advanced information on how to use the system</a></li>
<   <li><a href="server-control">Information on manipulating bugs by email</a></li>
<   <li><a href="server-refcard">Mailservers' reference card</a></li>
<   <li><a href="Access">Ways of accessing the bug report logs</a></li>
<   <li><a href="server-request">Requesting bug reports by email</a></li>
< </ul>
< 
Index: consultants/consultant.data
===================================================================
RCS file: /cvs/webwml/webwml/english/consultants/consultant.data,v
retrieving revision 1.1321
diff -r1.1321 consultant.data
16c16
< <ul>
---
> <ul class="toc">
Index: consultants/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/consultants/index.wml,v
retrieving revision 1.23
diff -r1.23 index.wml
22d21
< <hrline>
28d26
< <hrline>
Index: devel/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/index.wml,v
retrieving revision 1.216
diff -r1.216 index.wml
6c6
< <ul>
---
> <ul class="toc">
14d13
< <hrline />
Index: distrib/packages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/packages.wml,v
retrieving revision 1.66
diff -r1.66 packages.wml
7,8d6
< <hr />
< 
Index: doc/manuals.defs
===================================================================
RCS file: /cvs/webwml/webwml/english/doc/manuals.defs,v
retrieving revision 1.51
diff -r1.51 manuals.defs
12,13d11
< <hr>
< 
Index: intro/about.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/about.wml,v
retrieving revision 1.60
diff -r1.60 about.wml
4c4
< <UL>
---
> <UL class="toc">
Index: intro/organization.data
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/organization.data,v
retrieving revision 1.323
diff -r1.323 organization.data
42c42
< <ul>
---
> <ul class="toc">
Index: mirror/webmirror.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/mirror/webmirror.wml,v
retrieving revision 1.42
diff -r1.42 webmirror.wml
7d6
< <hrline />
Index: po/bugs.pot
===================================================================
RCS file: /cvs/webwml/webwml/english/po/bugs.pot,v
retrieving revision 1.15
diff -r1.15 bugs.pot
96c96
< #: ../../english/Bugs/pkgreport-opts.inc:135
---
> #: ../../english/Bugs/pkgreport-opts.inc:136
100c100
< #: ../../english/Bugs/pkgreport-opts.inc:136
---
> #: ../../english/Bugs/pkgreport-opts.inc:137
104c104
< #: ../../english/Bugs/pkgreport-opts.inc:137
---
> #: ../../english/Bugs/pkgreport-opts.inc:138
108c108
< #: ../../english/Bugs/pkgreport-opts.inc:138
---
> #: ../../english/Bugs/pkgreport-opts.inc:139
112c112
< #: ../../english/Bugs/pkgreport-opts.inc:141
---
> #: ../../english/Bugs/pkgreport-opts.inc:142
116c116
< #: ../../english/Bugs/pkgreport-opts.inc:144
---
> #: ../../english/Bugs/pkgreport-opts.inc:145
120c120
< #: ../../english/Bugs/pkgreport-opts.inc:147
---
> #: ../../english/Bugs/pkgreport-opts.inc:148
Index: po/cdimage.pot
===================================================================
RCS file: /cvs/webwml/webwml/english/po/cdimage.pot,v
retrieving revision 1.2
diff -r1.2 cdimage.pot
7c7
< #: ../../english/template/debian/cdimage.wml:10
---
> #: ../../english/template/debian/cdimage.wml:9
11c11
< #: ../../english/template/debian/cdimage.wml:13
---
> #: ../../english/template/debian/cdimage.wml:12
15c15
< #: ../../english/template/debian/cdimage.wml:16
---
> #: ../../english/template/debian/cdimage.wml:15
19c19
< #: ../../english/template/debian/cdimage.wml:19
---
> #: ../../english/template/debian/cdimage.wml:18
23c23
< #: ../../english/template/debian/cdimage.wml:22
---
> #: ../../english/template/debian/cdimage.wml:21
27c27
< #: ../../english/template/debian/cdimage.wml:25
---
> #: ../../english/template/debian/cdimage.wml:24
31c31
< #: ../../english/template/debian/cdimage.wml:28
---
> #: ../../english/template/debian/cdimage.wml:27
35c35
< #: ../../english/template/debian/cdimage.wml:31
---
> #: ../../english/template/debian/cdimage.wml:30
39c39
< #: ../../english/template/debian/cdimage.wml:34
---
> #: ../../english/template/debian/cdimage.wml:33
43c43
< #: ../../english/template/debian/cdimage.wml:37
---
> #: ../../english/template/debian/cdimage.wml:36
47c47
< #: ../../english/template/debian/cdimage.wml:40
---
> #: ../../english/template/debian/cdimage.wml:39
51c51
< #: ../../english/template/debian/cdimage.wml:43
---
> #: ../../english/template/debian/cdimage.wml:42
55c55
< #: ../../english/template/debian/cdimage.wml:46
---
> #: ../../english/template/debian/cdimage.wml:45
59c59
< #: ../../english/template/debian/cdimage.wml:49
---
> #: ../../english/template/debian/cdimage.wml:48
63c63
< #: ../../english/template/debian/cdimage.wml:52
---
> #: ../../english/template/debian/cdimage.wml:51
67c67
< #: ../../english/template/debian/cdimage.wml:55
---
> #: ../../english/template/debian/cdimage.wml:54
71c71
< #: ../../english/template/debian/cdimage.wml:58
---
> #: ../../english/template/debian/cdimage.wml:57
75c75
< #: ../../english/template/debian/cdimage.wml:61
---
> #: ../../english/template/debian/cdimage.wml:60
79c79
< #: ../../english/template/debian/cdimage.wml:64
---
> #: ../../english/template/debian/cdimage.wml:63
83c83
< #: ../../english/template/debian/cdimage.wml:67
---
> #: ../../english/template/debian/cdimage.wml:66
87c87
< #: ../../english/template/debian/cdimage.wml:70
---
> #: ../../english/template/debian/cdimage.wml:69
91c91
< #: ../../english/template/debian/cdimage.wml:73
---
> #: ../../english/template/debian/cdimage.wml:72
Index: po/legal.pot
===================================================================
RCS file: /cvs/webwml/webwml/english/po/legal.pot,v
retrieving revision 1.1
diff -r1.1 legal.pot
6c6
< #: ../../english/template/debian/legal.wml:16
---
> #: ../../english/template/debian/legal.wml:15
10c10
< #: ../../english/template/debian/legal.wml:20
---
> #: ../../english/template/debian/legal.wml:19
14c14
< #: ../../english/template/debian/legal.wml:24
---
> #: ../../english/template/debian/legal.wml:23
18c18
< #: ../../english/template/debian/legal.wml:28
---
> #: ../../english/template/debian/legal.wml:27
22c22
< #: ../../english/template/debian/legal.wml:32
---
> #: ../../english/template/debian/legal.wml:31
27c27
< #: ../../english/template/debian/legal.wml:50
---
> #: ../../english/template/debian/legal.wml:49
32c32
< #: ../../english/template/debian/legal.wml:53
---
> #: ../../english/template/debian/legal.wml:52
36c36
< #: ../../english/template/debian/legal.wml:60
---
> #: ../../english/template/debian/legal.wml:59
40c40
< #: ../../english/template/debian/legal.wml:62
---
> #: ../../english/template/debian/legal.wml:61
44c44
< #: ../../english/template/debian/legal.wml:65
---
> #: ../../english/template/debian/legal.wml:64
48c48
< #: ../../english/template/debian/legal.wml:67
---
> #: ../../english/template/debian/legal.wml:66
52c52
< #: ../../english/template/debian/legal.wml:71
---
> #: ../../english/template/debian/legal.wml:70
56c56
< #: ../../english/template/debian/legal.wml:73
---
> #: ../../english/template/debian/legal.wml:72
60c60
< #: ../../english/template/debian/legal.wml:75
---
> #: ../../english/template/debian/legal.wml:74
64c64
< #: ../../english/template/debian/legal.wml:77
---
> #: ../../english/template/debian/legal.wml:76
68c68
< #: ../../english/template/debian/legal.wml:78
---
> #: ../../english/template/debian/legal.wml:77
72c72
< #: ../../english/template/debian/legal.wml:81
---
> #: ../../english/template/debian/legal.wml:80
76c76
< #: ../../english/template/debian/legal.wml:84
---
> #: ../../english/template/debian/legal.wml:83
Index: po/organization.pot
===================================================================
RCS file: /cvs/webwml/webwml/english/po/organization.pot,v
retrieving revision 1.46
diff -r1.46 organization.pot
42c42
< #: ../../english/intro/organization.data:68
---
> #: ../../english/intro/organization.data:70
47c47
< #: ../../english/intro/organization.data:197
---
> #: ../../english/intro/organization.data:199
52c52
< #: ../../english/intro/organization.data:218
---
> #: ../../english/intro/organization.data:219
68c68
< #: ../../english/intro/organization.data:63
---
> #: ../../english/intro/organization.data:64
72c72
< #: ../../english/intro/organization.data:71
---
> #: ../../english/intro/organization.data:73
76c76
< #: ../../english/intro/organization.data:72
---
> #: ../../english/intro/organization.data:74
80c80
< #: ../../english/intro/organization.data:74
---
> #: ../../english/intro/organization.data:76
84c84
< #: ../../english/intro/organization.data:77
---
> #: ../../english/intro/organization.data:79
88c88
< #: ../../english/intro/organization.data:83
---
> #: ../../english/intro/organization.data:85
92c92
< #: ../../english/intro/organization.data:84
---
> #: ../../english/intro/organization.data:86
96c96
< #: ../../english/intro/organization.data:86
---
> #: ../../english/intro/organization.data:88
100c100
< #: ../../english/intro/organization.data:97
---
> #: ../../english/intro/organization.data:98
148c148
< #: ../../english/intro/organization.data:186
---
> #: ../../english/intro/organization.data:188
152c152
< #: ../../english/intro/organization.data:189
---
> #: ../../english/intro/organization.data:191
156c156
< #: ../../english/intro/organization.data:190
---
> #: ../../english/intro/organization.data:192
160c160
< #: ../../english/intro/organization.data:191
---
> #: ../../english/intro/organization.data:193
164c164
< #: ../../english/intro/organization.data:192
---
> #: ../../english/intro/organization.data:194
168c168
< #: ../../english/intro/organization.data:200
---
> #: ../../english/intro/organization.data:202
172c172
< #: ../../english/intro/organization.data:203
---
> #: ../../english/intro/organization.data:205
176c176
< #: ../../english/intro/organization.data:208
---
> #: ../../english/intro/organization.data:209
180c180
< #: ../../english/intro/organization.data:212
---
> #: ../../english/intro/organization.data:213
184c184
< #: ../../english/intro/organization.data:221
---
> #: ../../english/intro/organization.data:222
188c188
< #: ../../english/intro/organization.data:288
---
> #: ../../english/intro/organization.data:289
192c192
< #: ../../english/intro/organization.data:295
---
> #: ../../english/intro/organization.data:296
196c196
< #: ../../english/intro/organization.data:303
---
> #: ../../english/intro/organization.data:304
200c200
< #: ../../english/intro/organization.data:308
---
> #: ../../english/intro/organization.data:309
204c204
< #: ../../english/intro/organization.data:311
---
> #: ../../english/intro/organization.data:312
208c208
< #: ../../english/intro/organization.data:314
---
> #: ../../english/intro/organization.data:315
216c216
< #: ../../english/intro/organization.data:333
---
> #: ../../english/intro/organization.data:332
220c220
< #: ../../english/intro/organization.data:340
---
> #: ../../english/intro/organization.data:339
224c224
< #: ../../english/intro/organization.data:345
---
> #: ../../english/intro/organization.data:344
228c228
< #: ../../english/intro/organization.data:351
---
> #: ../../english/intro/organization.data:350
232c232
< #: ../../english/intro/organization.data:356
---
> #: ../../english/intro/organization.data:355
236c236
< #: ../../english/intro/organization.data:359
---
> #: ../../english/intro/organization.data:358
240c240
< #: ../../english/intro/organization.data:364
---
> #: ../../english/intro/organization.data:363
244c244
< #: ../../english/intro/organization.data:370
---
> #: ../../english/intro/organization.data:369
248c248
< #: ../../english/intro/organization.data:371
---
> #: ../../english/intro/organization.data:370
252c252
< #: ../../english/intro/organization.data:378
---
> #: ../../english/intro/organization.data:377
256c256
< #: ../../english/intro/organization.data:379
---
> #: ../../english/intro/organization.data:378
260c260
< #: ../../english/intro/organization.data:380
---
> #: ../../english/intro/organization.data:379
264c264
< #: ../../english/intro/organization.data:381
---
> #: ../../english/intro/organization.data:380
268c268
< #: ../../english/intro/organization.data:382
---
> #: ../../english/intro/organization.data:381
272c272
< #: ../../english/intro/organization.data:383
---
> #: ../../english/intro/organization.data:382
276c276
< #: ../../english/intro/organization.data:392
---
> #: ../../english/intro/organization.data:391
280c280
< #: ../../english/intro/organization.data:393
---
> #: ../../english/intro/organization.data:392
284c284
< #: ../../english/intro/organization.data:395
---
> #: ../../english/intro/organization.data:394
288c288
< #: ../../english/intro/organization.data:398
---
> #: ../../english/intro/organization.data:397
292c292
< #: ../../english/intro/organization.data:404
---
> #: ../../english/intro/organization.data:403
296c296
< #: ../../english/intro/organization.data:406
---
> #: ../../english/intro/organization.data:405
300c300
< #: ../../english/intro/organization.data:408
---
> #: ../../english/intro/organization.data:407
304c304
< #: ../../english/intro/organization.data:413
---
> #: ../../english/intro/organization.data:412
308c308
< #: ../../english/intro/organization.data:427
---
> #: ../../english/intro/organization.data:426
312c312
< #: ../../english/intro/organization.data:430
---
> #: ../../english/intro/organization.data:429
316c316
< #: ../../english/intro/organization.data:433
---
> #: ../../english/intro/organization.data:432
320c320
< #: ../../english/intro/organization.data:441
---
> #: ../../english/intro/organization.data:439
324c324
< #: ../../english/intro/organization.data:445
---
> #: ../../english/intro/organization.data:443
328c328
< #: ../../english/intro/organization.data:448
---
> #: ../../english/intro/organization.data:446
332c332
< #: ../../english/intro/organization.data:450
---
> #: ../../english/intro/organization.data:448
Index: po/templates.pot
===================================================================
RCS file: /cvs/webwml/webwml/english/po/templates.pot,v
retrieving revision 1.60
diff -r1.60 templates.pot
153c153
< #: ../../english/template/debian/footer.wml:10
---
> #: ../../english/template/debian/footer.wml:86
157c157
< #: ../../english/template/debian/footer.wml:13
---
> #: ../../english/template/debian/footer.wml:89
161c161
< #: ../../english/template/debian/footer.wml:16
---
> #: ../../english/template/debian/footer.wml:92
165c165
< #: ../../english/template/debian/footer.wml:19
---
> #: ../../english/template/debian/footer.wml:95
169c169
< #: ../../english/template/debian/footer.wml:22
---
> #: ../../english/template/debian/footer.wml:98
173,174c173,174
< #: ../../english/template/debian/languages.wml:183
< #: ../../english/template/debian/languages.wml:209
---
> #: ../../english/template/debian/languages.wml:188
> #: ../../english/template/debian/languages.wml:214
178c178
< #: ../../english/template/debian/languages.wml:233
---
> #: ../../english/template/debian/languages.wml:238
355c355
< msgid "Select a server near you"
---
> msgid "Select a server near you: "
Index: ports/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/index.wml,v
retrieving revision 1.82
diff -r1.82 index.wml
4c4
< <ul>
---
> <ul class="toc">
12,13d11
< <hr />
< 
Index: template/debian/basic.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.88
diff -r1.88 basic.wml
22a23,25
>   {#style#:<link href="$(CSS:-$(HOME))/debhome.css" rel="stylesheet" type="text/css" />
> :#style#}
> 
Index: template/debian/cdimage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/cdimage.wml,v
retrieving revision 1.89
diff -r1.89 cdimage.wml
7d6
< 
143c142
< <div class="center"><small><tt><b>\
---
> <div class="center"><b>\
151c150
< </b></tt></small></div>
---
> </b></div>
152a152,159
> <div id="serverselect">
> <when <not "$(NOMIRRORS)"/>>
>   <mirrors-serverlist/>
> </when>
> </div> <!-- end serverselect -->
> <hr />
> 
> 
159c166
< <p><small><english-mailing-list><br/><debian-cd-team/> &lt;<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;debian-cd&#64;lists.debian.org">debian-cd&#64;lists.debian.org</a>&gt;</small></p>
---
> <p><english-mailing-list><br/><debian-cd-team/> &lt;<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;debian-cd&#64;lists.debian.org">debian-cd&#64;lists.debian.org</a>&gt;</p>
Index: template/debian/ddp.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/ddp.wml,v
retrieving revision 1.43
diff -r1.43 ddp.wml
4a5
> {#check_trans#}
9d9
< {#check_trans#}
Index: template/debian/footer.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/footer.wml,v
retrieving revision 1.112
diff -r1.112 footer.wml
1a2
> #use wml::debian::links.tags
2a4,78
> <div id="serverselect">
> <when <not "$(NOMIRRORS)"/>>
>   <mirrors-serverlist/>
> </when>
> </div> <!-- end serverselect -->
> <hr />
> <when <not "$(MAINPAGE)"/>>
> 
> <div id="footermap">
> <!--UdmComment-->
> 
>     <ul id="footermap-cola">
> 		<li><a href="$(INTRO)/about"><about/></a>
> 		  <ul>
> 		  <li><a href="$(HOME)/social_contract"><socialcontract/></a></li>
> 		  <li><a href="$(HOME)/intro/free"><freesoftware/></a></li>
> 		  <li><a href="$(HOME)/partners/"><partners/></a></li>
> 		  <li><a href="$(HOME)/donations"><donations/></a></li>
> 		  <li><a href="$(HOME)/contact"><contactus/></a></li>
> 		  </ul>
> 		</li>
> 	</ul>
> 	<ul id="footermap-colb">
> 			<li><a href="$(DISTRIB)/"><gettingdebian/></a>
> 			  <ul>
> 			  <li><a href="CD/vendors/"><cdvendors/></a></li>
> 			  <li><a href="CD/"><cdisoimages/></a></li>
> 			  <li><a href="$(DISTRIB)/netinst"><netinst/></a></li>
> 			  <li><a href="$(DISTRIB)/pre-installed"><pre-installed/></a></li>
> 			  </ul>
> 			</li>
>     <li><a href="$(DISTRIB)/packages"><debianpackages/></a></li>
> 	</ul>
> 	<ul id="footermap-colc">
> 		<li><a href="$(HOME)/News/"><news/></a>
> 		  <ul>
> 		  <li><a href="$(HOME)/News/project/"><projectnews/></a></li>
> 		  <li><a href="$(HOME)/events/"><events/></a></li>
> 		  </ul>
> 		</li>
> 
>     <li><a href="$(DOC)/"><documentation/></a>
>       <ul>
>       <li><a href="$(HOME)/releases/"><releaseinfo/></a></li>
>       <li><a href="$(HOME)/releases/stable/installmanual"><installationmanual/></a></li>
>       <li><a href="$(DOC)/books"><debianbooks/></a></li>
>       </ul>
>     </li>
>    </ul> 
>    <ul id="footermap-cold">
>     <li><a href="$(HOME)/support"><support/></a>
> 	  <ul>
> 			  <li><a href="$(HOME)/international/"><debinternational/></a></li>
> 			  <li><a href="$(HOME)/security/"><security/></a></li>
> 			  <li><a href="$(BUGS)/"><bugreports/></a></li>
> 			  <li><a href="MailingLists/"><mailinglists/></a></li>
> 			  <li><a href="http://lists.debian.org/"><mailarchives/></a></li>
> 			  <li><a href="$(HOME)/ports/"><portsarchitectures/></a></li>
>       </ul>
>     </li>
> </ul>
> <ul id="footermap-cole">
>     <li><a href="$(MISC)/"><misc/></a></li>
> 
>     <li><a href="$(HOME)/intro/help"><helpdebian/></a></li>
> 
>     <li><a href="$(HOME)/devel/"><develcorner/></a></li>
> 
>     <li><a href="$(HOME)/sitemap"><sitemap_short/></a></li>
>     <li><a href="$(SEARCH)"><search/></a></li>
> </ul>
> <!--/UdmComment-->
> </div> <!-- end footermap -->
> <hr />
> </when>
Index: template/debian/mainpage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mainpage.wml,v
retrieving revision 1.58
diff -r1.58 mainpage.wml
28,29c28
< 
< <div id="leftcol">
---
> <div id="hometoc">
32,56c31,50
<     <ul>
<     <li><a href="$(INTRO)/about"><about/></a>
<       <ul>
<       <li><a href="$(HOME)/social_contract"><socialcontract/></a></li>
<       <li><a href="$(HOME)/intro/free"><freesoftware/></a></li>
<       <li><a href="$(HOME)/partners/"><partners/></a></li>
<       <li><a href="$(HOME)/donations"><donations/></a></li>
<       <li><a href="$(HOME)/contact"><contactus/></a></li>
<       </ul>
<     </li>
<     <li><a href="$(HOME)/News/"><news/></a>
<       <ul>
<       <li><a href="$(HOME)/News/project/"><projectnews/></a></li>
<       <li><a href="$(HOME)/events/"><events/></a></li>
<       </ul>
<     </li>
< 
<     <li><a href="$(DISTRIB)/"><gettingdebian/></a>
<       <ul>
<       <li><a href="CD/vendors/"><cdvendors/></a></li>
<       <li><a href="CD/"><cdisoimages/></a></li>
<       <li><a href="$(DISTRIB)/netinst"><netinst/></a></li>
<       <li><a href="$(DISTRIB)/pre-installed"><pre-installed/></a></li>
<       </ul>
<     </li>
---
>     <ul id="hometoc-cola">
> 		<li><a href="$(INTRO)/about"><about/></a>
> 		  <ul>
> 		  <li><a href="$(HOME)/social_contract"><socialcontract/></a></li>
> 		  <li><a href="$(HOME)/intro/free"><freesoftware/></a></li>
> 		  <li><a href="$(HOME)/partners/"><partners/></a></li>
> 		  <li><a href="$(HOME)/donations"><donations/></a></li>
> 		  <li><a href="$(HOME)/contact"><contactus/></a></li>
> 		  </ul>
> 		</li>
> 	</ul>
> 	<ul id="hometoc-colb">
> 			<li><a href="$(DISTRIB)/"><gettingdebian/></a>
> 			  <ul>
> 			  <li><a href="CD/vendors/"><cdvendors/></a></li>
> 			  <li><a href="CD/"><cdisoimages/></a></li>
> 			  <li><a href="$(DISTRIB)/netinst"><netinst/></a></li>
> 			  <li><a href="$(DISTRIB)/pre-installed"><pre-installed/></a></li>
> 			  </ul>
> 			</li>
57a52,59
> 	</ul>
> 	<ul id="hometoc-colc">
> 		<li><a href="$(HOME)/News/"><news/></a>
> 		  <ul>
> 		  <li><a href="$(HOME)/News/project/"><projectnews/></a></li>
> 		  <li><a href="$(HOME)/events/"><events/></a></li>
> 		  </ul>
> 		</li>
66c68,69
<     
---
>    </ul> 
>    <ul id="hometoc-cold">
68,74c71,77
<       <ul>
<       <li><a href="$(HOME)/international/"><debinternational/></a></li>
<       <li><a href="$(HOME)/security/"><security/></a></li>
<       <li><a href="$(BUGS)/"><bugreports/></a></li>
<       <li><a href="MailingLists/"><mailinglists/></a></li>
<       <li><a href="http://lists.debian.org/"><mailarchives/></a></li>
<       <li><a href="$(HOME)/ports/"><portsarchitectures/></a></li>
---
> 	  <ul>
> 			  <li><a href="$(HOME)/international/"><debinternational/></a></li>
> 			  <li><a href="$(HOME)/security/"><security/></a></li>
> 			  <li><a href="$(BUGS)/"><bugreports/></a></li>
> 			  <li><a href="MailingLists/"><mailinglists/></a></li>
> 			  <li><a href="http://lists.debian.org/"><mailarchives/></a></li>
> 			  <li><a href="$(HOME)/ports/"><portsarchitectures/></a></li>
77c80,81
< 
---
> </ul>
> <ul id="hometoc-cole">
86,106c90
<     </ul>
< 
<     <form method="get" action="http://search.debian.org/">
<     <p>
<     <input type="text" name="q" size="12" />
<     </p>
<     </form>
< 
<     <p>
<     <a href="$(HOME)/sponsor.html"><img src="sponsor_img.jpg"  alt="<visitsponsor/>" width="102" height="60" /></a>
<     </p>
<     <p>
<     <a href="http://validator.w3.org/check/referer"><ifeq "$(DOCTYPE)" xhtml
<         "<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" width="88" height="31" />"
<         "<img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" width="88" height="31" />"
<     /></a>
<     </p>
<     <p>
<     <img src="http://jigsaw.w3.org/css-validator/images/vcss"
<         alt="Valid CSS!" width="88" height="31" />
<     </p>
---
> </ul>
108c92
< </div> <!-- end leftcol -->
---
> </div> <!-- end hometoc -->
Index: template/debian/mirrors.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mirrors.wml,v
retrieving revision 1.41
diff -r1.41 mirrors.wml
8c8
<   <gettext>Select a server near you</gettext>
---
>   <gettext>Select a server near you: </gettext>
25d24
< <br />
Index: template/debian/navbar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/navbar.wml,v
retrieving revision 1.76
diff -r1.76 navbar.wml
7,8c7
<   <a href="$(HOME)/"><img src="$(LOGOS:-$(HOME)/logos)/openlogo-nd-50.png" width="50" height="61" alt="" /></a>
<   <a href="$(HOME)/" rel="start"><img src="$(PICS)/debian.png" width="179" height="61" alt="<debianproject/>" /></a>
---
>   <a href="$(HOME)/" title="Debian Home"><img src="$(LOGOS:-$(HOME)/Pics)/openlogo-50.png" walt="" /></a>
10,16c9,18
< <div id="serverselect">
< <when <not "$(NOMIRRORS)"/>>
<   <mirrors-serverlist/>
< </when>
< </div> <!-- end serverselect -->
< </div> <!-- end upperheader -->
< 
---
> 		<div id="sitetools">
> 				<span class="sitetool">
> 						<form name="p" method="get" action="/cgi-bin/omega">
> 								<input name="P" value="" size="27" />
> 								<input type="submit" value="Search" />
> 						</form>
> 				</span>
> 		</div>   <!-- end sitetools -->
> 	 </div> <!-- end upperheader -->
>  
22d23
<    <li><a href="$(HOME)/News/"><news/></a></li>
26,27d26
<    <li><a href="$(HOME)/sitemap"><sitemap_short/></a></li>
<    <li><a href="$(SEARCH)"><search/></a></li>
29a29,35
> <when <not "$(MAINPAGE)">>
> <p id="breadcrumbs"> &lsaquo;&nbsp;&nbsp;$(title)</p>
> </when>
> <when "$(MAINPAGE)">
> <p id="breadcrumbs"> &ndash;&nbsp;&nbsp;The Universal Operating System</p>
> </when>
> 
Index: template/debian/navbarcd.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/navbarcd.wml,v
retrieving revision 1.2
diff -r1.2 navbarcd.wml
7,8c7
<   <a href="$(HOME)/"><img src="$(HOME)/logos/openlogo-nd-50.png" width="50" height="61" alt="" /></a>
<   <a href="$(HOME)/" rel="start"><img src="$(PICS)/debian.png" width="179" height="61" alt="<debianproject/>" /></a>
---
>   <a href="$(HOME)/"><img src="$(HOME)/Pics/openlogo-50.png" width="50" height="61" alt="" /></a>
10,17c9,17
< <div id="serverselect">
< <when <not "$(NOMIRRORS)"/>>
<   <mirrors-serverlist/>
< </when>
< </div> <!-- end serverselect -->
< <div class="centerlogo"><a href="$(HOME)/CD/"><img id="cdlogo" src="$(HOME)/Pics/cdimage-105x61.png" alt="<debiancd/>" width="105" height="61"></a></div>
< </div> <!-- end upperheader -->
< 
---
> 	<div id="sitetools">
> 		<span class="sitetool">
> 			<form name="p" method="get" action="/cgi-bin/omega">
> 					<input name="P" value="" size="27" />
> 					<input type="submit" value="Search" />
> 			</form>
> 		</span>
> 	</div>
> </div>
23d22
<    <li><a href="$(HOME)/News/"><news/></a></li>
27,28d25
<    <li><a href="$(HOME)/sitemap"><sitemap_short/></a></li>
<    <li><a href="$(SEARCH)"><search/></a></li>
30a28,34
> <when <not "$(MAINPAGE)">>
> <p id="breadcrumbs"> &lsaquo;&nbsp;&nbsp;$(title)</p>
> </when>
> 
> </div> <!-- end upperheader -->
> 
> 
Index: template/debian/toc.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/toc.wml,v
retrieving revision 1.11
diff -r1.11 toc.wml
25c25
< <define-tag toc-display-begin$(TOCNAME)><ul*></define-tag>
---
> <define-tag toc-display-begin$(TOCNAME)><ul* class="toc"></define-tag>
Index: users/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/users/index.wml,v
retrieving revision 1.196
diff -r1.196 index.wml
23d22
< <hr />