From 936ea7ee8bbc8660df755e0c8f22f5e04cd14c96 Mon Sep 17 00:00:00 2001
From: Pierre Wieser <pwieser@trychlos.org>
Date: Fri, 25 Feb 2011 16:02:02 +0100
Subject: [PATCH] Update NEWS and README before release

---
 ChangeLog    |  4 ++++
 NEWS         | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README       | 15 ++++++++++-----
 README-GCONF |  2 +-
 4 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f2baedd..5db9ea36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-25 Pierre Wieser <pwieser@trychlos.org>
 
+	* NEWS:
+	* README:
+	* README-GCONF: Update before releasing.
+
 	* src/api/na-core-utils.h:
 	* src/core/na-core-utils.c (na_core_utils_str_subst): New function.
 
diff --git a/NEWS b/NEWS
index 71f0975d..44c7d3b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,65 @@
+Version 3.1.0
+=============
+
+	Release date 2011-02-25
+
+	General modifications:
+
+		- Migrate menus, actions (resp. user preferences) from GConf to .desktop
+		  files (resp. keyed files). Please read README-GCNF.
+		- nautilus-actions-schemas in renamed as na-print-schemas and installed
+		  in PKGLIBEXECDIR.
+		- Two new executables na-delete-xmltree and na-gconf2keys.sh are also
+		  installed in PKGLIBEXECDIR.
+		- New user preferences are installed respectively as
+		  SYSCONFDIR/xdg/nautilus-actions/nautilus-actions.conf and
+		  ~/.config/nautilus-actions/nautilus-actions.conf.
+		- Implement a new icon chooser, which lets the user select a themed
+		  icon or an icon by path.
+		- Preferences dialog is now reopened on the last used tab.
+		- Define a new NATimeout public structure.
+		- Add --enable-gconf configure option, defaulting to "auto".
+		- Add --enable-deprecated configure option, defaulting to "no".
+		- nautilus-actions-new now implements all available properties.
+		- Currently running desktop environment is not detected at runtime
+		  when not specified as a user preference.
+		- Plugin menu can now be debugged from a user preference.
+		- Implements ExecutionMode (in a terminal, display output).
+		- Disable not yet implemented fields in NACT.
+
+	Internal modifications:
+
+		- Lot of code rewriting:
+		  . define all GConf writing functions as deprecated;
+		  . NactIActionsList interface is moved to NactTreeView class plus
+		    NactTreeIEditable interface;
+		  . user preferences are managed via a NASettings singleton;
+		  . BaseApplication and BaseWindow;
+		  . NactMenubar: new convenience class;
+		  . fully deprecate NAIPivotConsumer interface;
+		  . NactSortButtons: new convenience class;
+		  . NADataBoxed now derives from new NABoxed class;
+		  . modification stack;
+		  . validity stack;
+		  . writability stack;
+
+	Bug fixes:
+
+		- Fix various mistakes and mispellings reported by Fr translation team.
+		- Fix #640216: string errors reported by Christian Kirbach.
+		- Fix #640920: string errors reported by Christian Kirbach.
+		- Fix case insensitive comparison reported by Johan Spee.
+		- No more try to convert all/allfiles to something else.
+
+	New and updated translations:
+
+		- cs (Marek Cernocky)
+		- de (Mario Blättermann, Christian Kirbach) 
+		- es (Jorge González)
+		- fr (Bruno Brouard)
+		- nb (Kjartan Maraas)
+		- sl (Matej Urbančič, Andrej Žnidaršič) 
+
 Version 3.0.7
 =============
 
diff --git a/README b/README
index 6cf8a4b2..f0c91425 100644
--- a/README
+++ b/README
@@ -23,11 +23,16 @@ Nautilus-Actions components.
       Nautilus selection, and sends it in response to a DBus request. 
 
   - Command-line utilities:
-    . nautilus-actions-new lets you create new actions from the command-line.
-    . nautilus-actions-schemas prints the full GConf schema on stdout.
-    . nautilus-actions-run lets you execute a predefined action, taking
-      into account the current Nautilus selection via a DBus call to the
-      libnautilus-actions-tracker plugin.
+    a) installed in PREFIX/bin:
+       . nautilus-actions-new lets you create new actions from the command-line;
+       . nautilus-actions-run lets you execute a predefined action, taking
+         into account the current Nautilus selection via a DBus call to the
+         libnautilus-actions-tracker plugin;
+    b) installed in PKGLIBEXECDIR:
+       . na-print-schemas prints the full GConf schemas on stdout;
+       . na-delete-xmltree deletes a tree from a XML file;
+       . na-gconf2keys.sh migrates menus, actions and user preferences from
+         GConf to files.
 
 Nautilus-Actions plugins.
 
diff --git a/README-GCONF b/README-GCONF
index 2ccdb2d3..3e41dc17 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -4,7 +4,7 @@ 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 migration
+ Starting with 3.1.0, Nautilus-Actions is distributed 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).
  
-- 
2.11.4.GIT