[nautilus-actions] Add README-GCONF to the distribution

[Pierre Wieser <pwieser src gnome org>]

commit 0dbf9227eda6693a3c6f06bb148e4b987da79d68
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 19 22:40:13 2011 +0100

    Add README-GCONF to the distribution

 ChangeLog    |    3 +++
 Makefile.am  |    1 +
 README-GCONF |   14 +++++++-------
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e065cdd..30247f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-19 Pierre Wieser <pwieser trychlos org>
 
+	* README-GCONF:
+	* Makefile.am: Add README-GCONF to the distribution.
+
 	* tools/check-po.sh: Script rewriting.
 
 	* NEWS: Update before release.
diff --git a/Makefile.am b/Makefile.am
index daf3337..fc84f93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,7 @@ dist_pkgdoc_DATA = \
 	MAINTAINERS							\
 	NEWS								\
 	README								\
+	README-GCONF						\
 	TODO								\
 	$(NULL)
 
diff --git a/README-GCONF b/README-GCONF
index 5c53611..2ccdb2d 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -4,20 +4,20 @@ Deprecating GConf
  Gnome is deprecating GConf in favour of GSettings. This is the short story.
  We so have to migrate several pool of datas.
  
- Starting with 3.1.0, Nautilus-Actions is provided with the needed migrations
+ Starting with 3.1.0, Nautilus-Actions is provided with the needed migration
  tools, whether the migration may occur automatically (for users items and
  preferences), or the system admin must run a script (for mandatory items).
  
  Note that this does not break backward compatibility. The 3.1.x serie of
  Nautilus-Actions may still be run on a "old" platform. The oldest supported
- is Ubuntu 8 LTS.
+ as of January 2011 is Ubuntu 8 LTS.
 
  1. Items, menus and actions, stored in GConf backend
  ----------------------------------------------------
  Historically, actions, then menus, were stored in GConf. These are user items.
 
- A system admin is free to define mandatory menus and actions, and to store
- them in the Mandatory pool of GConf. So defined items are so available to
+ A system admin was free to define mandatory menus and actions, and to store
+ them in the Mandatory pool of GConf. Such defined items are so available to
  all users, though as read-only items.
 
    1a. Migrating user items
@@ -42,7 +42,7 @@ Deprecating GConf
    1b. Migrating mandatory items
    -----------------------------
    The bad news is:
-   the system admin has to manually run PKGLIBEXECDIR/gconf2key.sh script
+   the system admin has to manually run PKGLIBEXECDIR/na-gconf2key.sh script
    as root in order to migrate existing mandatory items to .desktop files.
 
    The new .desktop files default to be stored in /usr/share/file-manager/actions.
@@ -113,7 +113,7 @@ Deprecating GConf
  schemes = [dav|WebDAV files,file|Local files,ftp|FTP files,sftp|SSH files,smb|Windows files]
                                             [nact]     scheme-default-list
 
- User preferences for I/O providers are stored as /apps/nautilus-actions/io-providers/<provider_id>
+ User preferences for I/O providers were stored as /apps/nautilus-actions/io-providers/<provider_id>
  keys. They are moved to [io-provider <provider_id>] group.
 
  GConf                                                 Key
@@ -123,7 +123,7 @@ Deprecating GConf
 
  3. Sysadmin reserved mandatory keys
  -----------------------------------
- These are
+ These were
    /apps/nautilus-actions/mandatory/
      all/locked
      na-desktop/locked