Index: modules/event/event.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/event/event.module,v
retrieving revision 1.122.2.12
diff -u -F^f -r1.122.2.12 event.module
--- modules/event/event.module	25 May 2005 21:23:22 -0000	1.122.2.12
+++ modules/event/event.module	16 Jun 2005 13:45:14 -0000
@@ -1793,36 +1793,19 @@ function event_help($section) {
     case 'admin/modules#description':
         return t('Lets users make events and keep calendars.');
       break;
-    case 'admin/help#event':
-      return t("
-      <h3>Background</h3>
-      <p>This version of event module implements the drupal nodeapi system. There is no native event node type as in versions previous to 4.6, but instead node types can be 'event-enabled' through the %configure-link, the same way in which file attachments are assigned to node types with upload.module. This, combined with the dynamic content type functionality of %flexinode-link, make it possible to define almost any kind of calendar.</p>
-      <p>Node types can be assigned to general calendar views, or only on their own calendar. For example, this makes it possible to have a general calendar which shows all 'meetups' and 'house parties' in the same place, but perhaps have a separate calendar for 'rallies' which only contains that type. The ability to filter calendar views by node type and taxonomy is also implemented, which allows many different possibilities for displaying content in the calendar system.</p>
-      
-      <h3><a id=\"url-format\"></a>Calendar display url formats</h3>
-      The ability to filter calendar views by content type and taxonomy enables almost unlimited possibilities for displaying content with the calendar system. You can combine taxonomy and content type filters, the url construction scheme is currently as follows:
-      <blockquote>
-      ?q=event/\$year/\$month/\$day/\$view_type/\$content_type/\$taxonomy_terms/\$duration<br /><br />
-      <strong>\$year:</strong> year value such as '2005'<br />
-      <strong>\$month:</strong> month value with leading zeroes such as '02' for february<br />
-      <strong>\$day:</strong> day value with leading zeroes such as '14'<br />
-      <strong>\$view_type:</strong> type of calendar layout, values may include 'month', 'week', 'day', 'table', 'ical' for an ical export, and 'feed' for an rss feed.<br />
-      <strong>\$content_type:</strong> list of node types, separated by '+'. Flexinode types only require the integer value of the type. For example, to view story nodes and type flexinode-1, you would use 'story+1'. The value 'all' will show all types.<br />
-      <strong>\$taxonomy_terms:</strong> list of term ids, seperated by '+'. For example to view entries assigned to the taxonomy terms with ids 4 and 9 you would use '4+9'. The value 'all' will show all terms.<br />
-      <strong>\$duration:</strong> number of days to display, currently only the table view obeys this setting. Eventually it may be used to specify additional duration parameters such as multiple weeks in the week view, or months in the month view.
-      </blockquote>
-      <p>There are url wrapper functions as well, which make it possible to easily create menu items to calendars by event type or taxonomy terms. This is necessary if you wish to create a link to a calendar but do not have a way to dynamically create the url based on the date, like in the menu or in a post.</p>
-      <p>For links to a taxonomy filtered calendar the format is:
-      <blockquote>
-      ?q=event/term/\$taxonomy_terms<br /><br />
-      <strong>\$taxonomy_terms:</strong> list of term ids, seperated by '+'. For example to view entries assigned to the taxonomy terms with ids 4 and 9 you would use '4+9'<br />
-      </blockquote>
-      For links to a content type filtered calendar the format is:
-      <blockquote>
-      ?q=event/type/\$content_type<br /><br />
-      <strong>\$content_type:</strong> list of node types, separated by '+'. Flexinode types only require the integer value of the type. For example, to view story nodes and type flexinode-1, you would use 'story+1'
-      </blockquote></p>",
-      array('%configure-link' => l(t('content type management admin area'), 'admin/node/configure/types'), '%flexinode-link' => l(t('flexinode'), 'http://drupal.org/node/5737')));
+      case 'admin/help#event': return t('
+
+      <p>The event module allows for any type of content to be event enabled,  meaning content can have a start and end time, and appear in calendars.  The ability to event enable any content type combined with the ability to create new types of content make it possible to create unlimited types of calendars.  The ability to broadly event enable content will allow for creative applications combining information and real world events.</p>
+      <p>The administrator can decide which content types should be events for their site.  In content type configuration, administrators can select the calendar view options: never, all views, or only views for this type. For example, this makes it possible to have a general calendar which shows all meetups and house parties in the same calendar, and have a separate calendar for rallies which only contains the rallies content type. Calendars can be customized to view a specific content type or a category of content, using taxonomies.</p>
+      <p>Administrators can also set two types of options for events; general event options, and event overview options.  General event options are for timezone configuration, time notation formats, and event block configuration.  Event overview options allow calendar and table event default views.  Administrators can also set general filter controls for content types and categories, via the event taxonomy controls.</p>
+      <p>You can</p>
+      <ul>
+      <li>enable content types to be event enabled at <a href="%contenttypeconfiguration" title="content type configuration">administer >> configure >> content types >> configure type</a>.</li>
+      <li>administer general event options <a href="%administerevents" title="administer events">administer >> settings >>events</a>.</li>
+      <li><a href="%createcontent" title="create content">create content</a> and set a start and end time, if the administrator has set that content type to be event enabled.</li>
+      </ul>
+
+      ',array('%contenttypeconfiguration' => url('admin/node/configure/types'),'%administerevents' => url('admin/settings/event'),'%createcontent' => url('node/add')));
       break;
     case 'event/dst':
         return t('This is a listing of all the event system\'s timezones, sorted by daylight savings time regions, and thier respective offsets from GMT in seconds. Timezones in the \'None\' region do not observe daylight savings time. If you believe there is an error, please first search for the locale on %timeanddate and confirm it. If there is indeed an error please submit a %bugreport on drupal.org so we can fix it.', array('%timeanddate' => l('http://timeanddate.com/worldclock/search.html', 'http://timeanddate.com/worldclock/search.html'), '%bugreport' => l('bug report', 'http://drupal.org/node/add/project_issue/event')));
