Updated titles.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6067 b35dd754-fafc-0310-a699-88a17e54d16e

Updated titles.
git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6067 b35dd754-fafc-0310-a699-88a17e54d16e
7e4714be · Matt Tucker · matt · 224c63f7 · 7e4714be · 7e4714be
Commit 7e4714be authored Nov 11, 2006 by Matt Tucker Committed by matt Nov 11, 2006
13 changed files
--- a/Admin.iml
+++ b/Admin.iml
@@ -203,6 +203,7 @@
      <url>file://$MODULE_DIR$/target/resources</url>
    </containerElement>
    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/web/WEB-INF/web.xml" optional="false" version="2.3" />
+    <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/web/META-INF/context.xml" optional="false" version="5.x" />
    <webroots>
      <root url="file://$MODULE_DIR$/src/web" relative="/" />
      <root url="file://$MODULE_DIR$/src/web/WEB-INF" relative="/WEB-INF" />

--- a/documentation/docs/database-guide.html
+++ b/documentation/docs/database-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Database Schema Guide</title>
+<title>Wildfire: Database Schema Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/database.html
+++ b/documentation/docs/database.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Database Installation Guide</title>
+<title>Wildfire: Database Installation Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/db-integration-guide.html
+++ b/documentation/docs/db-integration-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Custom Database Integration Guide</title>
+<title>Wildfire: Custom Database Integration Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/index.html
+++ b/documentation/docs/index.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Overview</title>
+<title>Wildfire: Overview</title>
 <link type="text/css" rel="stylesheet" href="style.css">
 </head>
 <body>
@@ -30,6 +30,10 @@ messaging (IM) services using the XMPP protocol.
        <a href="install-guide.html">Installation Guide</a> -
        How to install Wildfire.
    </li>
+    <li>
+        <a href="install-guide.html">Upgrade Guide</a> -
+        Instructions for upgrading an existing Wildfire installation.
+    </li>
    <li>
        <a href="database.html">Database Installation Guide</a> - 
        How to setup your database for use with Wildfire.

--- a/documentation/docs/install-guide.html
+++ b/documentation/docs/install-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Installation Guide</title>
+<title>Wildfire: Installation Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -23,8 +23,7 @@

 <p>Wildfire is a powerful instant messaging (IM) and chat
 server that implements the XMPP protocol. This document will guide 
-you through installing Wildfire as a standalone
-application. For a full list of features and more information, please
+you through installing Wildfire. For a full list of features and more information, please
 visit the Wildfire website: <a href="http://www.jivesoftware.org/wildfire"
 target="_top">http://www.jivesoftware.org/wildfire</a></p>

@@ -112,8 +111,7 @@ documentation.</li>
 <h2><a name="database">Setup the Database</a></h2>
 <p>Wildfire can store its data in an embedded database or you can choose to use
 an external database such as MySQL or Oracle. If you would like to use an external database,
-you must prepare it before proceeding with installation by running the appropriate database
-schema. View the <a href="database.html">database
+you must prepare it before proceeding with installation. View the <a href="database.html">database
 setup</a> documentation for more information.</p>

 <h2><a name="config"></a>Setup the Server</h2>
@@ -219,11 +217,13 @@ the script for additional details.</li>
 Plugins add additional features and protocol support to Wildfire. After setting up your
 Wildfire installation, you may want to download and install plugins to enhance your
 server. Plugins can be downloaded from the
-<a href="http://www.jivesoftware.org/wildfire/plugins.jsp">plugins page</a> on jivesoftware.org.
+<a href="http://www.jivesoftware.org/wildfire/plugins.jsp">plugins page</a> on jivesoftware.org
+or directly inside the administration console.

 <h3>Installing Plugins</h3>

-Each plugin comes packaged as a .jar (JAR) file. After download the plugin, you can deploy it
+If you download a plugin from inside the Wildfire administration console, it will automatically
+be installed. If you manually download the plugin (packaged as a .jar file), you can deploy it
 by copying the plugin file to the <tt>plugins/</tt> directory of your Wildfire installation. A
 plugin monitor will automatically extract the plugin into a directory and install the plugin in Wildfire.


--- a/documentation/docs/ldap-guide.html
+++ b/documentation/docs/ldap-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: LDAP Guide</title>
+<title>Wildfire: LDAP Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/plugin-dev-guide.html
+++ b/documentation/docs/plugin-dev-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Plugin Developer Guide</title>
+<title>Wildfire: Plugin Developer Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/protocol-support.html
+++ b/documentation/docs/protocol-support.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Protocol Support</title>
+<title>Wildfire: Protocol Support</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/source-build.html
+++ b/documentation/docs/source-build.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Building the Source</title>
+<title>Wildfire: Building the Source</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>


--- a/documentation/docs/ssl-guide.html
+++ b/documentation/docs/ssl-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: SSL Guide</title>
+<title>Wildfire: SSL Guide</title>
 <link type="text/css" rel="stylesheet" href="style.css">
 </head>
 <body>

--- a/documentation/docs/translator-guide.html
+++ b/documentation/docs/translator-guide.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Jive Software - Wildfire: Translator Guide</title>
+<title>Wildfire: Translator Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/documentation/docs/upgrade-guide.html
+++ b/documentation/docs/upgrade-guide.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<title>Wildfire: Upgrade Guide</title>
+<link href="style.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+
+<div id="pageContainer">
+
+<a name="top"></a>
+
+	<div id="pageHeader">
+		<div id="logo"></div>
+		<h1>Upgrade Guide</h1>
+	</div>
+	<div class="navigation">
+		<a href="index.html">&laquo; Back to documentation index</a>
+	</div>
+
+	<div id="pageBody">
+
+
+    </div>
+
+</div>
+
+</body>
+</html>
\ No newline at end of file