Author: toback Date: Mon Jul 10 08:02:33 2006 New Revision: 420557 URL: http://svn.apache.org/viewvc?rev=420557&view=rev Log: Small change to the navigation. Modified: incubator/lokahi/site/trunk/about.html incubator/lokahi/site/trunk/design.html incubator/lokahi/site/trunk/glossary.html incubator/lokahi/site/trunk/history.html incubator/lokahi/site/trunk/howitworks.html incubator/lokahi/site/trunk/index.html incubator/lokahi/site/trunk/install.html incubator/lokahi/site/trunk/nav.html incubator/lokahi/site/trunk/project.html incubator/lokahi/site/trunk/setup.html incubator/lokahi/site/trunk/styles/styles.css Modified: incubator/lokahi/site/trunk/about.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/about.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/about.html (original) +++ incubator/lokahi/site/trunk/about.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@
-
+

About Lokahi

What is Lokahi?

Lokahi is a web-based framework for the management of application servers. It is comprised of a core set of functionality and a set of modules which can be added or removed as needed. Each module enables management of an application server or the connection between two application servers. Certain modules, including modules for Apache, Tomcat, and mod_jk, are provided as part of the initial release, and documentation and an API will be provided for developers to create their own. This modularity allows Lokahi to be extensible to accommodate growing and changing infrastructures.

Modified: incubator/lokahi/site/trunk/design.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/design.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/design.html (original) +++ incubator/lokahi/site/trunk/design.html Mon Jul 10 08:02:33 2006 @@ -1,4 +1,4 @@ - Apache Lokahi + Apache Lokahi | Primary Components @@ -10,18 +10,31 @@
- +
-

Design of Lokahi

+

Primary Components

Lokahi is a web-based system comprised of a core set of functionality and a set of modules which can be added or removed as needed. Each module will enable management of an application server or the connection between two application servers.

Primary Components

Modified: incubator/lokahi/site/trunk/glossary.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/glossary.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/glossary.html (original) +++ incubator/lokahi/site/trunk/glossary.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@
- +

Glossary of Terms

Modified: incubator/lokahi/site/trunk/history.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/history.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/history.html (original) +++ incubator/lokahi/site/trunk/history.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@
- +

History of Lokahi

Lokahi is the result of several years of web infrastructure management at Merck & Co., Inc. Over these years, the number of servers, the number of applications, and the complexity of configurations grew enormously, and grew faster than the staff dedicated to supporting them. The web infrastructure team developed a series of solutions for infrastructure management, culminating with the release of Lokahi as an Apache Incubator project.

In 2001, when Tomcat was implemented at Merck, infrastructure managers there modified the administration tool that came with it to create mrkuser. This tool, customized for Merck, allowed a single administrator to manage each JVM with its own console. Application teams needed to request all tasks to be performed by that administrator. www.merckvaccines.com was the first site managed this way. Soon after, a stripped down version of mrkuser, called mrkadmin, was provided. Using mrkadmin, application owners could manage certain tasks for their own applications.

Modified: incubator/lokahi/site/trunk/howitworks.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/howitworks.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/howitworks.html (original) +++ incubator/lokahi/site/trunk/howitworks.html Mon Jul 10 08:02:33 2006 @@ -1,4 +1,4 @@ - Apache Lokahi | How Lokahi Works + Apache Lokahi | Organization
@@ -10,18 +10,31 @@
- +
-

How Lokahi Works

+

Organization

Elements of Lokahi Modified: incubator/lokahi/site/trunk/index.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/index.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/index.html (original) +++ incubator/lokahi/site/trunk/index.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@
- +

Lokahi

Lokahi is a modular, web-based framework for the management of application servers. Modified: incubator/lokahi/site/trunk/install.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/install.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/install.html (original) +++ incubator/lokahi/site/trunk/install.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@

- +

Build and Install Instructions

Modified: incubator/lokahi/site/trunk/nav.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/nav.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/nav.html (original) +++ incubator/lokahi/site/trunk/nav.html Mon Jul 10 08:02:33 2006 @@ -1,10 +1,23 @@ - \ No newline at end of file + \ No newline at end of file Modified: incubator/lokahi/site/trunk/project.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/project.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/project.html (original) +++ incubator/lokahi/site/trunk/project.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@
- +

Project Information

Bug Tracking

Modified: incubator/lokahi/site/trunk/setup.html URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/setup.html?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/setup.html (original) +++ incubator/lokahi/site/trunk/setup.html Mon Jul 10 08:02:33 2006 @@ -10,16 +10,29 @@
- +

Lokahi Setup

Modified: incubator/lokahi/site/trunk/styles/styles.css URL: http://svn.apache.org/viewvc/incubator/lokahi/site/trunk/styles/styles.css?rev=420557&r1=420556&r2=420557&view=diff ============================================================================== --- incubator/lokahi/site/trunk/styles/styles.css (original) +++ incubator/lokahi/site/trunk/styles/styles.css Mon Jul 10 08:02:33 2006 @@ -47,7 +47,9 @@ background-color:#ffffff; } -#leftnav {float:left;width:10em;margin:5px 10px 0 0;padding-right:.3em;border-style:solid;border-width:1px;border-color:#cecac6;background-color:#efeae6;text-decoration:none;}#leftnav ul {list-style-type: none;line-height:1.5em;text-align:right;font-family: Arial, Helvetica, sans-serif; +#leftnav {float:left;width:12em;margin:5px 10px 0 0;padding-right:.3em; +padding-left:0;border-style:solid;border-width:1px;border-color:#cecac6;background-color:#efeae6;text-decoration:none;}#leftnav ul {list-style-type: none; +text-indent:-1.5em;line-height:1.5em;text-align:left;font-family: Arial, Helvetica, sans-serif; }#leftnav ul a:link { color:#666462;text-decoration: none; }#leftnav ul a:visited { @@ -56,8 +58,12 @@ color:#4ca038; }#leftnav ul a:active { color:#4ca038; +} + +.nav { +margin-left:-1.5em; }#content { -margin-left: 11.2em;padding:0 5px 0 5px; +margin-left: 13.2em;padding:0 5px 0 5px; max-width:43em; }