diff -urp --strip-trailing-cr ../category/INSTALL.txt ./INSTALL.txt
--- ../category/INSTALL.txt	2006-04-14 13:40:21.000000000 +0200
+++ ./INSTALL.txt	2009-06-08 00:02:13.000000000 +0200
@@ -3,27 +3,26 @@
 Requirements
 ------------
 
-This module requires the latest development version of Drupal (CVS HEAD).
+This module requires the corresponding stable version of Drupal.
+No other modules are required beyond that.
 
 
 Installation
 ------------
 
-1. Copy the category folder and its contents to the Drupal modules/ directory.
+1. Copy the category folder and its contents to the appropriate Drupal directory,
+   which is usually sites/all/modules/ or sites/your_site_name/modules/.
    Drupal should automatically detect it.
 
-2. Go to 'administer -> modules' and enable category (and category_menu,
-   category_display, category_export, and category_legacy, if applicable).
-   Note: for each module that you enable, all necessary database tables will
-   be automatically created, using Drupal's new .install file system. You no
-   longer need to run the category.mysql script (which is why this file no
-   longer exists).
+2. Go to 'Administer -> Modules' (admin/build/modules) and enable category
+   (and additional modules in the Category group, such as category_menu,
+   category_display, and others, if applicable).
 
 3. If you wish to use taxonomy-dependent Drupal modules (e.g. forum, image,
    glossary) with this module, you must install the taxonomy wrapper module.
-   There is now a script available to perform this installation for you. To
-   run the script, go to 'administer -> settings -> category', and in the
-   'wrapper install / uninstall settings' box, click the 'install now' link
+   There is a script available to perform this installation for you. To
+   run the script, go to 'Administer -> Categories -> Wrapper modules'
+   (admin/content/category/wrappers), and click the 'install now' link
    for the taxonomy wrapper. If you experience errors with this script (usually
    due to file system permissions problems), see the instructions for
    installing the wrapper modules manually (available online).
@@ -31,39 +30,73 @@ Installation
 4. If you wish to use book-dependent Drupal modules (e.g. export_dxml) with
    this module, you must install the book wrapper module. The procedure for
    doing this is similar to that for installing the taxonomy wrapper module.
-   To run the book wrapper installation script, go to 'administer -> settings
-   -> category', and in the 'wrapper install / uninstall settings' box, click
+   To run the book wrapper installation script, go to 'Administer -> Categories
+   -> Wrapper modules' (admin/content/category/wrappers), and click
    the 'install now' link for the book wrapper. If you experience errors with
    this script (usually due to file system permissions problems), see the
    instructions for installing the wrapper modules manually (available online).
 
 5. If you have existing taxonomy terms and vocabularies, or if you have
    existing book nodes, you can import them as categories and containeris using
-   category_legacy. To do this, go to 'administer -> category legacy', and
+   category_legacy. To do this, go to 'Administer -> Category legacy', and
    follow the instructions on that page. It is recommended that you enable the
    taxonomy and book wrappers before performing an import. Additionally, using
    the taxonomy wrapper with existing taxonomy data is not recommended - either
-   import your existing taxonomy data first, disable the taxonomy wrapper, or
+   import your existing taxonomy data, disable the taxonomy wrapper, or
    delete your site's taxonomy data. You are able to leave the book module
    enabled, and continue to use your book data, if you wish (but as with
    taxonomy, it is recommended that you disable book).
 
-6. Go to 'administer -> access control' to configure access privileges for
-   this module.
+6. Go to 'Administer -> Permissions' (admin/user/permissions) to configure
+   access privileges for this module.
 
-7. Go to 'administer -> settings -> category' to change the settings for this
-   module. You might also want to change the node type settings for the
-   category and container node types, at 'administer -> settings -> content
-   types'.
+7. Settings for this module are basically located at 'Administer -> Categories'
+   (admin/content/category), but you'll notice that nearly all of the wide
+   range of options are actually set on per-container or per-node-type basis,
+   so you need to visit 'Administer -> Content types -> edit' (admin/content/
+   node-type/your_node_type), and especially your container's edit page, to
+   make all the choices.
 
-8. Go to 'administer -> categories' to start managing your categories and
+8. Go to 'Administer -> Categories' to start managing your categories and
    containers. You can create new categories and containers from here, or
-   you can go to 'create content -> category' or 'create content -> container'.
+   you can go to 'Create content -> Category' or 'Create content -> Container'.
+   As you'll be creating your categories and containers, you can adjust their
+   behavior to your needs through various settings found in the 'Category
+   information' or 'Container information' boxes.
 
 9. You can assign content to categories by configuring your containers to be
    associated with various node types, and then creating or editing nodes of
    those types.
    Note: content with assigned categories will only have its categories
-   displayed if category_display is installed, and if your containers are
-   configured to show categories on assigned nodes, and if the taxonomy
-   wrapper is installed.
+   displayed, if the taxonomy wrapper is installed, and if category_display
+   is not set to hide them.
+
+10. You may create customized lists of content based on categories, if you
+   have installed the Views module (available at http://drupal.org/project/views),
+   and also use them for your categories through the category_views module.
+   To use Category data with Views, you need to install the taxonomy wrapper,
+   and choose taxonomy-based options in Views.
+
+
+Troubleshooting
+---------------
+
+If something doesn't work as you expected, check all your settings first.
+Most commonly, problems are solved by just reviewing the 'Container information'
+box (while editing the container), as the settings located there are changing
+behavior of all categories (and nodes to some extent) within that container.
+(Note that some settings are hidden, unless other settings make them relevant,
+so you really want to read the descriptions.)
+
+You should also check, whether all necessary modules (such as category_display,
+category_menu, and others) are enabled where needed, and the taxonomy and/or
+book wrapper modules installed if necessary.
+
+If you're experiencing problems with menu items, with taxonomy-based modules,
+or with various content lists (including TOC trees and Views integration),
+you might need to refresh your site's data through the category_resave module.
+(This might happen after larger changes of settings, done while content
+already exists on the site.)
+
+For further help, visit the sites http://category.greenash.net.au/ and/or
+http://drupal.org/project/category
diff -urp --strip-trailing-cr ../category/README.txt ./README.txt
--- ../category/README.txt	2006-05-08 15:38:25.000000000 +0200
+++ ./README.txt	2009-06-08 00:00:13.000000000 +0200
@@ -16,7 +16,7 @@ with categories. Features:
  - Extensible architecture allows other modules to build on the functionality
    of this 'base module'
  - Wrapper modules allow full backwards-compatibility with the taxonomy and
-   book modules (which this module is based upon), and thus with all other
+   book modules (which this module is based upon), and thus with most other
    modules that depend on them
 
 Note: this is a summary of the full feature list, which is maintained at http://category.greenash.net.au/features.
diff -urp --strip-trailing-cr ../category/UPGRADE.txt ./UPGRADE.txt
--- ../category/UPGRADE.txt	2007-08-22 06:14:32.000000000 +0200
+++ ./UPGRADE.txt	2009-06-08 00:00:13.000000000 +0200
@@ -1,4 +1,12 @@
 Drupal 6.x:
  * "create categories", "create containers", "edit all categories", and "edit own categories" permissions are gone.
    Categories and containers no longer are special node types. Use the regular set of node permissions in the "node" section
-   to control access.
\ Chybí znak konce řádku na konci souboru
+   to control access.
+
+ * The category_display module now depends on category_menu. For some displays (such as the TOC tree)
+   to work properly, generated menu items must be enabled now (for containers and categories at a
+   minimum; you'll be able to put these into a hidden menu, so they don't show anywhere). You might need
+   to generate menu items for existing categories and/or nodes using the new category_resave module.
+
+ * The fieldset for custom menu links creation on node edit forms is suppressed now, as it's incompatible
+   with category_menu. Menu links should be created by either category_menu, or by the user - not both.
