Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/README.txt,v
retrieving revision 1.4.2.1
diff -u -u -p -r1.4.2.1 README.txt
--- README.txt	14 Sep 2007 23:18:02 -0000	1.4.2.1
+++ README.txt	24 Jun 2008 21:39:49 -0000
@@ -33,9 +33,29 @@ INSTALLATION
 
 CONFIGURATION
 -------------
-1. The general GeSHi Filter settings and further configuration instructions
-  can be found by navigating to:
+1. The general GeSHi Filter settings can be found by navigating to:
   administer > site configuration > geshifilter
+2. Further configuration instructions can be found by following the
+  "more help..." link at the top of that general settings page, which leads
+  to www.example.com/?q=admin/help/geshifilter .
+
+
+USAGE
+-----
+The basic usage (with the default settings) is:
+  <code language="java">
+  for (int i; i<10; ++i) {
+    dothisdothat(i);
+  }
+  </code>
+When language tags are enabled (like "<java>" for Java) you can also do
+  <java>
+  for (int i; i<10; ++i) {
+    dothisdothat(i);
+  }
+  </java>
+More options and tricks can be found in the filter tips of the input format at
+www.example.com/?q=filter/tips .
 
 
 AUTHORS
Index: geshifilter.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.install,v
retrieving revision 1.2.2.2
diff -u -u -p -r1.2.2.2 geshifilter.install
--- geshifilter.install	12 Apr 2008 22:33:53 -0000	1.2.2.2
+++ geshifilter.install	24 Jun 2008 21:39:49 -0000
@@ -5,16 +5,12 @@
  * Implementation of hook_install
  */
 function geshifilter_install() {
-  // enable some popular languages by default
-  variable_set('geshifilter_language_enabled_php', TRUE);
-  variable_set('geshifilter_language_enabled_drupal5', TRUE);
-  variable_set('geshifilter_language_enabled_drupal6', TRUE);
-  variable_set('geshifilter_language_enabled_javascript', TRUE);
-  variable_set('geshifilter_language_enabled_java', TRUE);
-  variable_set('geshifilter_language_enabled_c', TRUE);
-  variable_set('geshifilter_language_enabled_cpp', TRUE);
-  variable_set('geshifilter_language_enabled_python', TRUE);
-  variable_set('geshifilter_language_enabled_ruby', TRUE);
+  // Enable some popular languages and set their language tags by default
+  $languages = array('php', 'drupal5', 'drupal6', 'javascript', 'java', 'c', 'cpp', 'python', 'ruby');
+  foreach ($languages as $language) {
+    variable_set('geshifilter_language_enabled_' . $language, TRUE);
+    variable_set('geshifilter_language_tags_' . $language, '<' . $language . '>');
+  }
 
   // what to do next?
   drupal_set_message(t('GeSHi filter is installed. You should now <a href="!geshi_admin">configure the GeSHi filter</a> and enable it in the desired <a href="!input_formats">input formats</a>.',
Index: geshifilter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.module,v
retrieving revision 1.18.2.62
diff -u -u -p -r1.18.2.62 geshifilter.module
--- geshifilter.module	1 May 2008 20:08:57 -0000	1.18.2.62
+++ geshifilter.module	24 Jun 2008 21:39:49 -0000
@@ -45,7 +45,7 @@ function geshifilter_help($section) {
           '!repositorypolicies' => url('http://drupal.org/node/66113'),
           '!geshi' => url('http://qbnz.com/highlighter/'),
         )) .'</p>';
-        $output .= t('<p>Quick overview of how to set up and use the GeSHi filter:</p><ul><li>Install the GeSHi library and specify its path on the <a href="!geshifilter_settings">GeSHi filter administration page</a>.</li><li>Configure the <a href="!geshifilter_settings">general GeSHi filter settings</a>.</li><li><a href="!geshifilter_languages">Enable the relevant languages</a> for your site.</li><li>Enable the GeSHi filter in the desired !inputformats.</li><li>Check for !filterconflicts and resolve them.</li><li>Use the input format during content submission as described in the !filtertips.</li></ul>', array(
+        $output .= t('<p>Quick overview of how to set up and use the GeSHi filter:</p><ul><li>Install the GeSHi library and specify its path on the <a href="!geshifilter_settings">GeSHi filter administration page</a>.</li><li>Configure the <a href="!geshifilter_settings">general GeSHi filter settings</a>.</li><li><a href="!geshifilter_languages">Enable the relevant languages</a> for your site and set their language tags if needed.</li><li>Enable the GeSHi filter in the desired !inputformats.</li><li>Check for !filterconflicts and resolve them.</li><li>Use the input format during content submission as described in the !filtertips.</li></ul>', array(
           '!geshifilter_settings' => url('admin/settings/geshifilter'),
           '!geshifilter_languages' => url('admin/settings/geshifilter/languages/all'),
           '!inputformats' => l(t('input formats'), 'admin/settings/filters'),