You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2006/05/25 03:53:01 UTC
svn commit: r409283 [14/15] - in /forrest/site: ./ docs_0_60/
docs_0_60/howto/ docs_0_60/howto/bugzilla-patch/ docs_0_60/howto/multi/
docs_0_70/ docs_0_70/howto/ docs_0_70/howto/cvs-ssh/ docs_0_70/howto/multi/
docs_0_80/ docs_0_80/howto/ docs_0_80/howt...
Added: forrest/site/procedures/release/How_to_release.html
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/How_to_release.html?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/How_to_release.html (added)
+++ forrest/site/procedures/release/How_to_release.html Wed May 24 18:52:47 2006
@@ -0,0 +1,1381 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="Apache Forrest" name="Generator">
+<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-skin-name" content="pelt">
+<title>How to Release Forrest</title>
+<link type="text/css" href="../../skin/basic.css" rel="stylesheet">
+<link media="screen" type="text/css" href="../../skin/screen.css" rel="stylesheet">
+<link media="print" type="text/css" href="../../skin/print.css" rel="stylesheet">
+<link type="text/css" href="../../skin/profile.css" rel="stylesheet">
+<script src="../../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../../skin/fontsize.js" language="javascript" type="text/javascript"></script>
+<link rel="shortcut icon" href="../../favicon.ico">
+</head>
+<body onload="init()">
+<script type="text/javascript">ndeSetTextSize();</script>
+<div id="top">
+<!--+
+ |breadtrail
+ +-->
+<div class="breadtrail">
+<a href="http://www.apache.org/">apache</a> > <a href="http://forrest.apache.org/">forrest</a><script src="../../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+</div>
+<!--+
+ |header
+ +-->
+<div class="header">
+<!--+
+ |start group logo
+ +-->
+<div class="grouplogo">
+<a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../../images/apache-forrest.png" title="The Apache Software Foundation"></a>
+</div>
+<!--+
+ |end group logo
+ +-->
+<!--+
+ |start Project Logo
+ +-->
+<div class="projectlogo">
+<a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../../images/project-logo.gif" title="Apache Forrest"></a>
+</div>
+<!--+
+ |end Project Logo
+ +-->
+<!--+
+ |start Search
+ +-->
+<div class="searchbox">
+<form action="http://www.google.com/search" method="get" class="roundtopsmall">
+<input value="forrest.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">
+ <input name="Search" value="Search" type="submit">
+</form>
+</div>
+<!--+
+ |end search
+ +-->
+<!--+
+ |start Tabs
+ +-->
+<ul id="tabs">
+<li>
+<a class="base-not-selected" href="../../index.html">Welcome</a>
+</li>
+<li class="current">
+<a class="base-selected" href="../../contrib.html">Project</a>
+</li>
+<li>
+<a class="base-not-selected" href="../../versions/index.html">Versioned Docs</a>
+</li>
+<li>
+<a class="base-not-selected" href="../../pluginDocs/index.html">Plugins</a>
+</li>
+<li>
+<a class="base-not-selected" href="../../tools/index.html">Tools</a>
+</li>
+</ul>
+<!--+
+ |end Tabs
+ +-->
+</div>
+</div>
+<div id="main">
+<div id="publishedStrip">
+<!--+
+ |start Subtabs
+ +-->
+<div id="level2tabs"></div>
+<!--+
+ |end Endtabs
+ +-->
+<script type="text/javascript"><!--
+document.write("Last Published: " + document.lastModified);
+// --></script>
+</div>
+<!--+
+ |breadtrail
+ +-->
+<div class="breadtrail">
+
+
+ </div>
+<!--+
+ |start Menu, mainarea
+ +-->
+<!--+
+ |start Menu
+ +-->
+<div id="menu">
+<div onclick="SwitchMenu('menu_1.1', '../../skin/')" id="menu_1.1Title" class="menutitle">Getting Involved</div>
+<div id="menu_1.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../contrib.html">Contributing</a>
+</div>
+<div class="menuitem">
+<a href="../../mail-lists.html">Mail lists</a>
+</div>
+<div class="menuitem">
+<a href="../../guidelines.html">Project guidelines</a>
+</div>
+<div class="menuitem">
+<a href="../../committed.html">Being committed</a>
+</div>
+<div class="menuitem">
+<a href="../../roles.html" title="Tasks to keep the project flowing">Project roles</a>
+</div>
+<div class="menuitem">
+<a href="../../forrest-friday.html" title="ForrestFriday monthly get-together">ForrestFriday</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.2', '../../skin/')" id="menu_1.2Title" class="menutitle">Resources and Infrastructure</div>
+<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../todo.html">Todo</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/">Browse SVN</a>
+</div>
+<div class="menuitem">
+<a href="http://issues.apache.org/jira/browse/FOR" title="Direct access to our issue-tracker in Jira">Issue Management</a>
+</div>
+<div class="menuitem">
+<a href="../../mail-lists.html">Mail lists</a>
+</div>
+<div onclick="SwitchMenu('menu_1.2.5', '../../skin/')" id="menu_1.2.5Title" class="menutitle">Planning notes</div>
+<div id="menu_1.2.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../plan/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../../plan/internal-xhtml.html">Internal XHTML</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="http://forrest.zones.apache.org" title="Access to forrest.zones.apache.org">Zone notes Testbed</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_selected_1.3', '../../skin/')" id="menu_selected_1.3Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Procedures & Best Practice</div>
+<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display: block;">
+<div class="menuitem">
+<a href="../../howto-dev.html" title="Describes tips and procedures for efficiently developing with Forrest.">Development guidelines</a>
+</div>
+<div class="menuitem">
+<a href="../../issues.html">Reporting Bugs and Issues</a>
+</div>
+<div class="menuitem">
+<a href="../../subversion_bestpractices.html">Subversion Best Practices</a>
+</div>
+<div class="menuitem">
+<a href="../../documentation_bestpractices.html" title="What to do or not to do when writing and integration documentation for Forrest.">Documentation Best Practices</a>
+</div>
+<div class="menuitem">
+<a href="../../howto-howto.html" title="Instructions for writing a new howto-document">Write a How-to</a>
+</div>
+<div class="menuitem">
+<a href="../../gump.html">Gump Integration</a>
+</div>
+<div class="menuitem">
+<a href="../../zone.html" title="Notes for committers to manage forrest.zones.apache.org">Zone notes Testbed-Management</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">How to release</div>
+</div>
+<div class="menuitem">
+<a href="../../procedures/How_to_publish_docs.html" title="Instructions on publishing the Forrest Website">Publishing Forrest Documentation</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.4', '../../skin/')" id="menu_1.4Title" class="menutitle">Proposals</div>
+<div id="menu_1.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../../proposal-asf-forrestbot.html">ASF Forrestbot</a>
+</div>
+</div>
+<div id="credit"></div>
+<div id="roundbottom">
+<img style="display: none" class="corner" height="15" width="15" alt="" src="../../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
+<!--+
+ |alternative credits
+ +-->
+<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
+ +-->
+<!--+
+ |start content
+ +-->
+<div id="content">
+<div title="Portable Document Format" class="pdflink">
+<a class="dida" href="How_to_release.pdf"><img alt="PDF -icon" src="../../skin/images/pdfdoc.gif" class="skin"><br>
+ PDF</a>
+</div>
+<div class="trail">Font size:
+ <input value="Reset" class="resetfont" title="Reset text" onclick="ndeSetTextSize('reset'); return false;" type="button">
+ <input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
+ <input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
+</div>
+<h1>How to Release Forrest</h1>
+<div class="abstract">This documents the steps that the Release Manager (RM) should follow when doing a Forrest
+ release.</div>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#About">About this Document</a>
+</li>
+<li>
+<a href="#PrepProject">Preparing the Project for the release</a>
+</li>
+<li>
+<a href="#PrepTeam">Preparations for the Release Team</a>
+</li>
+<li>
+<a href="#PrepRelPlan">Prepare the Release Plan</a>
+</li>
+<li>
+<a href="#PrepCodeBase">Preparing the Code Base</a>
+</li>
+<li>
+<a href="#PrepNewBranch">Prepare Release Branch</a>
+</li>
+<li>
+<a href="#adjustDocs">Prepare Docs for next release cycle</a>
+</li>
+<li>
+<a href="#BuildDist">Building the distribution</a>
+</li>
+<li>
+<a href="#Testing+the+release+candidate">Testing the release candidate</a>
+</li>
+<li>
+<a href="#FinalRel">Finalizing the Release</a>
+</li>
+<li>
+<a href="#UploadAndAnnounce">Upload and announcement</a>
+</li>
+<li>
+<a href="#cleanup">Cleanup</a>
+</li>
+<li>
+<a href="#conclusion">Conclusion</a>
+</li>
+</ul>
+</div>
+
+
+<a name="N10010"></a><a name="About"></a>
+<h2 class="underlined_10">About this Document</h2>
+<div class="section">
+<div class="warning">
+<div class="label">Warning</div>
+<div class="content">
+This document is still being developed from etc/RELEASE_PROCESS.txt and
+some steps will need to be re-arranged.
+</div>
+</div>
+<p>This documents the steps that the Release Manager (RM) should follow when doing a Forrest release. Note
+ that it might have mistakes - we seem to discover something new each time and some steps might need to
+ happen in a different order. Fine tune these notes for next time. Do some practice runs.</p>
+<p>There are some steps that other committers, and even developers, can assist with, especially in the areas
+ of getting ready for the release and the final testing. Many of the steps can be done only by the
+ Release Manager.</p>
+<p>It is not the Release Manager's job to fix bugs nor address blocker issues. The RM job begins when the
+ project is ready to do the release.</p>
+</div>
+
+
+<a name="N10023"></a><a name="PrepProject"></a>
+<h2 class="underlined_10">Preparing the Project for the release</h2>
+<div class="section">
+<ol>
+
+<li>
+
+<p>The Release Manager (RM) starts the process to finalise the outstanding blocker issues. </p>
+
+<p>Check and make sure the following preconditions are met:</p>
+
+<ul>
+
+<li>
+
+<p>Has the project prepared or updated the Roadmap to schedule the realistic Issues?</p>
+
+</li>
+
+<li>
+
+<p>Has the project made good progress towards fixing the Blockers and applying the
+ outstanding patches?</p>
+
+</li>
+
+</ul>
+
+<p>If not, then the project is not yet ready for release. Remember that it
+ is not the RM's job to do this.</p>
+
+<p>If so, then send an email to get the project to decide what to do with the remaining issues. Propose to
+ delay some issues to a future release, encourage people to fix others. See <a href="http://issues.apache.org/jira/browse/FOR-853">FOR-853</a>. Look at <a href="http://www.mail-archive.com/dev@forrest.apache.org/msg02310.html">msg02310.html</a>
+ for an example of such a message.</p>
+
+
+</li>
+
+<li>
+
+<p>Start discussion on Java-Version to use for compiling and testing the release.</p>
+
+</li>
+
+</ol>
+</div>
+
+
+<a name="N10059"></a><a name="PrepTeam"></a>
+<h2 class="underlined_10">Preparations for the Release Team</h2>
+<div class="section">
+<p>Particularly the Release Manager, but also anyone assisting, needs to be familiar
+ with standard procedures and Apache terminology. This is crucial for a successful release.</p>
+<ol>
+
+<li>
+
+<p>If you have never done a release before or need to refresh your memory, read all about Apache
+ Releases in general at <a href="http://www.apache.org/dev/#releases">http://www.apache.org/dev/#releases</a>. Make sure any assistants have read and understood
+ this as well.</p>
+
+</li>
+
+<li>
+
+<p>Make sure every team member is familiar with the process of signing releases and generating MD5
+ and PGP. You'll find some more info at <a href="http://www.apache.org/dev/release-signing.html">Signing Releases></a> and <a href="http://forrest.apache.org/mirrors.cgi#verify">http://forrest.apache.org/mirrors.cgi#verify</a>
+
+</p>
+
+</li>
+
+<li>
+
+<p>Ensure that as many PMC members as possible have their PGP keys in the KEYS file in Forrest's
+ root directory. Instructions on how to add keys are included in that file. Instructions on how to
+ create and manage pgp-keys can be found at the abovementioned references.</p>
+
+</li>
+
+<li>
+
+<p>Make sure every team member has downloaded and installed the Java-Version to use for compiling
+ the release. Downloading and installing that version should be done well ahead of time to avoid
+ delays.</p>
+
+</li>
+
+
+</ol>
+</div>
+
+
+<a name="N1008A"></a><a name="PrepRelPlan"></a>
+<h2 class="underlined_10">Prepare the Release Plan</h2>
+<div class="section">
+<p>Prepare the Release Plan to define the corner stones of the coming release</p>
+<ol>
+
+<li>Java-Version to test this release</li>
+
+<li>Start of code-freeze</li>
+
+<li>Start of test-period</li>
+
+<li>Vote on release candidate</li>
+
+<li>Optional creation of release candidate #2 (when there are bugs)</li>
+
+<li>Start of test-period #2</li>
+
+<li>Vote on release candidate #2</li>
+
+<li>Scheduled release Date</li>
+
+</ol>
+<p>Use the email template <a href="propose_release_plan.txt">propose_release_plan.txt</a> to write and
+ propose your plan, then call for a quick vote on the release plan on the dev list.</p>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">There are various reasons for voting on the Release Plan, e.g. makes people aware that a code-freeze
+ is about to happen; encourage them to get involved with the release; ensure that the date is suitable
+ and people will be around to test and then vote on the actual release. See a good discussion <a href="http://marc.theaimsgroup.com/?t=114296877800003">in the archives</a>
+
+</div>
+</div>
+</div>
+
+
+<a name="N100BD"></a><a name="PrepCodeBase"></a>
+<h2 class="underlined_10">Preparing the Code Base</h2>
+<div class="section">
+<ol>
+
+<li>
+
+<p>Ensure that there are no copyright issues. The committers and PMC would have been continually
+ monitoring this. There are some tools to assist with scanning for issues, e.g. <span class="codefrag">svn:committers/relicense/src/perl/relicense.txt</span> and <a href="svn:committers/tools/">svn:committers/tools/</a>
+
+</p>
+
+</li>
+
+<li>
+
+<p>Ensure that the line-endings and svn:eol-style property are correct for all files. See <a href="svn:committers/tools/">svn:committers/tools/</a>
+</p>
+
+</li>
+
+<li>
+
+<p>Ensure that documentation is ready.</p>
+
+</li>
+
+<li>
+
+<p>Ensure that all relevant plugins have been deployed to plugins/0.8-dev/ See other notes at
+ plugins/RELEASE_PROCESS.txt</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">Check and integrate plugins/RELEASE_PROCESS.txt as a new document.</div>
+</div>
+
+</li>
+
+</ol>
+</div>
+
+
+<a name="N100ED"></a><a name="PrepNewBranch"></a>
+<h2 class="underlined_10">Prepare Release Branch</h2>
+<div class="section">
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">We need to discuss order from here on. My idea is to adjust docs before we enter code
+ freeze to save time later. But if the rc fails and release is postponed might need to roll back changes
+ easily and - if possible - roll them forward later. So creating an svn branch for the rc seems to make
+ sense to me. Also: For more than one person working on building the release for different OS it would
+ also be good to have all the changes in svn committed already rather than doing it later. Probably
+ easiest would be to create an rc branch here and co that. I'd sacrifice the alternative approach for
+ that which is far too risky for my liking anyway. wdyt?</div>
+</div>
+<p>In this step you check out a fresh copy from SVN to make sure you have no local modifications, especially
+ those that might be hidden by svn:ignore settings. It will soon become the release branch.</p>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">This step is actually just preparation to keep code-freeze period as short as possible.</div>
+</div>
+<div class="fixme">
+<div class="label">Fixme (dc)</div>
+<div class="content"> What does that mean?</div>
+</div>
+<ol>
+
+<li>
+
+<p>Create a new empty directory 'Forrest_Release' on your system and make it the current
+ directory.</p>
+
+</li>
+
+<li>
+
+<p>Start <span class="codefrag">svn co https://svn.apache.org/repos/asf/forrest/trunk</span> from the command-line of
+ your system or the equivalent for the svn-tool you use.</p>
+
+</li>
+
+</ol>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">This will take quite a while if you are on a dial-up connection. See alternatives below.</div>
+</div>
+<p>Alternative Approach</p>
+<ol>
+
+<li> Do 'svn update -r HEAD' to ensure that you are up-to-date. </li>
+
+<li> Run 'svn status --no-ignore' </li>
+
+<li>
+
+<p>Delete any extra files you might have added/changed in your local copy. <strong>They must not be
+ packed with the release.</strong> It must be a pristine copy of the current trunk.</p>
+
+</li>
+
+</ol>
+<div class="warning">
+<div class="label">Warning</div>
+<div class="content">This approach requires a good understanding of svn and how it works. It is not as automatic and
+ safe as the method above.</div>
+</div>
+</div>
+
+
+<a name="N1012F"></a><a name="adjustDocs"></a>
+<h2 class="underlined_10">Prepare Docs for next release cycle</h2>
+<div class="section">
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">I'd suggest the following steps to keep build size small and simplify procedure:</div>
+</div>
+<ol>
+
+<li>
+
+<p>Edit version subtabs in site.xml as follows:</p>
+
+
+<ol>
+
+<li>
+
+<p>Move all version numbers one line down so that </p>
+
+<pre class="code">
+
+ <versions tab="docs">
+ <overview label="Overview" href="versions/index.html"/>
+ <v0.8 label="0.8-dev" href="site:v0.80//index"/>
+ <v0.7 label="0.7 (current)" href="site:v0.70//index"/>
+ <v0.6 label="0.6" href="site:v0.60//index"/>
+ </versions>
+
+ </pre>
+
+<p>becomes</p>
+
+<pre class="code">
+
+ <versions tab="docs">
+ <overview label="Overview" href="versions/index.html"/>
+ <v0.9 label="0.9-dev" href="site:v0.90//index"/>
+ <v0.8 label="0.8 (current)" href="site:v0.80//index"/>
+ <v0.7 label="0.7" href="site:v0.70//index"/>
+ </versions>
+ </pre>
+
+</li>
+
+</ol>
+
+</li>
+
+<li>
+
+<p>Remove past versions (0.6) docs-directory from svn branch.</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">find and list svn-command</div>
+</div>
+
+
+</li>
+
+<li>
+
+<p>Adjust version-numbers in site.xml.</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">This used to be 'Do global replace throughout docs_0_80 to replace the string
+ ="site:v0.70 with ="site:v0.80' but this needs checking.</div>
+</div>
+
+
+</li>
+
+
+
+
+
+<li>
+
+<p>Edit site-author/status.xml:</p>
+
+<ol>
+
+<li>
+
+<p>Remove the -dev from the current <release> tag, and set the release
+ date.</p>
+
+</li>
+
+<li>
+
+<p>Add a new <release> for development on the next version e.g. from:
+ <release version="0.7-dev" date="not yet
+ released"> ... to: <release version="0.8-dev"
+ date="not yet released"> </release>
+ <release version="0.7"
+ date="2002-02-13"> ...</p>
+
+</li>
+
+</ol>
+
+
+
+</li>
+
+<li>
+
+<p>Edit the forrest/site-author/content/xdocs/mirrors.html and adjust all version-specific content.</p>
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">FIXME: There is a bug (FOR-300) in the forrest build which generates to
+ main/site/mirrors.html instead of build/site/mirrors.html</div>
+</div>
+
+</li>
+
+<li>
+
+<p>Edit the Forrest home page in the "News and events" section and add a text like:</p>
+
+<pre class="code"> Apache Forrest 0.xx was released on [Date]. [Important new features] </pre>
+
+</li>
+
+<li>
+
+<p> Rename the deployed plugins directory by issuing the following commands at the command line </p>
+
+<pre class="code">cd /svn/asf/forrest-site
+svn update
+svn mv plugins/0.8-dev plugins/0.8
+svn mkdir plugins/0.9-dev
+svn status
+svn commit</pre>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">Issue them where and to what end?</div>
+</div>
+
+</li>
+
+
+
+</ol>
+</div>
+
+
+<a name="N101A2"></a><a name="BuildDist"></a>
+<h2 class="underlined_10">Building the distribution</h2>
+<div class="section">
+<p>In this phase you build the release candidate to be tested.</p>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">You can practice the following steps (as far as creating the branch) without committing anything even
+ before code-freeze. This ensures a good release candidate.</div>
+</div>
+<ol>
+
+<li>Use template <a href="anounce_code_freeze.txt">anounce_code_freeze.txt</a> to send email
+ to dev-list that the code-freeze has now commenced.</li>
+
+<li>
+
+<p>Update your release checkout (svn up) to include last minute changes.</p>
+
+</li>
+
+<li>
+
+<p>Run the following quick tests from the command line of your system to ensure that all is well:</p>
+
+<ul>
+
+<li>
+
+<p>Change to the main directory and run <span class="codefrag">build test</span>. The build should conclude
+ without errors.</p>
+
+</li>
+
+<li>
+
+<p>Change to the site-author-directory and run 'forrest'. The docs should build without
+ errors.</p>
+
+</li>
+
+
+</ul>
+
+<p>If there are any problems, focus on problems that prevent building and invite other commiters to
+ help you solve the problems.</p>
+
+<div class="note">
+<div class="label">Note</div>
+<div class="content">It is not your job to fix bugs and code freeze should not commence with a broken trunk.</div>
+</div>
+
+<p>If there are bugs that cannot be easily fixed, then call a halt to the release process and start
+ a discussion on rescheduling options on the dev-list with the template <a href="rc_did_not_build_what_now.txt">rc_did_not_build_what_now.txt</a>
+</p>
+
+
+</li>
+
+<li>
+
+<p>Remove the build directories from core and plugins. Do <span class="codefrag">svn st --no-ignore</span> in the
+ root directory of your release candidate directory to be sure that all files created by the test
+ build have been removed and no other files have been changed. The status command should report
+ no changes.</p>
+
+</li>
+
+
+<li>
+
+<p>Update the version numbers at various places:</p>
+
+<ul>
+
+<li>
+
+<p>Edit main/build.xml and replace the '-dev' text with '' i.e. nothing: around line 45:
+ <property name="forrest.version"
+ value="0.7-dev"/> to: <property
+ name="forrest.version" value="0.7"/> </p>
+
+</li>
+
+
+<li>
+
+<p>Edit main/forrest.build.xml to update the version tag to remove "-dev". There are two
+ occurences: around line 32: <property name="forrest.version"
+ value="0.7-dev"/> ^^^^ around line 60:
+ <description> | Forrest Site Builder | | 0.7-dev | ^^^^</p>
+
+</li>
+
+<li>
+
+<p>Edit plugins/build.xml and increase the docs version number to the next major release:
+ around line 23: <property name="forrest.version"
+ value="0.7"/> to: <property
+ name="forrest.version" value="0.8"/> </p>
+
+<div class="note">
+<div class="label">Note</div>
+<div class="content">This is deliberately a major version up. It is assumed that plugins will be developed
+ against the next version of Forrest. Individual plugins can override this property in
+ their own build files.</div>
+</div>
+
+</li>
+
+</ul>
+
+
+</li>
+
+<li>
+
+<p>Ensure that each plugin that uses the locationmap has its "release version" set to 0.8 or
+ more.</p>
+
+</li>
+
+<li>
+
+<p>Edit 4 files in tools/forrestbar to update the version number to match the new release: -
+ install.rdf, line 24: <em:version>0.7</em:version> - install.js,
+ line 19: var err = initInstall("ForrestBar", "forrestbar", "0.7"); -
+ xpi/chrome/content/contents.rdf, line 27: chrome:displayName="ForrestBar 0.7"/> -
+ xpi/chrome/content/forrestbarOverlay.xul, about line 40 edit the version number as well as
+ change the link to point to the new release's docs: <menuitem label="Current
+ Docs (0.7)"
+ onclick="navigate('http://forrest.apache.org/docs_0_70/index.html');"
+ /> </p>
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">There are probably other areas which have version numbers. How can we improve this?</div>
+</div>
+
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">Not sure at what stage we get rid of the old docs, e.g. 0.6</div>
+</div>
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">Not sure at what stage need to edit site-author/content/xdocs/mirrors.html (Presume
+ that it should be done after packing release. See below.)</div>
+</div>
+
+
+</li>
+
+<li>
+
+<p>Create a new file, etc/RELEASE-NOTES-x.y.txt, where x.y is the version currently being released.
+ It is best to copy an earlier RELEASE-NOTES file, to keep a common layout. In this file, provide
+ a summary of changes, and check for general accuracy. Scan the status.xml/changes and the
+ Roadmap via the issues tracker, to find the important issues. </p>
+
+</li>
+
+<li>
+
+<p>Set your Java version to be the lowest specified of our supported versions.</p>
+
+<div class="note">
+<div class="label">Note</div>
+<div class="content"> Set the environment variable JAVA_HOME to the path of the Java version. Note for Windows: If
+ you change the setting in system properties, you need to logout and login again for the changes
+ to become effective.</div>
+</div>
+
+</li>
+
+<li>
+
+<p>Take note of the SVN revision number of your trunk by running <span class="codefrag">svn info</span> from the
+ command line in the Release Candidates root dir and look at the "Last Changed Rev: ######".</p>
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">What is this used for?</div>
+</div>
+
+</li>
+
+<li>
+
+<p>Now we will build the release candidates for Windows and Unix.</p>
+
+<div class="note">
+<div class="label">Note</div>
+<div class="content">The reason for creating two separate archives is the line-endings dilemma between Windows and
+ UNIX. SVN ensures correct line-endings on each operating system (as long as committers have been
+ diligent when adding/updating the repository).</div>
+</div>
+
+<ul>
+
+<li>
+
+<p>On a UNIX machine:<br> Change to directory main and run <span class="codefrag">build release-dist</span>
+ to generate the distributions on a UNIX machine.</p>
+
+<p> Two archives are created: apache-forrest-X.Y.tar.gz apache-forrest-X.Y.zip. Ignore the
+ *.zip archive.</p>
+
+<p>Unpack and test the relevant archive in a fresh new directory.</p>
+
+</li>
+
+<li>
+
+<p>On a Windows machine:<br> Change to directory main and run <span class="codefrag">build
+ release-dist</span> to generate the distributions on a UNIX machine.</p>
+
+<p> Two archives are created: apache-forrest-X.Y.tar.gz apache-forrest-X.Y.zip. Ignore the
+ *.tar.gz archive.</p>
+
+<p>Unpack and test the relevant archive in a fresh new directory.</p>
+
+</li>
+
+
+</ul>
+
+</li>
+
+<li>
+
+<a name="signing"></a>
+<p id="signing">Sign the Release Candidates distribution file and the *.asc and *.md5 files.</p>
+
+<p>Here is one example when using <a href="http://www.gnupg.org/(en)/download/index.html">gpg</a>
+ and openssl from the command line. </p>
+
+<div class="note">
+<div class="label">Note</div>
+<div class="content">An windows version for openssl can be found at <a href="http://www.slproweb.com/products/Win32OpenSSL.html">http://www.slproweb.com/products/Win32OpenSSL.html</a>
+</div>
+</div>
+
+<pre class="code">
+ gpg --recv-key <myKey>
+ gpg --output crossley-apache-forrest-0.7-RC1.tar.gz.asc \
+ --detach-sig --armor apache-forrest-0.7-RC1.tar.gz
+ gpg --verify crossley-apache-forrest-0.7.tar.gz.asc \
+ apache-forrest-0.7-RC1.tar.gz</pre>
+
+<p> ... should say "Good signature from ..."</p>
+
+
+<pre class="code">
+ openssl dgst -md5 -out apache-forrest-0.7.tar.gz.md5 \
+ apache-forrest-0.7-RC1.tar.gz
+ md5sum apache-forrest-0.7-RC1.tar.gz
+ </pre>
+
+<p>... output should match that of the md5 file.</p>
+
+</li>
+
+<li>
+
+<p>Create a maintenance branch in SVN</p>
+
+<ol>
+
+<li>
+
+<p>Open the command line</p>
+
+</li>
+
+<li>
+
+<p>Change to the root directory of the release candidate</p>
+
+</li>
+
+<li>
+
+<p>run <span class="codefrag">svn copy -m "Create the x.y release branch from r#####" \
+ https://svn.apache.org/repos/asf/forrest/trunk \
+ https://svn.apache.org/repos/asf/forrest/branches/forrest_xy_branch </span> where
+ 'xy' is a compact form of the version (e.g. 04, 041, 05) and 'r#####' is the SVN
+ revision number that the branch was created from which was the revision that the release
+ candidates were generated from.</p>
+
+<p> See <a href="http://svn.apache.org/repos/asf/forrest/branches/">http://svn.apache.org/repos/asf/forrest/branches/</a> If someone has done a commit
+ before you get to do it, then specify the revision number with -r </p>
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">What do I see at http://svn.apache.org/repos/asf/forrest/branches/ if s.o.
+ has done a commit? What is this stuff revision numer with -r for?</div>
+</div>
+
+</li>
+
+</ol>
+
+</li>
+
+</ol>
+</div>
+
+
+<a name="N102B7"></a><a name="Testing+the+release+candidate"></a>
+<h2 class="underlined_10">Testing the release candidate</h2>
+<div class="section">
+<p>Test the actual distribution on various platforms.</p>
+<ol>
+
+<li>
+
+<p>Upload the release candidates and signatures to a committer's webspace. Use the .tar.gz from the
+ UNIX machine and .zip from the Windows machine.</p>
+
+</li>
+
+<li>
+
+<p>Use template <a href="test_and_vote_on_rel_cand.txt">test_and_vote_on_rel_cand.txt</a> for an
+ email to the dev-list asking all developers to test and vote.</p>
+
+</li>
+
+<li>
+
+<p>As the votes come in</p>
+
+<ul>
+
+<li>Make sure the distributions unpacks on different systems w/o problems.</li>
+
+<li>Make sure that somebody has followed the actual user instructions in the Forrest
+ distribution at README.txt and index.html</li>
+
+<li>Encourage people to build ome difficult sites.</li>
+
+</ul>
+
+
+</li>
+
+<li>If necessarry start again with <a href="#BuildDist">Building the distribution</a> and build another
+ release candidate.</li>
+
+<li></li>
+
+</ol>
+</div>
+
+
+<a name="N102EF"></a><a name="FinalRel"></a>
+<h2 class="underlined_10">Finalizing the Release</h2>
+<div class="section">
+<p>When a good release candidate has been achieved and affirmed by the vote, we'll finalize the release.</p>
+<ol>
+
+<li>
+
+<p>rename the Release Candidates distribution files apache-forrest-X.Y-RCx.tar.gz and
+ apache-forrest-X.Y-RCx.zip to their final filenames apache-forrest-X.Y.tar.gz and
+ apache-forrest-X.Y.zip</p>
+
+</li>
+
+<li>
+
+<p>Create new .md5 and .asc-files following the procedure in <a href="#signing">outlined
+ above</a>
+</p>
+
+</li>
+
+<li>
+
+<p>If there have been changes to the trunk since the branch was created, then merge trunk to branch.</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">What is the purpose of this step? It doesn't seem to be right because trunk may
+ already contain parts of the next version. What we should do is do all fixing of RC-problems in
+ the rc-branch (same as changing docs) then, on release, merge branch back into trunk to
+ integrate fixes and doc-changes back into trunk. wdyt?</div>
+</div>
+
+</li>
+
+<li>
+
+<p>If everything looks okay tag SVN by running <span class="codefrag">svn copy -m "Create tag forrest_xy from release
+ branch" \ https://svn.apache.org/repos/asf/forrest/branches/forrest_xy_branch \
+ https://svn.apache.org/repos/asf/forrest/tags/forrest_xy</span> from the command line of
+ your system, where 'xy' is a compact (without the dots) form of the version number (e.g. 04,
+ 041, 05).</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">If we change procedure to create an rc-branch this will become a merge changes
+ from trunk then rename rc-branch to final release branch. right?</div>
+</div>
+
+<p>See <a href="http://svn.apache.org/repos/asf/forrest/tags/">http://svn.apache.org/repos/asf/forrest/tags/</a> for more information.</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">What if it doesn't, how do I tell, what do I do?</div>
+</div>
+
+</li>
+
+<li>
+
+<p>Announce the end of the code-freeze by sendung the email-template <a href="announce_end_of_code_freeze.txt">announce_end_of_code_freeze.txt</a>to the dev
+ list.</p>
+
+</li>
+
+</ol>
+</div>
+
+
+<a name="N10337"></a><a name="UploadAndAnnounce"></a>
+<h2 class="underlined_10">Upload and announcement</h2>
+<div class="section">
+<p>In this phase we'll upload the new Release, wait for it to be available on most mirror sites, then
+ announce the new release.</p>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">During this phase there is a lot of waiting. While things are happening you can be doing the <a href="#cleanup">Cleanups</a> described below.</div>
+</div>
+<ol>
+
+<li>
+
+<p>Use scp to upload the release: the *.tar.gz, the *.zip, the *.asc and *.md5 files, and the
+ RELEASE-NOTES-x.y.txt to people.apache.org at /www/www.apache.org/ dist/forrest/</p>
+
+<p>Ensure correct file permissions by executing <span class="codefrag">chgrp forrest *</span> then <span class="codefrag">chmod 664
+ *</span> on the remote system.</p>
+
+<p>Each PMC member has a server account and belongs to the forrest group.</p>
+
+<p>The process is documented at <a href="http://www.apache.org/~bodewig/mirror.html">http://www.apache.org/~bodewig/mirror.html</a> and <a href="http://www.apache.org/dev/#releases">http://www.apache.org/dev/#releases</a>
+</p>
+
+
+<p>Leave the previous dist there as well as the new one, until after the announcement
+ (because mirrors.html cannot be updated until most mirrors have received the release).
+ </p>
+
+
+<div class="note">
+<div class="label">Note</div>
+<div class="content">The other files there (HEAD.html README.html LICENSE.txt KEYS) are all automatically updated
+ from the SVN:forrest/dist/ repository. </div>
+</div>
+
+<div class="fixme">
+<div class="label">Fixme ()</div>
+<div class="content">FIXME: Add notes about the KEYS file in the "forrest-dist" SVN respository.</div>
+</div>
+
+</li>
+
+
+<li>
+
+<p>Wait for the various mirrors to pick up the new files.</p>
+
+<p> For some mirrors, this takes only a few hours. However others are slow. How long to wait is a
+ tradeoff, e.g. 8 hours.</p>
+
+<p> See <a href="http://www.apache.org/mirrors/">Status of mirrors</a>.
+ </p>
+
+<p> Take note of the time that the eu.apache.org mirror is updated, then compare each "mirror age"
+ to that.</p>
+
+<p> When you see that a good proportion of the mirrors have received the release, then update the
+ website, then send the announcement.</p>
+
+</li>
+
+<li>Create a copy of current dev-docs in trunk for the next development phase.
+ Do 'cd site-author/content/xdocs' and 'svn copy docs_0_70 docs_0_80' (Adjust version
+ numbers as needed).</li>
+
+<li>Open site.xml and add a copy of the most current versioned section (e.g. <v0.80>) above it.
+ Increment the first decimal of the sections name to reflect the next planned release (e.g. <v0.90>).
+ </li>
+
+<li>
+
+<p>Update the .htaccess file to redirect /docs/dev/ to the next version,
+ and do other changes noted in the .htaccess file.
+ See site-author/content/.htaccess</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">Need to go through .htaccess and clean up.</div>
+</div>
+
+</li>
+
+
+<li>
+
+<p>Rebuild (Forrest site) and publish the Forrest website as normal. Be sure to use the new version
+ for building the docs. Refer to <a href="../../procedures/How_to_publish_docs.html">Publishing Forrest
+ Documentation</a> for details.</p>
+
+</li>
+
+<li>
+
+<p>Update the xml.apache.org website (Forrest is part of the Apache XML federation of projects).
+ Edit xml-site/src/documentation/content/xdocs/news.xml and record the
+ announcement, and then commit the new HTML to xml-site/targets/forrest
+ Note that they use forrest-0.7 to build their website.
+ See http://xml.apache.org/guidelines.html#website-top</p>
+
+</li>
+
+<li>
+<p>Send <a href="announce_release.txt">announce_release.txt</a>as email to
+ 'dev@forrest.apache.org', 'user@forrest.apache.org', 'announce@apache.org',
+ 'announcements@xml.apache.org'. Sign the email (e.g. PGP).</p>
+
+<p>See previous announcements for examples:</p>
+
+<ul>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=xml-apache-announce&m=103746673310573">0.2</a>
+</li>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=xml-apache-announce&m=104399934113331">0.3 </a>
+</li>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=jakarta-announce&m=104510734501302">0.4</a>
+</li>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=xml-apache-announce&m=106352706005681">0.5</a>
+</li>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=xml-apache-announce&m=106541447606765">0.5.1</a>
+</li>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=xml-apache-announce&m=109784461425740">0.6</a>
+</li>
+
+<li>
+<a href="http://marc.theaimsgroup.com/?l=xml-apache-announce&m=111960678028211">0.7</a>
+</li>
+
+</ul>
+
+</li>
+
+<li>
+<p>Do the Freshmeat announcement:
+ <a href="http://freshmeat.net/projects/forrest/">http://freshmeat.net/projects/forrest/</a>
+</p>
+</li>
+
+</ol>
+</div>
+<!-- FIXME DC: reviewed from here to end. -->
+
+
+<a name="N103E2"></a><a name="cleanup"></a>
+<h2 class="underlined_10">Cleanup</h2>
+<div class="section">
+<ol>
+
+<li>
+<p>Edit main/build.xml, increment the version and add a -dev tag:
+ around line 45:
+ <property name="version" value="0.8-dev"/></p>
+</li>
+
+<li>
+<p>Edit main/forrest.build.xml and update the version:
+ around line 32:</p>
+
+<pre class="code">
+ <property name="version" value="0.8-dev"/>
+
+ around line 52:
+ <description>
+ | Forrest Site Builder |
+ | 0.8-dev |
+ </pre>
+
+</li>
+
+<li>
+<p>Remove old dist files from the /www/www.apache.org/dist/forrest/ directory.
+ They have already been automatically archived at archive.apache.org/dist/forrest/</p>
+</li>
+
+<li>
+<p>Do some Jira administration (need to be in the jira-administrators group)</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">Does it make sense to pass this job to the Jira-role?</div>
+</div>
+
+<ol>
+
+<li>
+<p>Tweak the "release" versions via "admin" interface at our Jira. Do this ...</p>
+</li>
+
+<li>
+<p>Re-name the VersionIds using "Manage Versions" then "Edit details":
+ e.g. 0.7-dev is renamed to 0.7 and 0.8 becomes 0.8-dev</p>
+</li>
+
+<li>
+<p>Mark 0.7 as released using "Manage Versions".</p>
+</li>
+
+<li>
+<p>Review the Issues for the old version and move any Incomplete ones up.</p>
+</li>
+
+<li>
+<p>Change the "fixfor" attribute to the next verion for the
+ "project.issues-rss-url" RSS feed in forrest.properties</p>
+</li>
+
+</ol>
+
+
+</li>
+
+<li>
+<p>Cleanup this RELEASE_PROCESS.txt file to set version number examples
+ to be ready for the next release.</p>
+
+<div class="fixme">
+<div class="label">Fixme (fso)</div>
+<div class="content">I'd like to drop this step and rather word everything more flexibly.</div>
+</div>
+
+</li>
+
+<li>
+<p>Remove the release candidates from your public_html directory.</p>
+</li>
+
+</ol>
+</div>
+
+
+<a name="N1042A"></a><a name="conclusion"></a>
+<h2 class="underlined_10">Conclusion</h2>
+<div class="section">
+<p>All done!</p>
+<p>Or perhaps not.. if you think of anything, please refine these instructions.</p>
+</div>
+
+
+
+</div>
+<!--+
+ |end content
+ +-->
+<div class="clearboth"> </div>
+</div>
+<div id="footer">
+<!--+
+ |start bottomstrip
+ +-->
+<div class="lastmodified">
+<script type="text/javascript"><!--
+document.write("Last Published: " + document.lastModified);
+// --></script>
+</div>
+<div class="copyright">
+ Copyright ©
+ 2002-2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+</div>
+<!--+
+ |end bottomstrip
+ +-->
+</div>
+</body>
+</html>
Propchange: forrest/site/procedures/release/How_to_release.html
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/site/procedures/release/How_to_release.pdf
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/How_to_release.pdf?rev=409283&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/site/procedures/release/How_to_release.pdf
------------------------------------------------------------------------------
svn:mime-type = application/pdf
Added: forrest/site/procedures/release/announce_end_of_code_freeze.txt
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/announce_end_of_code_freeze.txt?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/announce_end_of_code_freeze.txt (added)
+++ forrest/site/procedures/release/announce_end_of_code_freeze.txt Wed May 24 18:52:47 2006
@@ -0,0 +1,9 @@
+
+
+Table Of Contents
+=================
+Subject: [Important] End of code-freeze
+
+The code-freeze has endet.
+
+
Propchange: forrest/site/procedures/release/announce_end_of_code_freeze.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/site/procedures/release/announce_release.txt
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/announce_release.txt?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/announce_release.txt (added)
+++ forrest/site/procedures/release/announce_release.txt Wed May 24 18:52:47 2006
@@ -0,0 +1,13 @@
+
+
+Table Of Contents
+=================
+To: dev@forrest.apache.org,user@forrest.apache.org,announce@apache.org,announcements@xml.apache.org
+Subject: [Announce] Apache Forrest X.Y.Z
+
+ !! Always refer them to the mirror facility
+ !! Never mention the URL www.apache.org/ dist/ in email or web pages.
+ Use the template at etc/announcement.txt
+ Use your spelling checker!
+ Sign the email (e.g. GPG) if possible.
+
Propchange: forrest/site/procedures/release/announce_release.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/site/procedures/release/anounce_code_freeze.txt
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/anounce_code_freeze.txt?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/anounce_code_freeze.txt (added)
+++ forrest/site/procedures/release/anounce_code_freeze.txt Wed May 24 18:52:47 2006
@@ -0,0 +1,40 @@
+
+
+Table Of Contents
+=================
+Subject: [Important] code-freeze commenced
+
+The code-freeze is now happening to allow us to pack the
+release candidates and make them available for testing.
+
+Code-freeze means *no* non-essential commits to the trunk
+or to the new release branch. Other branches are free to
+continue.
+
+There should be no code enhancements or new functionality,
+because that could introduce new bugs.
+
+The main aim is to find and fix important bugs. Any minor
+issues are delayed until after release (add to Jira).
+
+Documentation corrections can happen because they will not
+break anything. As long as we do test the documentation
+building just prior to making the final release candidate.
+
+However, if there are important code changes that are required
+you can make a proposal to allow that commit. The PMC will
+make a quick decision.
+
+Next important milestones are:
+
+* Create release candidate #2 if there have been changes
+ on [date]
+ [www.timeanddate.com-URL]
+
+* Actual release date is [date]
+ [www.timeanddate.com-URL]
+
+Now we will go and build the releases which might take
+some time. The next message will tell you where to get
+the release candidates and describe how to test.
+
Propchange: forrest/site/procedures/release/anounce_code_freeze.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/site/procedures/release/propose_release_plan.txt
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/propose_release_plan.txt?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/propose_release_plan.txt (added)
+++ forrest/site/procedures/release/propose_release_plan.txt Wed May 24 18:52:47 2006
@@ -0,0 +1,48 @@
+
+
+Table Of Contents
+=================
+Subject: [VOTE] Release Plan for Forrest x.xx
+
+We are about to work on releasing a new version of Forrest.
+Below I have proposed the important milestones.
+Please check with your schedules and comment,
+after that we'll vote on this.
+
+Proposed Java version to test this release is [Version].
+
+Proposed milestones are:
+
+- Start of code-freeze on [Date]
+ [www.timeanddate.com-URL]
+
+- Start of test-period [Date]
+ [www.timeanddate.com-URL]
+
+- Vote on release candidate #1 [Date]
+ [www.timeanddate.com-URL]
+
+- Start of test-period [Date]
+ [www.timeanddate.com-URL]
+
+- Vote on release candidate [Date]
+ [www.timeanddate.com-URL]
+
+- If there are bugs in RC1
+
+ = Creation of release candidate #2
+ (only when there are bugs) [Date]
+ [www.timeanddate.com-URL]
+
+ = Start of test-period #2 [Date]
+ [www.timeanddate.com-URL]
+
+ = Vote on release candidate #2 [Date]
+ [www.timeanddate.com-URL]
+
+- Scheduled release Date [Date]
+ [www.timeanddate.com-URL]
+
+For background info on this step and the relaese process in general see
+http://forrest.apache.org/procedures/release/How_to_release.html#PrepRelPlan
+
Propchange: forrest/site/procedures/release/propose_release_plan.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/site/procedures/release/rc_did_not_build_what_now.txt
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/rc_did_not_build_what_now.txt?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/rc_did_not_build_what_now.txt (added)
+++ forrest/site/procedures/release/rc_did_not_build_what_now.txt Wed May 24 18:52:47 2006
@@ -0,0 +1,14 @@
+
+
+Table Of Contents
+=================
+Subject: [Important] Release Candidate did NOT build, what now?
+
+The release candidate/documentation for the new release failed the tests.
+A quick attempt at to solve the problems has failed.
+
+What shall we do now?
+
+If anybody can suggest a solution please do, otherwise we will have to abort
+this release attempt for now and write up a new release plan.
+
Propchange: forrest/site/procedures/release/rc_did_not_build_what_now.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/site/procedures/release/test_and_vote_on_rel_cand.txt
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/test_and_vote_on_rel_cand.txt?rev=409283&view=auto
==============================================================================
--- forrest/site/procedures/release/test_and_vote_on_rel_cand.txt (added)
+++ forrest/site/procedures/release/test_and_vote_on_rel_cand.txt Wed May 24 18:52:47 2006
@@ -0,0 +1,61 @@
+
+
+Table Of Contents
+=================
+Subject: [Important] please test release candidate then vote
+
+We need people to test the release candidate on your projects,
+especially on different operating systems. Just send a short
+reply to this thread that it works for you. See method below.
+
+Download the release candidate and supporting files:
+http://www.apache.org/~[your apache user name]/release-forrest-07/
+
+For Windows get *.zip md5sum ################################
+For UNIX get *.tar.gz md5sum ################################
+Get the *.asc and *.md5 that match your chosen download.
+
+It was packed from SVN revision ####
+Java [JavaVersion] or later is required.
+
+If you want to verify the download, then follow:
+http://forrest.apache.org/mirrors.cgi#verify
+
+Otherwise just get on with testing.
+
+Testing and vote period concludes [Date]
+Anyone can test and vote, not just PMC members.
+However only the PMC votes are binding.
+
+So we have approximately 6 days.
+
+Here are some hints:
+
+ * Ensure that the compressed archive will unpack properly.
+ * Verfiy the release, especially if you are a committer.
+ * Follow the README.txt and index.html
+ * Set environment variables.
+ * Don't worry too much about minor bugs. We are looking
+ for blockers, such as it will not run. Many known issues
+ are recorded at our Jira, perhaps you can add more.
+
+* Make a fresh site ...
+ cd my-new-dir
+ forrest seed
+ forrest run ... use the local jetty server.
+ forrest ... build the whole site from the command-line.
+ forrest war ... use your own full Jetty or Tomcat.
+
+* Try it on the Forrest core docs ...
+ cd site-author
+ forrest run
+
+* Forrest was already pre-built. Try building it again.
+ cd main
+ build clean
+ build
+ build test
+
+* Try it on your own project, especially if you have
+ a project sitemap and use some extra plugins.
+
Propchange: forrest/site/procedures/release/test_and_vote_on_rel_cand.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/site/proposal-asf-forrestbot.html
URL: http://svn.apache.org/viewvc/forrest/site/proposal-asf-forrestbot.html?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
--- forrest/site/proposal-asf-forrestbot.html (original)
+++ forrest/site/proposal-asf-forrestbot.html Wed May 24 18:52:47 2006
@@ -114,50 +114,80 @@
<a href="contrib.html">Contributing</a>
</div>
<div class="menuitem">
+<a href="mail-lists.html">Mail lists</a>
+</div>
+<div class="menuitem">
+<a href="guidelines.html">Project guidelines</a>
+</div>
+<div class="menuitem">
+<a href="committed.html">Being committed</a>
+</div>
+<div class="menuitem">
+<a href="roles.html" title="Tasks to keep the project flowing">Project roles</a>
+</div>
+<div class="menuitem">
+<a href="forrest-friday.html" title="ForrestFriday monthly get-together">ForrestFriday</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Resources and Infrastructure</div>
+<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="todo.html">Todo</a>
+</div>
+<div class="menuitem">
<a href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/">Browse SVN</a>
</div>
<div class="menuitem">
+<a href="http://issues.apache.org/jira/browse/FOR" title="Direct access to our issue-tracker in Jira">Issue Management</a>
+</div>
+<div class="menuitem">
<a href="mail-lists.html">Mail lists</a>
</div>
+<div onclick="SwitchMenu('menu_1.2.5', 'skin/')" id="menu_1.2.5Title" class="menutitle">Planning notes</div>
+<div id="menu_1.2.5" class="menuitemgroup">
<div class="menuitem">
-<a href="issues.html">Bugs and Issues</a>
+<a href="plan/index.html">Overview</a>
</div>
<div class="menuitem">
-<a href="forrest-issues.html">Open Issues</a>
+<a href="plan/internal-xhtml.html">Internal XHTML</a>
+</div>
</div>
<div class="menuitem">
-<a href="gump.html">Gump Integration</a>
+<a href="http://forrest.zones.apache.org" title="Access to forrest.zones.apache.org">Zone notes Testbed</a>
+</div>
</div>
+<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Procedures & Best Practice</div>
+<div id="menu_1.3" class="menuitemgroup">
<div class="menuitem">
-<a href="guidelines.html">Project guidelines</a>
+<a href="howto-dev.html" title="Describes tips and procedures for efficiently developing with Forrest.">Development guidelines</a>
</div>
<div class="menuitem">
-<a href="committed.html">Being committed</a>
+<a href="issues.html">Reporting Bugs and Issues</a>
</div>
<div class="menuitem">
-<a href="roles.html" title="Tasks to keep the project flowing">Project roles</a>
+<a href="subversion_bestpractices.html">Subversion Best Practices</a>
</div>
<div class="menuitem">
-<a href="thanks.html">Thanks</a>
+<a href="documentation_bestpractices.html" title="What to do or not to do when writing and integration documentation for Forrest.">Documentation Best Practices</a>
</div>
<div class="menuitem">
-<a href="forrest-friday.html" title="ForrestFriday monthly get-together">ForrestFriday</a>
+<a href="howto-howto.html" title="Instructions for writing a new howto-document">Write a How-to</a>
</div>
<div class="menuitem">
-<a href="zone.html" title="Notes for committers to manage forrest.zones.apache.org">Zone notes</a>
+<a href="gump.html">Gump Integration</a>
</div>
-<div onclick="SwitchMenu('menu_1.1.13', 'skin/')" id="menu_1.1.13Title" class="menutitle">Planning notes</div>
-<div id="menu_1.1.13" class="menuitemgroup">
<div class="menuitem">
-<a href="plan/index.html">Overview</a>
+<a href="zone.html" title="Notes for committers to manage forrest.zones.apache.org">Zone notes Testbed-Management</a>
</div>
<div class="menuitem">
-<a href="plan/internal-xhtml.html">Internal XHTML</a>
+<a href="procedures/release/How_to_release.html" title="Instructions on preparing and creating a new Forrest release.">How to release</a>
</div>
+<div class="menuitem">
+<a href="procedures/How_to_publish_docs.html" title="Instructions on publishing the Forrest Website">Publishing Forrest Documentation</a>
</div>
</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Proposals</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.4', 'skin/')" id="menu_selected_1.4Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Proposals</div>
+<div id="menu_selected_1.4" class="selectedmenuitemgroup" style="display: block;">
<div class="menupage">
<div class="menupagetitle">ASF Forrestbot</div>
</div>
@@ -293,7 +323,7 @@
</div>
<div class="copyright">
Copyright ©
- 2002-2005 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+ 2002-2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Modified: forrest/site/proposal-asf-forrestbot.pdf
URL: http://svn.apache.org/viewvc/forrest/site/proposal-asf-forrestbot.pdf?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/site/roles.html
URL: http://svn.apache.org/viewvc/forrest/site/roles.html?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
--- forrest/site/roles.html (original)
+++ forrest/site/roles.html Wed May 24 18:52:47 2006
@@ -114,50 +114,80 @@
<a href="contrib.html">Contributing</a>
</div>
<div class="menuitem">
+<a href="mail-lists.html">Mail lists</a>
+</div>
+<div class="menuitem">
+<a href="guidelines.html">Project guidelines</a>
+</div>
+<div class="menuitem">
+<a href="committed.html">Being committed</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">Project roles</div>
+</div>
+<div class="menuitem">
+<a href="forrest-friday.html" title="ForrestFriday monthly get-together">ForrestFriday</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Resources and Infrastructure</div>
+<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="todo.html">Todo</a>
+</div>
+<div class="menuitem">
<a href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/">Browse SVN</a>
</div>
<div class="menuitem">
+<a href="http://issues.apache.org/jira/browse/FOR" title="Direct access to our issue-tracker in Jira">Issue Management</a>
+</div>
+<div class="menuitem">
<a href="mail-lists.html">Mail lists</a>
</div>
+<div onclick="SwitchMenu('menu_1.2.5', 'skin/')" id="menu_1.2.5Title" class="menutitle">Planning notes</div>
+<div id="menu_1.2.5" class="menuitemgroup">
<div class="menuitem">
-<a href="issues.html">Bugs and Issues</a>
+<a href="plan/index.html">Overview</a>
</div>
<div class="menuitem">
-<a href="forrest-issues.html">Open Issues</a>
+<a href="plan/internal-xhtml.html">Internal XHTML</a>
+</div>
</div>
<div class="menuitem">
-<a href="gump.html">Gump Integration</a>
+<a href="http://forrest.zones.apache.org" title="Access to forrest.zones.apache.org">Zone notes Testbed</a>
+</div>
</div>
+<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Procedures & Best Practice</div>
+<div id="menu_1.3" class="menuitemgroup">
<div class="menuitem">
-<a href="guidelines.html">Project guidelines</a>
+<a href="howto-dev.html" title="Describes tips and procedures for efficiently developing with Forrest.">Development guidelines</a>
</div>
<div class="menuitem">
-<a href="committed.html">Being committed</a>
+<a href="issues.html">Reporting Bugs and Issues</a>
</div>
-<div class="menupage">
-<div class="menupagetitle">Project roles</div>
+<div class="menuitem">
+<a href="subversion_bestpractices.html">Subversion Best Practices</a>
</div>
<div class="menuitem">
-<a href="thanks.html">Thanks</a>
+<a href="documentation_bestpractices.html" title="What to do or not to do when writing and integration documentation for Forrest.">Documentation Best Practices</a>
</div>
<div class="menuitem">
-<a href="forrest-friday.html" title="ForrestFriday monthly get-together">ForrestFriday</a>
+<a href="howto-howto.html" title="Instructions for writing a new howto-document">Write a How-to</a>
</div>
<div class="menuitem">
-<a href="zone.html" title="Notes for committers to manage forrest.zones.apache.org">Zone notes</a>
+<a href="gump.html">Gump Integration</a>
</div>
-<div onclick="SwitchMenu('menu_1.1.13', 'skin/')" id="menu_1.1.13Title" class="menutitle">Planning notes</div>
-<div id="menu_1.1.13" class="menuitemgroup">
<div class="menuitem">
-<a href="plan/index.html">Overview</a>
+<a href="zone.html" title="Notes for committers to manage forrest.zones.apache.org">Zone notes Testbed-Management</a>
</div>
<div class="menuitem">
-<a href="plan/internal-xhtml.html">Internal XHTML</a>
+<a href="procedures/release/How_to_release.html" title="Instructions on preparing and creating a new Forrest release.">How to release</a>
</div>
+<div class="menuitem">
+<a href="procedures/How_to_publish_docs.html" title="Instructions on publishing the Forrest Website">Publishing Forrest Documentation</a>
</div>
</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Proposals</div>
-<div id="menu_1.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Proposals</div>
+<div id="menu_1.4" class="menuitemgroup">
<div class="menuitem">
<a href="proposal-asf-forrestbot.html">ASF Forrestbot</a>
</div>
@@ -285,7 +315,7 @@
<a name="N1004E"></a><a name="release-manager"></a>
<h3 class="underlined_5">Release Manager</h3>
<p>Tasks are defined in
- <a href="http://svn.apache.org/repos/asf/forrest/trunk/etc/RELEASE_PROCESS.txt">etc/RELEASE_PROCESS.txt</a>
+ <a href="procedures/release/How_to_release.html">How to Release Forrest</a>
</p>
<p>Only one person can do this role, although other people can assist.
@@ -326,20 +356,34 @@
</p>
<p>This role is not actually about doing the documentation. That should
be up to everyone.</p>
-<p>It is very easy using a local forrestbot:</p>
+<p>Generating and publishing the main docs is very easy using a local forrestbot:</p>
<pre class="code">cd site-author
- forrest -f publish.xml build
- forrest -f publish.xml deploy</pre>
-<p>Then a cronjob on the server will automatically publish it. However, if
+forrest -f publish.xml build
+forrest -f publish.xml deploy</pre>
+<p>This builds the documentation locally then deploys it by committing
+ it to the <a href="https://svn.apache.org/repos/asf/forrest/site">forrest/site SVN</a>.
+ Then a cronjob on the server will automatically publish it. However, if
instant turnaround is required, then do this:
</p>
<pre class="code">ssh people.apache.org
- cd /www/forrest.apache.org
- svn update</pre>
+cd /www/forrest.apache.org
+svn update</pre>
<p>See some general notes about managing
<a href="http://www.apache.org/dev/project-site.html">project websites</a>.
</p>
-<a name="N100BB"></a><a name="subversion-monitor"></a>
+<p>Note that forrestbot does not remove docs from the forrest/site SVN (FOR-392).
+ So need to manually 'svn delete oldDoc'.
+ </p>
+<p>
+ Publishing documentation for a particular plugin is done by:
+ </p>
+<pre class="code">cd plugins/myPluginName
+$FORREST_HOME/tools/ant/bin/ant deploy-docs</pre>
+<p>
+ See further information in the
+ <a href="docs_0_80/howto/howto-buildPlugin.html">buildPlugin</a> doc.
+ </p>
+<a name="N100D0"></a><a name="subversion-monitor"></a>
<h3 class="underlined_5">Subversion Monitor</h3>
<p>Ensure that svn:eol-style settings are "native" for all text files.</p>
<p>Ensure no line-endings issues.</p>
@@ -349,7 +393,7 @@
"<a href="https://svn.apache.org/repos/private/committers">committers</a>"
SVN in the "tools" directory.
</p>
-<a name="N100D5"></a><a name="legal-monitor"></a>
+<a name="N100EA"></a><a name="legal-monitor"></a>
<h3 class="underlined_5">Legal Monitor</h3>
<p>Regularly run a script which verifies and inserts missing license
headers to source files.
@@ -365,7 +409,7 @@
"<a href="https://svn.apache.org/repos/private/committers">committers</a>"
SVN in the "tools" and "relicense/src/perl" directories.
</p>
-<a name="N100EC"></a><a name="developer"></a>
+<a name="N10101"></a><a name="developer"></a>
<h3 class="underlined_5">Developer</h3>
<p>The above roles are only for PMC Members. How can the Developers be
involved? That is easy: do the Developer Role.
@@ -397,7 +441,7 @@
</div>
<div class="copyright">
Copyright ©
- 2002-2005 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+ 2002-2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Modified: forrest/site/roles.pdf
URL: http://svn.apache.org/viewvc/forrest/site/roles.pdf?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/basic.css
URL: http://svn.apache.org/viewvc/forrest/site/skin/basic.css?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
--- forrest/site/skin/basic.css (original)
+++ forrest/site/skin/basic.css Wed May 24 18:52:47 2006
@@ -138,10 +138,18 @@
#content li,
#content th,
-#content td {
- line-height: 110%;
- margin-top: .1em;
- margin-bottom: .1em;
+#content td,
+#content li ul,
+#content li ol{
+ margin-top: .5em;
+ margin-bottom: .5em;
+}
+
+
+#content li li,
+#minitoc-area li{
+ margin-top: 0em;
+ margin-bottom: 0em;
}
#content .attribution {
Modified: forrest/site/skin/profile.css
URL: http://svn.apache.org/viewvc/forrest/site/skin/profile.css?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
--- forrest/site/skin/profile.css (original)
+++ forrest/site/skin/profile.css Wed May 24 18:52:47 2006
@@ -37,9 +37,9 @@
#top { background-color: #294563;}
#top .header .current { background-color: #4a6d8c;}
-#top .header .current a:link { color: #0F3660; }
-#top .header .current a:visited { color: #0F3660; }
-#top .header .current a:hover { color: #000066; }
+#top .header .current a:link { color: #cedfef; }
+#top .header .current a:visited { color: #cedfef; }
+#top .header .current a:hover { color: #cedfef; }
#tabs li { background-color: #b5c7e7 ;}
#tabs li a:link { color: #0F3660; }
@@ -49,7 +49,7 @@
#level2tabs { background-color: #4a6d8c ;}
#level2tabs a:link { color: #cedfef; }
#level2tabs a:visited { color: #cedfef; }
-#level2tabs a:hover { color: #000066; }
+#level2tabs a:hover { color: #cedfef; }
.heading { background-color: #294563;}
@@ -80,12 +80,12 @@
background: #4a6d8c;
}
-#menu .menupagetitle { background-color: #4a6d8c;
+#menu .menupagetitle { background-color: #cedfef;
color: #000000;}
-#menu { border-color: #294563;}
-#menu .menupagetitle { border-color: #294563;}
-#menu .menupageitemgroup { border-color: #294563;}
+#menu { border-color: #cedfef;}
+#menu .menupagetitle { border-color: #cedfef;}
+#menu .menupageitemgroup { border-color: #cedfef;}
#menu { background-color: #4a6d8c;}
#menu { color: #cedfef;}
Modified: forrest/site/skin/screen.css
URL: http://svn.apache.org/viewvc/forrest/site/skin/screen.css?rev=409283&r1=409282&r2=409283&view=diff
==============================================================================
--- forrest/site/skin/screen.css (original)
+++ forrest/site/skin/screen.css Wed May 24 18:52:47 2006
@@ -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: left 3px;
+ 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 {
@@ -276,43 +304,50 @@
margin-left: 10px;
background-image: url('images/chapter.gif');
background-repeat: no-repeat;
- background-position: center left;
+ background-position: left 6px;
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;
+ background-position: left 5px;
font-weight : normal;
margin-left: 10px;
}
#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: left 4px;
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 {