Index: project.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/project/project.inc,v
retrieving revision 1.92
diff -u -p -r1.92 project.inc
--- project.inc	12 Nov 2006 13:40:22 -0000	1.92
+++ project.inc	26 Nov 2006 10:06:35 -0000
@@ -4,7 +4,7 @@
 /**
  * Implementation of hook_form().
  */
-function project_project_form(&$node) {
+function project_project_form($node) {
   global $user;
 
   /*
@@ -35,7 +35,7 @@ function project_project_form(&$node) {
     // See if there are any project specific taxonomy terms already
     // saved in this node (i.e. we're editing an existing project) and
     // if so, extract the right default values for our custom form
-    // elements... 
+    // elements...
     if ($node->taxonomy) {
       foreach ($node->taxonomy as $tid => $obj) {
         if ($top_level[$tid]) {
@@ -45,7 +45,7 @@ function project_project_form(&$node) {
           $current_options[$tid] = $tid;
         }
       }
-    } 
+    }
     $form['project_taxonomy'] = array(
       '#type' => 'fieldset',
       '#weight' => '-30',
@@ -97,7 +97,7 @@ function project_project_form(&$node) {
     '#rows' => 10,
     '#required' => TRUE,
   );
-  $form['project']['format'] = filter_form($node->format); 
+  $form['project']['format'] = filter_form($node->format);
   $form['project']['uri'] = array(
     '#type' => 'textfield',
     '#title' => t('Short project name'),
@@ -252,7 +252,7 @@ function project_project_validate(&$node
       if ($term->parents[0] == 0) {
         $top_level[$term->tid] = $term->name;
       }
-    }  
+    }
     foreach ($top_level as $tid => $name) {
       if ($node->project_type != $tid) {
         $tid_field = 'tid_' . $tid;
@@ -352,7 +352,10 @@ function project_project_view(&$node, $t
       $output .= theme('item_list', $links, t('Development'));
     }
 
-    $node->body .= $output;
+    $node->content['project'] = array(
+      '#value' => $output,
+      '#weight' => 50,
+    );
   }
 }
 
Index: project.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/project/project.module,v
retrieving revision 1.256
diff -u -p -r1.256 project.module
--- project.module	12 Nov 2006 13:40:22 -0000	1.256
+++ project.module	26 Nov 2006 10:06:35 -0000
@@ -8,10 +8,6 @@ if (file_exists("$path/project.inc")) {
 
 function project_help($section) {
   switch ($section) {
-    case 'admin/modules#description':
-      return t('Provides a project node type and browsing of projects.');
-    case 'node/add#project_project':
-      return t('A project is something a group is working on. It can optionally have issue tracking, integration with revision control systems, releases, and so on.' );
     case 'node/add/project_project':
       if (project_use_taxonomy()) {
         $tree = taxonomy_get_tree(_project_get_vid());
@@ -58,8 +54,7 @@ function project_block($op = 'list', $de
     $uris = NULL;
     $projects = array_merge(array(0 => t('<select a project>')), project_projects_select_options($uris, FALSE, 'node/'));
     $block['subject'] = t('Project navigation');
-    $form = project_quick_navigate_form($projects);
-    $block['content'] = drupal_get_form('project_quick_navigate_form', $form);
+    $block['content'] = drupal_get_form('project_quick_navigate_form', $projects);
 
     return $block;
   }
@@ -67,7 +62,11 @@ function project_block($op = 'list', $de
 
 function project_node_info() {
   return array(
-    'project_project' => array('name' => t('project'), 'base' => 'project_project'),
+    'project_project' => array(
+      'name' => t('project'),
+      'module' => 'project_project',
+      'description' => t('A project is something a group is working on. It can optionally have issue tracking, integration with revision control systems, releases, and so on.' ),
+    ),
   );
 }
 
@@ -127,7 +126,7 @@ function project_main_settings() {
 
   // If the project_sort_method setting has changed, the menu will need to be rebuilt.
   menu_rebuild();
-  return system_settings_form('project_main_settings', $form);
+  return system_settings_form($form);
 }
 
 function project_link($type, $node = 0, $main = 0) {
@@ -212,6 +211,12 @@ function project_menu($may_cache) {
   if ($may_cache) {
     // User pages:
     $access = user_access('access projects');
+    $items[] = array(
+      'path' => 'admin/settings/project',
+      'title' => t('project'),
+      'callback' => 'project_main_settings',
+      'access' => user_access('administer projects'),
+    );
 
     $items[] = array('path' => 'project',
       'title' => t('projects'),
@@ -365,8 +370,7 @@ function project_page_overview($termname
     else {
       $version = variable_get('project_release_overview', -1);
     }
-    $form = project_release_version_filter_form($version);
-    $version_form = drupal_get_form('project_release_version_filter_form', $form);
+    $version_form = drupal_get_form('project_release_version_filter_form', $version);
     if ($_POST['edit']['version_tid']) {
       $_SESSION['project_version'] = $form_values['version_tid'];
     }