From b39c2867333a58f0da23360cda65b7c0af0fe50f Mon Sep 17 00:00:00 2001
From: John Dennis Casey <jdcasey@apache.org>
Date: Thu, 7 Jul 2005 17:40:03 +0000
Subject: [PATCH] merging in changes from the xdoc version, before I delete the
 xdoc version.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209620 13f79535-47bb-0310-9956-ffa450edef68
---
 .../developers/plugin-development-guide.apt    | 10 +++++-----
 maven-site/src/site/apt/plugin-overview.apt    | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/maven-site/src/site/apt/developers/plugin-development-guide.apt b/maven-site/src/site/apt/developers/plugin-development-guide.apt
index 533224a49b..8723b826ae 100644
--- a/maven-site/src/site/apt/developers/plugin-development-guide.apt
+++ b/maven-site/src/site/apt/developers/plugin-development-guide.apt
@@ -53,8 +53,8 @@ Developing Maven 2.0 Plugins
 
 * Resources
 
-    [[1]] {{{../plugin-management.html}Managing plugin configuration in large 
-          projects}}
-
-    [[2]] {{{../plugin-configuration.html}Configuring plugins}}
-
+    [[1]] {{{developers/developing-plugins-with-marmalade.html}Developing plugins
+          with Marmalade}}
+          
+    [[2]] {{{developers/mojo-api-specification.html}Mojo API specification}}
+          
diff --git a/maven-site/src/site/apt/plugin-overview.apt b/maven-site/src/site/apt/plugin-overview.apt
index 6000c870d3..7f0ad55b28 100644
--- a/maven-site/src/site/apt/plugin-overview.apt
+++ b/maven-site/src/site/apt/plugin-overview.apt
@@ -109,7 +109,25 @@ Plugin Overview
 
 ** What is a Plugin?
 
+  Maven is a framework for the execution of plugin goals.  Every action you 
+  take in Maven is really just calling out to an existing maven plugin. 
+  When you compile, clean, create a JAR, generate a site, or execute
+  unit tests, Maven is executing goals from the appropriate plugins. 
+
 ** What is a Mojo (<And Why the H--- is it Named 'Mojo'>)?
 
+  MOJO is a play on POJO (Plain-old-Java-object), substituting "Maven" for
+  "Plain".  A Mojo is really just a goal in Maven 2, and plug-ins consist of 
+  any number of goals (Mojos).
+
 ** What is the Build Lifecycle? (Overview)
 
+* Resources
+
+    [[1]] {{{developers/plugin-development-guide.html}Plugin development guide}}
+
+    [[2]] {{{plugin-management.html}Managing plugin configuration in large 
+          projects}}
+
+    [[3]] {{{plugin-configuration.html}Configuring plugins}}
+