Index: modules/interwiki/interwiki.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/interwiki/interwiki.module,v
retrieving revision 1.19
diff -u -r1.19 interwiki.module
--- modules/interwiki/interwiki.module	23 Nov 2005 19:30:38 -0000	1.19
+++ modules/interwiki/interwiki.module	28 Nov 2005 23:29:39 -0000
@@ -17,60 +17,20 @@
  */
 function interwiki_help($section) {
   switch ($section) {
+    case 'admin/help#interwiki':
+      $output = '<p>'. t('The interwiki module is the way to create links to the many wiki webs on the world wide web. Users avoid pasting in entire URLs, as they would for regular web pages, and instead use a shorthand similar to links within the same wiki. The types of interwiki links allowed in a wiki are defined by an InterMap.') .'</p>';
+      $output .= '<p>'. t('The interwiki module allows you to use interwiki links that point to wikis such as Wikipedia.org, SourceWatch.org and dKosopedia.com. It can also be used to link easily to Google and eBay searches and other online reference sources such as the Merriam-Webster dictionary. It uses a table interwiki which is the same table used by MediaWiki.  MediaWiki users should be able to use an interwiki table interchangeably.  The URL filter module must be enabled to use interwiki.') .'</p>';
+      $output .= t('<p>You can</p>
+<ul>
+<li>read the <a href="%external-http-en-wikipedia-org-wiki-Interwiki" title = "definition of interwiki from wikipedia the free encyclopedia">Wikipedia interwiki definition</a>.</li>
+<li>enable the urlfilter module in <a href="%admin-modules">administer &gt;&gt; modules</a>.</li>
+<li>enable the interwiki filter in your <a href="%admin-filters">administer &gt;&gt; filters, input formats.</a></li>
+<li>administer interwiki <a href="%admin-interwiki">administer &gt;&gt; interwiki </a>.</li>
+', array('%external-http-en-wikipedia-org-wiki-Interwiki' => 'http://en.wikipedia.org/wiki/Interwiki', '%admin-modules' => url('admin/modules'), '%admin-filters' => url('admin/filters'), '%admin-interwiki' => url('admin/interwiki'))) .'</ul>';
+      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%interwiki">Interwiki page</a>.', array('%interwiki' => 'http://www.drupal.org/handbook/modules/interwiki/')) .'</p>';
+      return $output;
     case 'admin/modules#description':
       return t('Easily link to wikis and other websites.');
-    case 'admin/help#interwiki':
-      return t("<p>This module makes it easy to link to wikis and other websites. Users avoid entering entire URLs, as they would for regular web pages, " .
-	              "and instead use a shorthand similar to the syntax used by %Wikipedia and other %MediaWiki sites, in which \"[prefix:some term]\" creates a hyperlink to the ".
-	              "\"some term\" article on the website specified by \"prefix.\" It is also possible to use the \"|\" character to create a \"piped link,\" with display text that is ".
-				  "different from the search term. For example, \"[w:public transport|public transportation]\" could be translated as a reference to the Wikipedia article on \"public ".
-				  "transport\" that displays as \"<a href=\"http://en.wikipedia.org/wiki/public_transport\">public transportation</a>.\" In addition to the single bracket syntax, ".
-				  "a double bracket syntax like the one used by %MediaWiki can be chosen from the interwiki configuration in %settings. The double-bracket syntax lets you specify a ".
-				  "\"default prefix\" that is used if no prefix is explicitly specified. For example, a default prefix of \"w\" means that [[some term]] is synonymous with [[w:some term]]. ".
-				  "This makes it easier to cut-and-paste text from MediaWiki sites directly into your Drupal site.</p>\n".
-                  "<h3>Configuration</h3><p>To use this module, you have to take a few steps:</p>".
-				  "<ul><li>Install and enable the module in %modules, and create the \"interwiki\" table using file interwiki.sql.</li>".
-				  "<li>Set the appropriate access right in %access<br />The access right is <b>administer interwiki</b>.</li>".
-				  "<li>To add or edit new interwiki links, use %interwikis.</li></ul>\n",
-                  array(
-				     '%Wikipedia' => '<a href="http://www.wikipedia.org">Wikipedia</a>',
-				     '%MediaWiki' => '<a href="http://wikipedia.sourceforge.net/">MediaWiki</a>', 
-				     '%settings' => l(t("administer &raquo; filters"), "admin/filters", array(), NULL, NULL, FALSE, TRUE), 
-				     '%modules' => l(t("administer &raquo; modules"), "admin/modules", array(), NULL, NULL, FALSE, TRUE), 
-                     '%access' => l(t("administer &raquo; users &raquo; configure &raquo; permissions"), "admin/user/configure/permission", array(), NULL, NULL, FALSE, TRUE),				  
-                     '%interwikis' => l(t("administer &raquo; interwiki"), "admin/interwiki", array(), NULL, NULL, FALSE, TRUE)				  
-				  )) . 
-				  t("<h3>Included search prefixes</h3>".
-				  "<p>The \"interwiki\" table created via file interwiki.sql comes with a number of records already included that facilitate linking to articles or search results on the following websites:</p>\n".
-				  "<table><tr><th>Prefix</th><th>Site</th></tr>\n".
-				  "<tr><td>w</td><td>%w, the online, open source encyclopedia</td></tr>".
-				  "<tr><td>sw</td><td>%sw, a wiki-based encyclopedia of lobbyists, PR firms, think tanks and other political advocacy groups</td></tr>".
-				  "<tr><td>kos</td><td>%kos, a wiki affiliated with the Daily Kos website</td></tr>".
-				  "<tr><td>ebay</td><td>%ebay</tr>".
-				  "<tr><td>google</td><td>%google, the online search engine</tr>".
-				  "<tr><td>th</td><td>an online %th</td></tr>".
-				  "<tr><td>archive</td><td>the %archive, also known as the Internet Archive, which stores and displays old versions of websites</td></tr>".
-				  "<tr><td>whois</td><td>%whois, Internic's search tool for information about who owns a domain name</td></tr>".
-				  "<tr><td>opendir</td><td>the %opendir, a human-edited web search engine</td></tr></table>\n".
-				  "<p>In addition, it has entries that facilitate linking to URLs in general and to content on your own local site. For example, [http://www.somesite.org|Some Website] ".
-				  "produces <a href=\"http://www.somesite.org\">Some Website</a>, and [:node/5|my fifth posting] produces <a href=\"node/5\">my fifth posting</a>. If \"http:\" is used as ".
-				  "the prefix, you can use %settings to specify the space character instead of the vertical bar character as the \"URL terminator\" which separates the URL from its display text. ".
-				  "(This option emulates the syntax used to specify external URLs in Wikipedia articles. If emulating Wikipedia is not important on your site, you'll probably want to use the default vertical bar character.)</p>",
-				  array(
-				    '%w' => l('Wikipedia', 'http://www.wikipedia.org'),
-				    '%sw' => l('SourceWatch', 'http://www.sourcewatch.org'),
-				    '%kos' => l('dKosopedia', 'http://www.dkosopedia.com'),
-				    '%ebay' => l('eBay', 'http://www.ebay.com'),
-				    '%google' => l('Google', 'http://www.google.com'),
-				    '%th' => l('thesaurus', 'http://thesaurus.reference.com'),
-				    '%archive' => l('Wayback Machine', 'http://web.archive.org'),
-				    '%whois' => l('whois', 'http://www.internic.net/whois.html'),
-				    '%opendir' => l('Open Directory project', 'http://search.dmoz.org'),
-				    '%settings' => l(t("administer &raquo; filters"), "admin/filters", array(), NULL, NULL, FALSE, TRUE), 
-					)) .
-                  t("<h3>For more information</h3>".
-                  "<ul><li><a href = \"http://en.wikipedia.org/wiki/Interwiki Wikipedia\" title = \"wikipedia interwiki definition\">Wikipedia's interwiki definition</a>.</li>".
-                  "<li>Configuration and customization handbook: <a href = \"http://drupal.org/handbook/modules/interwiki\" title = \"interwikipage\">interwiki page</a>.</li></ul>");
   }
 }
 
