You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2006/07/18 00:22:36 UTC
svn commit: r422897 [5/5] - in /lenya/site: ./ community/ skin/
Modified: lenya/site/community/live-sites.html
URL: http://svn.apache.org/viewvc/lenya/site/community/live-sites.html?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/community/live-sites.html (original)
+++ lenya/site/community/live-sites.html Mon Jul 17 15:22:32 2006
@@ -153,7 +153,9 @@
<!--+
|alternative credits
+-->
-<div id="credit2"></div>
+<div id="credit2">
+<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+</div>
</div>
<!--+
|end Menu
@@ -409,6 +411,10 @@
<li>
<a href="http://www.wired.com">Wired News</a>
+</li>
+
+<li>
+<a href="http://www.technologyblueprint.co.uk">Techology Blueprint</a>
</li>
<li>
Modified: lenya/site/community/live-sites.pdf
URL: http://svn.apache.org/viewvc/lenya/site/community/live-sites.pdf?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/site/guidelines.html
URL: http://svn.apache.org/viewvc/lenya/site/guidelines.html?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/guidelines.html (original)
+++ lenya/site/guidelines.html Mon Jul 17 15:22:32 2006
@@ -193,12 +193,6 @@
</div>
<h1>Apache Lenya project guidelines</h1>
-<div class="warning">
-<div class="label">Proposal draft document</div>
-<div class="content">This document is a proposal and
- currently under discussions on the dev list.</div>
-</div>
-
<p>
This document provides the guidelines under which the Apache Lenya
project operates. It defines the roles and responsibilities, who may vote,
@@ -215,7 +209,7 @@
</p>
-<a name="N10018"></a><a name="mission"></a>
+<a name="N10014"></a><a name="mission"></a>
<h2 class="h3">The mission of Apache Lenya</h2>
<div class="section">
<p>
@@ -225,7 +219,7 @@
</div>
-<a name="N10022"></a><a name="way"></a>
+<a name="N1001E"></a><a name="way"></a>
<h2 class="h3">Open development</h2>
<div class="section">
<p>
@@ -268,7 +262,7 @@
</div>
-<a name="N1005A"></a><a name="roles"></a>
+<a name="N10056"></a><a name="roles"></a>
<h2 class="h3">Roles and responsibilities</h2>
<div class="section">
<p>The meritocracy enables various roles as defined in the
@@ -284,12 +278,13 @@
</p>
<p>The current Apache Lenya committers and PMC members are
- <a href="community/acknowledgements.html">listed</a>.
+ <a href="community/acknowledgements.html">listed</a>. The Lenya PMC has additionally granted commit access
+ to committers from its sister projects Apache Cocoon and Apache Forrest.
</p>
</div>
-<a name="N10086"></a><a name="pmc"></a>
+<a name="N10082"></a><a name="pmc"></a>
<h2 class="h3">Project Management Committee (PMC)</h2>
<div class="section">
<p>The Apache Lenya project was established in spring 2003 and became a
@@ -367,7 +362,7 @@
<a href="http://www.apache.org/dev/pmc.html#chair">PMC FAQ</a>
</p>
-<a name="N100D3"></a><a name="report"></a>
+<a name="N100CF"></a><a name="report"></a>
<h3 class="h4">Quarterly reports to ASF Board</h3>
<p>
Every three months, it is the responsibility of our PMC chair to
@@ -380,7 +375,7 @@
<a href="http://www.apache.org/foundation/board/calendar.html">
board meeting</a>. Our reporting schedule is: Feb, May, Aug, Nov.
</p>
-<a name="N100E4"></a><a name="elect"></a>
+<a name="N100E0"></a><a name="elect"></a>
<h3 class="h4">Electing new committers and PMC members</h3>
<p>
We conduct the vote on the private PMC mailing list to enable a frank
@@ -396,7 +391,7 @@
</div>
-<a name="N100EF"></a><a name="decision"></a>
+<a name="N100EB"></a><a name="decision"></a>
<h2 class="h3">Decision making</h2>
<div class="section">
<p>
@@ -410,7 +405,7 @@
Most day-to-day operations do not require explicit voting - just get on
and do the work. See the "Lazy approval" type described below.
</p>
-<a name="N100FB"></a><a name="voting"></a>
+<a name="N100F7"></a><a name="voting"></a>
<h3 class="h4">Voting</h3>
<p>
Certain actions and decisions regarding the project are made by votes
@@ -499,7 +494,7 @@
typically take the form of a veto (-1) in reply to the commit message
sent when the commit is made.
</p>
-<a name="N1015F"></a><a name="approvals"></a>
+<a name="N1015B"></a><a name="approvals"></a>
<h3 class="h4">Types of approval</h3>
<p>
Different actions require different types of approval:
@@ -565,7 +560,7 @@
</tr>
</table>
-<a name="N101B2"></a><a name="veto"></a>
+<a name="N101AE"></a><a name="veto"></a>
<h3 class="h4">Vetoes</h3>
<p>
A valid veto cannot be over-ruled, it can only be withdrawn by its issuer.
@@ -587,7 +582,7 @@
If a veto is not withdrawn, the action that has been vetoed must
be reversed in a timely manner.
</p>
-<a name="N101C5"></a><a name="actions"></a>
+<a name="N101C1"></a><a name="actions"></a>
<h3 class="h4">Actions</h3>
<p>
This section describes the various actions which are undertaken within
@@ -613,7 +608,23 @@
This includes source code, documentation, website content, etc.
</td>
<td colspan="1" rowspan="1">
- Lazy approval
+ Lazy approval for trunk, lazy majority for the release branch.
+ </td>
+ <td colspan="1" rowspan="1">
+ Active PMC members
+ </td>
+
+</tr>
+
+<tr>
+
+<td colspan="1" rowspan="1"><strong>Opening / Closing a branch</strong></td>
+ <td colspan="1" rowspan="1">
+ When a commiter wants to open a new branch in SVN, or close an existing branch, a vote
+ is required.
+ </td>
+ <td colspan="1" rowspan="1">
+ Lazy majority
</td>
<td colspan="1" rowspan="1">
Active PMC members
@@ -751,7 +762,7 @@
</tr>
</table>
-<a name="N102C1"></a><a name="timeframe"></a>
+<a name="N102D5"></a><a name="timeframe"></a>
<h3 class="h4">Voting timeframes</h3>
<p>
Votes are normally open for a period of one week to allow all active voters
@@ -761,7 +772,7 @@
Votes relating to code changes are not subject to a strict timetable,
but should be made as timely as possible.
</p>
-<a name="N102CB"></a><a name="procedure"></a>
+<a name="N102DF"></a><a name="procedure"></a>
<h3 class="h4">Voting procedure</h3>
<p>
Discussion about the topic would have already happened in a [Proposal]
@@ -780,7 +791,7 @@
At the end of the vote period, the instigator tallies the number of
final votes and reports the results.
</p>
-<a name="N102DF"></a><a name="ultimatum"></a>
+<a name="N102F3"></a><a name="ultimatum"></a>
<h3 class="h4">Ultimatum and breakdown</h3>
<p>
For breakdown situations and those requiring unanimous consensus,
@@ -791,7 +802,7 @@
</div>
-<a name="N102EA"></a><a name="communication"></a>
+<a name="N102FE"></a><a name="communication"></a>
<h2 class="h3">Communication channels</h2>
<div class="section">
<p>
@@ -825,9 +836,17 @@
</div>
-<a name="N10300"></a><a name="code"></a>
+<a name="N10314"></a><a name="code"></a>
<h2 class="h3">Code management</h2>
<div class="section">
+<p>Development on the Lenya codebase happens on the trunk, unless a vote to create a branch
+ has passed. Experimental code not immediately intended for merging into trunk may
+ be commited to the sandbox. In order to prevent a code graveyard, sandbox contents will
+ be reviewed every 6 months and either merged into trunk, promoted to their own top-level directory,
+ or deleted. At any one time, the Lenya project maintains one release branch. At appropriate
+ times, the Lenya project may cut a new release branch from trunk, and retire the previous one.
+ Old release branches are kept in SVN, but are clearly marked as unmaintained both in SVN and on the web site.
+ </p>
<p>
The term "patch" has two meanings: Developers provide a set of changes
via our <a href="community/index.html">issue tracker</a> marked for inclusion,
@@ -837,10 +856,12 @@
<p>
We use the
<a href="http://www.apache.org/foundation/glossary.html#CommitThenReview">Commit-then-review</a>
- method for decision-making about code changes. Please refer to that
+ method for decision-making about code changes by commiters on trunk, and <a href="http://www.apache.org/foundation/glossary.html#ReviewThenCommit">Review-then-Commit</a>
+ on the release branch. Please refer to that
glossary definition. Note that it does not preclude the committer
from making changes to patches prior to their commit, nor mean that the
- committer can be careless. Rather it is a policy for decision-making.
+ committer can be careless. Rather it is a policy for decision-making.
+ Patches from non-commiters are applied according to the same rules by a commiter.
</p>
<p>
There is an important issue where both developers and committers need
@@ -876,7 +897,7 @@
</div>
-<a name="N10325"></a><a name="contribution"></a>
+<a name="N10340"></a><a name="contribution"></a>
<h2 class="h3">Contribution and acknowledgement</h2>
<div class="section">
<p>
@@ -930,20 +951,15 @@
<li>
Committers apply patches as soon as possible. This keeps the contributor
- enthused and shows them that their work is valuable.
+ enthused and shows them that their work is valuable. Plus, it reduces the risk of bit rot,
+ ie, patches that no longer cleanly apply due to unrelated code changes.
</li>
<li>
- Committers add an entry for each significant contribution to the
- top-level <a href="changes.html">changes</a> document (site-author/status.xml)
- and detailed entries to the relevant plugin's changes document. This enables linkage
+ Committers write descriptive commit messages, which are then aggregated into
+ a top-level <a href="changes.html">changes</a> document. This enables linkage
to the relevant issue and shows the contributor's name. It also shows
- the initials of the committer who did the work to add the patch.
- </li>
-
-<li>
- When committers are adding their own work, they similarly add entries
- to the "changes" documents. Their initials are added to the entry.
+ the name of the committer who did the work to add the patch.
</li>
<li>
@@ -969,7 +985,7 @@
</div>
-<a name="N10377"></a><a name="develop"></a>
+<a name="N1038F"></a><a name="develop"></a>
<h2 class="h3">Development procedure</h2>
<div class="section">
<div class="note">
@@ -980,33 +996,12 @@
not need to revisit the topic.
</div>
</div>
-<div class="fixme">
-<div class="label">Fixme (open)</div>
-<div class="content">
-The following issues still need to be added above.
-There are also some relevant email threads, from which we need to extract info.
-</div>
-</div>
-<pre class="code">
-* Define our policy for adding changes to release branch.
-* Define the purpose of the "sandbox".
-* Declare that we only really maintain the current release branch
- (although contributed patches will be applied).
-* When to create a temporary branch for development and when/how to merge.
-
- </pre>
+<p>Development work is done on the trunk of SVN. If a commiter determines a need for a new branch,
+ he discusses the rationale on the developer list, and the decision is made by a vote.</p>
</div>
<!-- FIXME:
-The default is lazy consensus. So just get on with the job
-unless someone asks to stop, review, perhaps revert.
-
-==================
-> We should make mention somewhere of our relationship to other projects
-> Cocoon committers are Lenya committers; something with xml-commons
-
-==================
Mention the "Contributer License Agreement".
Who needs to send it? ... is it committers plus major contributers?
Modified: lenya/site/guidelines.pdf
URL: http://svn.apache.org/viewvc/lenya/site/guidelines.pdf?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/site/index.pdf
URL: http://svn.apache.org/viewvc/lenya/site/index.pdf?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/site/linkmap.html
URL: http://svn.apache.org/viewvc/lenya/site/linkmap.html?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/linkmap.html (original)
+++ lenya/site/linkmap.html Mon Jul 17 15:22:32 2006
@@ -120,6 +120,9 @@
<a href="charter.html">Charter</a>
</div>
<div class="menuitem">
+<a href="guidelines.html">Project guidelines</a>
+</div>
+<div class="menuitem">
<a href="history.html">History</a>
</div>
<div class="menuitem">
@@ -636,7 +639,9 @@
<!--+
|alternative credits
+-->
-<div id="credit2"></div>
+<div id="credit2">
+<a href="http://apachecon.com/"><img border="0" title="ApacheCon EU 2006" alt="ApacheCon EU 2006 - logo" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" style="width: 150px;height: 50px;"></a>
+</div>
</div>
<!--+
|end Menu
@@ -688,6 +693,12 @@
<ul>
<li>
+<a href="guidelines.html">Project guidelines</a> _________________________ <em>guidelines</em>
+</li>
+</ul>
+
+<ul>
+<li>
<a href="history.html">History</a> _________________________ <em>history</em>
</li>
</ul>
@@ -1783,7 +1794,7 @@
<ul>
<li>
-<a href="community/acknowledgements.html">Credits</a> _________________________ <em>node-h</em>
+<a href="community/acknowledgements.html">Credits</a> _________________________ <em>credits</em>
</li>
</ul>
Modified: lenya/site/linkmap.pdf
URL: http://svn.apache.org/viewvc/lenya/site/linkmap.pdf?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/site/roadmap.pdf
URL: http://svn.apache.org/viewvc/lenya/site/roadmap.pdf?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/site/skin/CommonMessages_de.xml
URL: http://svn.apache.org/viewvc/lenya/site/skin/CommonMessages_de.xml?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/CommonMessages_de.xml (original)
+++ lenya/site/skin/CommonMessages_de.xml Mon Jul 17 15:22:32 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
- license agreements. See the NOTICE file distributed with
+ contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
Modified: lenya/site/skin/CommonMessages_en_US.xml
URL: http://svn.apache.org/viewvc/lenya/site/skin/CommonMessages_en_US.xml?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/CommonMessages_en_US.xml (original)
+++ lenya/site/skin/CommonMessages_en_US.xml Mon Jul 17 15:22:32 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
- license agreements. See the NOTICE file distributed with
+ contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
Modified: lenya/site/skin/CommonMessages_es.xml
URL: http://svn.apache.org/viewvc/lenya/site/skin/CommonMessages_es.xml?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/CommonMessages_es.xml (original)
+++ lenya/site/skin/CommonMessages_es.xml Mon Jul 17 15:22:32 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
- license agreements. See the NOTICE file distributed with
+ contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
Modified: lenya/site/skin/CommonMessages_fr.xml
URL: http://svn.apache.org/viewvc/lenya/site/skin/CommonMessages_fr.xml?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/CommonMessages_fr.xml (original)
+++ lenya/site/skin/CommonMessages_fr.xml Mon Jul 17 15:22:32 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
- license agreements. See the NOTICE file distributed with
+ contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
Modified: lenya/site/skin/basic.css
URL: http://svn.apache.org/viewvc/lenya/site/skin/basic.css?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/basic.css (original)
+++ lenya/site/skin/basic.css Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/breadcrumbs-optimized.js
URL: http://svn.apache.org/viewvc/lenya/site/skin/breadcrumbs-optimized.js?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/breadcrumbs-optimized.js (original)
+++ lenya/site/skin/breadcrumbs-optimized.js Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/breadcrumbs.js
URL: http://svn.apache.org/viewvc/lenya/site/skin/breadcrumbs.js?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/breadcrumbs.js (original)
+++ lenya/site/skin/breadcrumbs.js Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/fontsize.js
URL: http://svn.apache.org/viewvc/lenya/site/skin/fontsize.js?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/fontsize.js (original)
+++ lenya/site/skin/fontsize.js Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/getBlank.js
URL: http://svn.apache.org/viewvc/lenya/site/skin/getBlank.js?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/getBlank.js (original)
+++ lenya/site/skin/getBlank.js Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/getMenu.js
URL: http://svn.apache.org/viewvc/lenya/site/skin/getMenu.js?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/getMenu.js (original)
+++ lenya/site/skin/getMenu.js Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/menu.js
URL: http://svn.apache.org/viewvc/lenya/site/skin/menu.js?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/menu.js (original)
+++ lenya/site/skin/menu.js Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/print.css
URL: http://svn.apache.org/viewvc/lenya/site/skin/print.css?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/print.css (original)
+++ lenya/site/skin/print.css Mon Jul 17 15:22:32 2006
@@ -1,11 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
-* license agreements. See the NOTICE file distributed with
+* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: lenya/site/skin/screen.css
URL: http://svn.apache.org/viewvc/lenya/site/skin/screen.css?rev=422897&r1=422896&r2=422897&view=diff
==============================================================================
--- lenya/site/skin/screen.css (original)
+++ lenya/site/skin/screen.css Mon Jul 17 15:22:32 2006
@@ -1,10 +1,10 @@
/*
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
-* as applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -17,7 +17,7 @@
body { margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif; }
h1 { font-size : 160%; margin: 0px 0px 0px 0px; padding: 0px; }
-h2 { font-size : 140%; margin: 0.9em 0px 0px 0px; padding: 0px; font-weight : bold;}
+h2 { font-size : 140%; margin: 1em 0px 0.8em 0px; padding: 0px; font-weight : bold;}
h3 { font-size : 130%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
.h3 { margin: 22px 0px 3px 0px; }
h4 { font-size : 120%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
@@ -152,6 +152,12 @@
width: .1em; /* IE/Win fix */
}
+#tabs li a:hover {
+
+ cursor: pointer;
+ text-decoration:underline;
+}
+
#tabs > li a { width: auto; } /* Rest of IE/Win fix */
/* Commented Backslash Hack hides rule from IE5-Mac \*/
@@ -188,6 +194,27 @@
margin: 0;
float:left;
position:relative;
+
+}
+
+
+
+#level2tabs a:hover {
+
+ cursor: pointer;
+ text-decoration:underline;
+
+}
+
+#level2tabs a{
+
+ cursor: pointer;
+ text-decoration:none;
+ background-image: url('images/chapter.gif');
+ background-repeat: no-repeat;
+ background-position: center left;
+ padding-left: 6px;
+ margin-left: 6px;
}
/*
@@ -252,10 +279,10 @@
/**
* Side menu
*/
-#menu a { font-weight: normal;}
+#menu a { font-weight: normal; text-decoration: none;}
#menu a:visited { font-weight: normal; }
#menu a:active { font-weight: normal; }
-#menu a:hover { font-weight: normal; }
+#menu a:hover { font-weight: normal; text-decoration:underline;}
#menuarea { width:10em;}
#menu {
@@ -268,6 +295,7 @@
z-index: 20;
background-color: #f90;
font-size : 70%;
+
}
.menutitle {
@@ -278,20 +306,26 @@
background-repeat: no-repeat;
background-position: center left;
font-weight : bold;
+
+
}
+.menutitle:hover{text-decoration:underline;cursor: pointer;}
+
#menu .menuitemgroup {
margin: 0px 0px 6px 8px;
padding: 0px;
font-weight : bold; }
#menu .selectedmenuitemgroup{
- margin: 0px 0px 6px 8px;
+ margin: 0px 0px 0px 8px;
padding: 0px;
- font-weight : bold; }
+ font-weight : normal;
+
+ }
#menu .menuitem {
- padding: 0px 0px 2px 12px;
+ padding: 2px 0px 1px 13px;
background-image: url('images/page.gif');
background-repeat: no-repeat;
background-position: center left;
@@ -300,19 +334,20 @@
}
#menu .menupage {
- margin: 5px 0px 5px 10px;
+ margin: 2px 0px 1px 10px;
padding: 0px 3px 0px 12px;
- background-image: url('images/current.gif');
+ background-image: url('images/page.gif');
background-repeat: no-repeat;
- background-position: top left;
+ background-position: center left;
font-style : normal;
}
#menu .menupagetitle {
- padding: 0px 0px 0px 6px;
+ padding: 0px 0px 0px 1px;
font-style : normal;
border-style: solid;
border-width: 1px;
margin-right: 10px;
+
}
#menu .menupageitemgroup {
padding: 3px 0px 4px 6px;
@@ -436,10 +471,11 @@
#minitoc-area {
border-top: solid 1px #4C6C8F;
border-bottom: solid 1px #4C6C8F;
- margin-bottom: 15px;
+ margin: 15px 10% 5px 15px;
+ /* margin-bottom: 15px;
margin-left: 15px;
- margin-right: 10%;
- padding-bottom: 5px;
+ margin-right: 10%;*/
+ padding-bottom: 7px;
padding-top: 5px;
}
.minitoc {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org