Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.270
diff -u -r1.270 blog.module
--- modules/blog/blog.module	23 Nov 2006 11:06:53 -0000	1.270
+++ modules/blog/blog.module	27 Nov 2006 15:28:30 -0000
@@ -14,7 +14,7 @@
     'blog' => array(
       'name' => t('Blog entry'),
       'module' => 'blog',
-      'description' => t('A blog is a regularly updated journal or diary made up of individual posts shown in reversed chronological order. Each member of the site may create and maintain a blog.'),
+      'description' => t('A blog is a journal made up of individual "blog entries" which are displayed in reversed chronological order with new posts showing up at the top. Each member of the site may create and maintain a blog.'),
     )
   );
 }
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.401
diff -u -r1.401 book.module
--- modules/book/book.module	24 Nov 2006 10:18:22 -0000	1.401
+++ modules/book/book.module	27 Nov 2006 15:29:58 -0000
@@ -14,7 +14,7 @@
     'book' => array(
       'name' => t('Book page'),
       'module' => 'book',
-      'description' => t("A book is a collaborative writing effort: users can collaborate writing the pages of the book, positioning the pages in the right order, and reviewing or modifying pages previously written. So when you have some information to share or when you read a page of the book and you didn't like it, or if you think a certain page could have been written better, you can do something about it."),
+      'description' => t("A book is a hierarchically structured array of book pages. It is usually maintained by many collaborating people and used for creating manuals, handbooks and documentation but can be used for virtually any purpose that requires a fixed structure."),
     )
   );
 }
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.367
diff -u -r1.367 forum.module
--- modules/forum/forum.module	26 Nov 2006 02:20:00 -0000	1.367
+++ modules/forum/forum.module	27 Nov 2006 15:31:14 -0000
@@ -107,7 +107,7 @@
     'forum' => array(
       'name' => t('Forum topic'),
       'module' => 'forum',
-      'description' => t('Create a new topic for discussion in the forums.'),
+      'description' => t('"Forum topics" are used to start a new thread in a discussion forum. They can be categorized by selecting a forum or forum container they should be in. Users can usually respond to the writer by writing a comment to the forum topic.'),
       'title_label' => t('Subject'),
     )
   );
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.220
diff -u -r1.220 poll.module
--- modules/poll/poll.module	21 Nov 2006 20:14:18 -0000	1.220
+++ modules/poll/poll.module	27 Nov 2006 15:31:48 -0000
@@ -321,7 +321,7 @@
     'poll' => array(
       'name' => t('Poll'),
       'module' => 'poll',
-      'description' => t("A poll is a multiple-choice question which visitors can vote on."),
+      'description' => t("In order to get to know the opinion of visitors and users, a poll can be used. They can have any desired amount of response options. Users select their response and cast their vote on the poll."),
       'title_label' => t('Question'),
       'has_body' => FALSE,
     )
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.45
diff -u -r1.45 system.install
--- modules/system/system.install	26 Nov 2006 23:42:15 -0000	1.45
+++ modules/system/system.install	27 Nov 2006 15:35:38 -0000
@@ -1030,8 +1030,8 @@
 
   db_query("INSERT INTO {node_access} VALUES (0, 0, 'all', 1, 0, 0)");
 
-  db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('page', 'Page', 'node', 'If you want to add a static page, like a contact page or an about page, use a page.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'page')");
-  db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('story', 'Story', 'node', 'Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'story')");
+  db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('page', 'Page', 'node', 'To create static pages with infrequently changing content, a \"page\" is used. This content type is highly generic and can be used for about any purpose.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'page')");
+  db_query("INSERT INTO {node_type} (type, name, module, description, help, has_title, title_label, has_body, body_label, min_word_count, custom, modified, locked, orig_type) VALUES ('story', 'Story', 'node', 'Stories are simple articles used to provide the actual content of your site. This content type is highly generic and can be used for about any purpose.', '', 1, 'Title', 1, 'Body', 0, 1, 1, 0, 'story')");
   db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Filtered HTML',',1,2,',1)");
   db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('PHP code','',0)");
   db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Full HTML','',1)");
@@ -3411,6 +3411,17 @@
   }
   return $ret;
 }
+ 
+function system_update_1017() {
+  $ret = array();
+
+  $ret[] = update_sql('UPDATE {node_type} SET description = "To create static pages with infrequently changing content, a \"page\" is used. This content type is highly generic and can be used for about any purpose." WHERE type = "page" AND description = "If you want to add a static page, like a contact page or an about page, use a page."');
+  $ret[] = update_sql('UPDATE {node_type} SET description = "Stories are simple articles used to provide the actual content of your site. This content type is highly generic and can be used for about any purpose." WHERE type = "story" AND description = "Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles."');
+
+  node_types_rebuild();
+
+  return $ret;
+}
 
 /**
  * @} End of "defgroup updates-4.7-to-5.0"