@@ -53,16 +53,16 @@ function aggregator_help($section) {
<h3>Technical details</h3>
<p>Drupal automatically generates an OPML feed file that is available by selecting the XML icon on the News Sources page.</p>
<p>When fetching feeds Drupal supports conditional GETs, this reduces the bandwidth usage for feeds that have not been updated since the last check.</p>
<p>If a feed is permanently moved to a new location Drupal will automatically update the feed URL to the new address.</p>',array('%block'=>url('admin/system/block'),'%admin-news'=>url('admin/syndication/news'),'%new-feed'=>url('admin/syndication/news/add/feed'),'%new-category'=>url('admin/syndication/news/add/category'),'%update-items'=>url('admin/syndication/news'),'%news-aggregator'=>url('aggregator'),'%sources'=>url('aggregator/sources'),'%categories'=>url('aggregator/categories')));
<p>If a feed is permanently moved to a new location Drupal will automatically update the feed URL to the new address.</p>',array('%block'=>url('admin/system/block'),'%admin-news'=>url('admin/aggregator'),'%new-feed'=>url('admin/aggregator/add/feed'),'%new-category'=>url('admin/aggregator/add/category'),'%update-items'=>url('admin/aggregator'),'%news-aggregator'=>url('aggregator'),'%sources'=>url('aggregator/sources'),'%categories'=>url('aggregator/categories')));
case'admin/system/modules#description':
returnt('Used to aggregate syndicated content (RSS and RDF).');
case'admin/system/modules/aggregator':
returnt('These settings control the display of aggregated content.');
case'admin/syndication/news':
case'admin/aggregator':
returnt('Several web sites, especially news related sites, syndicate parts of their site\'s content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS) or Resource Description Framework (RDF). To get a feed to work you <strong>must</strong> have <a href=\"%cron\">cron</a> working. To display the feed or categoty in a block you must decide how many items to show by editing the feed or block and turn on the <a href="%block">feed\'s block</a>.',array('%block'=>url('admin/system/block'),'%cron'=>url('admin/help',NULL,'cron')));
case'admin/syndication/news/add/feed':
case'admin/aggregator/add/feed':
returnt('Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run "cron.php". If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.');
case'admin/syndication/news/add/category':
case'admin/aggregator/add/category':
returnt('Categoriess provide a generalized way of creating composite news pages or blocks. They allow you, for example, to combine various sport-related items into one category called <i>Sports</i>. News items can be added to a category automatically by setting a feed to automatically place items in a category or by using the categorize items link in any listing of news items.');
}
}
...
...
@@ -105,15 +105,14 @@ function aggregator_link($type) {
@@ -53,16 +53,16 @@ function aggregator_help($section) {
<h3>Technical details</h3>
<p>Drupal automatically generates an OPML feed file that is available by selecting the XML icon on the News Sources page.</p>
<p>When fetching feeds Drupal supports conditional GETs, this reduces the bandwidth usage for feeds that have not been updated since the last check.</p>
<p>If a feed is permanently moved to a new location Drupal will automatically update the feed URL to the new address.</p>',array('%block'=>url('admin/system/block'),'%admin-news'=>url('admin/syndication/news'),'%new-feed'=>url('admin/syndication/news/add/feed'),'%new-category'=>url('admin/syndication/news/add/category'),'%update-items'=>url('admin/syndication/news'),'%news-aggregator'=>url('aggregator'),'%sources'=>url('aggregator/sources'),'%categories'=>url('aggregator/categories')));
<p>If a feed is permanently moved to a new location Drupal will automatically update the feed URL to the new address.</p>',array('%block'=>url('admin/system/block'),'%admin-news'=>url('admin/aggregator'),'%new-feed'=>url('admin/aggregator/add/feed'),'%new-category'=>url('admin/aggregator/add/category'),'%update-items'=>url('admin/aggregator'),'%news-aggregator'=>url('aggregator'),'%sources'=>url('aggregator/sources'),'%categories'=>url('aggregator/categories')));
case'admin/system/modules#description':
returnt('Used to aggregate syndicated content (RSS and RDF).');
case'admin/system/modules/aggregator':
returnt('These settings control the display of aggregated content.');
case'admin/syndication/news':
case'admin/aggregator':
returnt('Several web sites, especially news related sites, syndicate parts of their site\'s content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS) or Resource Description Framework (RDF). To get a feed to work you <strong>must</strong> have <a href=\"%cron\">cron</a> working. To display the feed or categoty in a block you must decide how many items to show by editing the feed or block and turn on the <a href="%block">feed\'s block</a>.',array('%block'=>url('admin/system/block'),'%cron'=>url('admin/help',NULL,'cron')));
case'admin/syndication/news/add/feed':
case'admin/aggregator/add/feed':
returnt('Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run "cron.php". If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.');
case'admin/syndication/news/add/category':
case'admin/aggregator/add/category':
returnt('Categoriess provide a generalized way of creating composite news pages or blocks. They allow you, for example, to combine various sport-related items into one category called <i>Sports</i>. News items can be added to a category automatically by setting a feed to automatically place items in a category or by using the categorize items link in any listing of news items.');
}
}
...
...
@@ -105,15 +105,14 @@ function aggregator_link($type) {