browser-switch
14 years agoMerge commit 'v3.1' into diablo-package
Steven Luo [Fri, 15 Jan 2010 09:53:03 +0000 (01:53 -0800)]
Merge commit 'v3.1' into diablo-package

14 years agoRemove webpages for release v3.1
Steven Luo [Fri, 15 Jan 2010 08:26:48 +0000 (00:26 -0800)]
Remove webpages for release

14 years agoBump version number in README/Changelog
Steven Luo [Fri, 15 Jan 2010 08:25:37 +0000 (00:25 -0800)]
Bump version number in README/Changelog

14 years agoSpelling/grammar fixes to comments
Steven Luo [Tue, 5 Jan 2010 07:36:33 +0000 (23:36 -0800)]
Spelling/grammar fixes to comments

14 years agoUpdate Changelog
Steven Luo [Tue, 5 Jan 2010 06:17:52 +0000 (22:17 -0800)]
Update Changelog

14 years agoAdd support for EXTRA_CPPFLAGS/EXTRA_LDFLAGS in Makefiles
Steven Luo [Tue, 5 Jan 2010 06:16:25 +0000 (22:16 -0800)]
Add support for EXTRA_CPPFLAGS/EXTRA_LDFLAGS in Makefiles

14 years agoUpdate copyright notices
Steven Luo [Tue, 5 Jan 2010 06:07:55 +0000 (22:07 -0800)]
Update copyright notices

14 years agoDiablo: disable autocap/predictive text for the other_browser_cmd entry
Steven Luo [Tue, 5 Jan 2010 05:47:50 +0000 (21:47 -0800)]
Diablo: disable autocap/predictive text for the other_browser_cmd entry

The Fremantle UI introduced in commit 18bad5e9... ("Revise GUI for
Fremantle to be more finger-friendly") disables autocapitalization and
predictive text/dictionary features for the other_browser_cmd entry --
those input method features are for natural language text only, and get
in the way here.  Now do the same for the Diablo UI (and make a style
cleanup along the way).

14 years agoRevise GUI for Fremantle to be more finger-friendly
Steven Luo [Tue, 5 Jan 2010 05:19:26 +0000 (21:19 -0800)]
Revise GUI for Fremantle to be more finger-friendly

Make the GUI for Fremantle more finger-friendly by making the widgets
larger and using HildonTouchSelector widgets in place of combo
box/radiobutton widgets.

Based on a patch by Faheem Pervez (qwerty12):
http://slexy.org/view/s2JL7ye01p

14 years agoEnsure reconfig signal doesn't interrupt request dispatch when (!continuous_mode)
Steven Luo [Tue, 5 Jan 2010 02:38:44 +0000 (18:38 -0800)]
Ensure reconfig signal doesn't interrupt request dispatch when (!continuous_mode)

If SIGHUP is sent to a browser-switchboard process with continuous mode
off, the process will quit.  This is the right thing to do in most cases
(the next request will relaunch the process, at which point it'll read
the new config), but if we're in the middle of dispatching a request
when the signal arrives, quitting immediately will cause the request to
be lost.

Since browser-switchboard quits upon completion of a request when
continuous mode is off anyway, fix this by just ignoring SIGHUP while
handling requests when continuous mode is off.

14 years agoUpdate webpage to recommend installation from extras
Steven Luo [Mon, 28 Dec 2009 09:58:22 +0000 (01:58 -0800)]
Update webpage to recommend installation from extras

14 years agoAdd an .install file for installing from extras
Steven Luo [Mon, 28 Dec 2009 09:31:14 +0000 (01:31 -0800)]
Add an .install file for installing from extras

14 years agoUpdate current release section of webpage, link to new forum thread
Steven Luo [Thu, 24 Dec 2009 02:50:02 +0000 (18:50 -0800)]
Update current release section of webpage, link to new forum thread

14 years agoUpdate webpage, add some screenshots
Steven Luo [Thu, 24 Dec 2009 02:43:58 +0000 (18:43 -0800)]
Update webpage, add some screenshots

14 years agoUpdate debian/changelog diablo-package-3.0-1
Steven Luo [Wed, 23 Dec 2009 11:56:34 +0000 (03:56 -0800)]
Update debian/changelog

14 years agoRemove debian/dirs, not needed with new Makefile-based build
Steven Luo [Wed, 23 Dec 2009 11:55:12 +0000 (03:55 -0800)]
Remove debian/dirs, not needed with new Makefile-based build

14 years agoUpdate debian/changelog
Steven Luo [Wed, 23 Dec 2009 11:48:46 +0000 (03:48 -0800)]
Update debian/changelog

14 years agoMerge commit 'v3.0' into diablo-package
Steven Luo [Wed, 23 Dec 2009 11:40:22 +0000 (03:40 -0800)]
Merge commit 'v3.0' into diablo-package

14 years agoReadd webpage
Steven Luo [Wed, 23 Dec 2009 11:33:18 +0000 (03:33 -0800)]
Readd webpage

14 years agoUpdate README and Changelog v3.0
Steven Luo [Wed, 23 Dec 2009 11:31:46 +0000 (03:31 -0800)]
Update README and Changelog

14 years agoRemove webpage for release tarball
Steven Luo [Wed, 23 Dec 2009 11:31:33 +0000 (03:31 -0800)]
Remove webpage for release tarball

14 years agoUpdate webpage
Steven Luo [Sat, 19 Dec 2009 06:58:55 +0000 (22:58 -0800)]
Update webpage

14 years agoActually use EXTRA_CFLAGS
Steven Luo [Sat, 19 Dec 2009 06:28:08 +0000 (22:28 -0800)]
Actually use EXTRA_CFLAGS

Pass EXTRA_CFLAGS to make.  Also, fix a thinko that caused build to
fail on armel (use -mcpu, not -march).

14 years agoRemove the webpages on this branch
Steven Luo [Sat, 19 Dec 2009 06:16:56 +0000 (22:16 -0800)]
Remove the webpages on this branch

14 years agoOptimize for N8x0 on armel builds, and use Thumb if requested
Steven Luo [Sat, 19 Dec 2009 06:14:54 +0000 (22:14 -0800)]
Optimize for N8x0 on armel builds, and use Thumb if requested

14 years agoMerge branch 'master' into diablo-package
Steven Luo [Sat, 19 Dec 2009 06:09:06 +0000 (22:09 -0800)]
Merge branch 'master' into diablo-package

14 years agoSupport EXTRA_CFLAGS in Makefiles
Steven Luo [Sat, 19 Dec 2009 06:07:27 +0000 (22:07 -0800)]
Support EXTRA_CFLAGS in Makefiles

This makes it possible to specify additional CFLAGS at build time.

14 years agoBump Standards-Version
Steven Luo [Sat, 19 Dec 2009 06:02:01 +0000 (22:02 -0800)]
Bump Standards-Version

14 years agoUse pkg-config libosso instead of pkg-config dbus-1 for the plugin
Steven Luo [Sat, 19 Dec 2009 02:48:35 +0000 (18:48 -0800)]
Use pkg-config libosso instead of pkg-config dbus-1 for the plugin

The hildon-control-panel plugin interface needs libosso to compile;
the use of pkg-config dbus-1 was just covering this up.

14 years agoUpdate changelog, bump version number diablo-package-3.0rc1-2
Steven Luo [Sat, 19 Dec 2009 03:07:46 +0000 (19:07 -0800)]
Update changelog, bump version number

14 years agoDepend on libosso-dev instead of libdbus-1-dev for the plugin
Steven Luo [Sat, 19 Dec 2009 02:48:35 +0000 (18:48 -0800)]
Depend on libosso-dev instead of libdbus-1-dev for the plugin

The hildon-control-panel plugin interface needs libosso-dev to compile;
the dependency on libdbus-1-dev and use of pkg-config dbus-1 was just
covering this up.

14 years agoUpdate webpage
Steven Luo [Fri, 18 Dec 2009 15:08:15 +0000 (07:08 -0800)]
Update webpage

14 years agoDeal with `pidof browser-switchboard` returning no pids diablo-package-3.0rc1-1
Steven Luo [Fri, 18 Dec 2009 13:07:54 +0000 (05:07 -0800)]
Deal with `pidof browser-switchboard` returning no pids

14 years agoMove ${shlibs:Depends} to the front of the Depends line
Steven Luo [Fri, 18 Dec 2009 13:00:42 +0000 (05:00 -0800)]
Move ${shlibs:Depends} to the front of the Depends line

14 years agoInstall config-ui files to the right place
Steven Luo [Fri, 18 Dec 2009 13:00:12 +0000 (05:00 -0800)]
Install config-ui files to the right place

14 years agoDon't use killall to kill off C browser-switchboards
Steven Luo [Fri, 18 Dec 2009 12:56:23 +0000 (04:56 -0800)]
Don't use killall to kill off C browser-switchboards

killall killed off the postrm, so use kill and pidof instead.

14 years agoRevert "Don't use killall to kill off browser-switchboards in postrm"
Steven Luo [Fri, 18 Dec 2009 12:55:27 +0000 (04:55 -0800)]
Revert "Don't use killall to kill off browser-switchboards in postrm"

This reverts commit 414af7e1dcefb4a5eb39f185c24d24c9115757d3.

This had the nasty effect of killing dpkg on an upgrade.  Will fix
differently.

14 years agoDon't use killall to HUP browser-switchboard
Steven Luo [Fri, 18 Dec 2009 12:50:12 +0000 (04:50 -0800)]
Don't use killall to HUP browser-switchboard

Use kill and pidof instead -- killall might kill a standalone config app.

14 years agoFix dependencies listed in README
Steven Luo [Fri, 18 Dec 2009 12:43:09 +0000 (04:43 -0800)]
Fix dependencies listed in README

14 years agoDon't use killall to kill off browser-switchboards in postrm
Steven Luo [Fri, 18 Dec 2009 12:29:15 +0000 (04:29 -0800)]
Don't use killall to kill off browser-switchboards in postrm

As it turns out, killall will happily kill off the postrm, which causes
the uninstall to fail.

14 years agoFix the clean target in debian/rules
Steven Luo [Fri, 18 Dec 2009 12:01:58 +0000 (04:01 -0800)]
Fix the clean target in debian/rules

14 years agoUse DESTDIR for make install
Steven Luo [Fri, 18 Dec 2009 12:00:33 +0000 (04:00 -0800)]
Use DESTDIR for make install

14 years agoNote cherry-picked commit in debian/changelog
Steven Luo [Fri, 18 Dec 2009 11:57:33 +0000 (03:57 -0800)]
Note cherry-picked commit in debian/changelog

14 years agoUpdate debian/changelog
Steven Luo [Fri, 18 Dec 2009 11:48:38 +0000 (03:48 -0800)]
Update debian/changelog

14 years agoconfig-ui: Teach UI how to HUP C browser-switchboards
Steven Luo [Fri, 18 Dec 2009 11:41:06 +0000 (03:41 -0800)]
config-ui: Teach UI how to HUP C browser-switchboards

14 years agoconfig-ui: Teach UI how to HUP C browser-switchboards
Steven Luo [Fri, 18 Dec 2009 11:41:06 +0000 (03:41 -0800)]
config-ui: Teach UI how to HUP C browser-switchboards

14 years agoUpdate packaging for the C implementation
Steven Luo [Fri, 18 Dec 2009 11:38:24 +0000 (03:38 -0800)]
Update packaging for the C implementation

With the introduction of object code, this is now an Arch: any package;
revise debian/control and debian/rules accordingly.  Also add the
appropriate Build-Depends, and readd the ${shlibs:Depends} in Depends in
debian/control.  Teach debian/postrm how to kill off C
browser-switchboards.

14 years agoMerge commit 'v3.0rc1' into diablo-package
Steven Luo [Fri, 18 Dec 2009 11:28:39 +0000 (03:28 -0800)]
Merge commit 'v3.0rc1' into diablo-package

14 years agoReadd the webpage
Steven Luo [Fri, 18 Dec 2009 11:17:48 +0000 (03:17 -0800)]
Readd the webpage

www got clobbered in the merge.

14 years agoAdd the version number to the README c-implementation v3.0rc1
Steven Luo [Fri, 18 Dec 2009 11:13:08 +0000 (03:13 -0800)]
Add the version number to the README

14 years agoUpdate Changelog and README
Steven Luo [Fri, 18 Dec 2009 11:12:39 +0000 (03:12 -0800)]
Update Changelog and README

14 years agoDefault to launching MicroB if default_browser is unset
Steven Luo [Fri, 18 Dec 2009 10:40:00 +0000 (02:40 -0800)]
Default to launching MicroB if default_browser is unset

The check-for-Tear-and-use-MicroB-otherwise hack was only until we got a
config UI.  Now that we have one, it's easiest just to keep MicroB as
the default until the user configures browser-switchboard.

14 years agoMake the default prefix /usr
Steven Luo [Fri, 18 Dec 2009 10:35:16 +0000 (02:35 -0800)]
Make the default prefix /usr

We're already assuming this in several places, and it's too much work to
make those files autogenerated when no one's going to use that feature.

14 years agoconfig-ui: the strip and install targets only work for the plugin
Steven Luo [Fri, 18 Dec 2009 10:29:09 +0000 (02:29 -0800)]
config-ui: the strip and install targets only work for the plugin

14 years agoEnsure that all objects for the plugin are built with -fPIC
Steven Luo [Fri, 18 Dec 2009 10:27:14 +0000 (02:27 -0800)]
Ensure that all objects for the plugin are built with -fPIC

14 years agomkdir all the directories to which we install files, not just some of them
Steven Luo [Fri, 18 Dec 2009 10:25:26 +0000 (02:25 -0800)]
mkdir all the directories to which we install files, not just some of them

14 years agoMerge branch 'config-ui' into c-implementation
Steven Luo [Fri, 18 Dec 2009 10:23:12 +0000 (02:23 -0800)]
Merge branch 'config-ui' into c-implementation

14 years agoRemove the N8x0-specific CFLAGS
Steven Luo [Fri, 18 Dec 2009 07:21:05 +0000 (23:21 -0800)]
Remove the N8x0-specific CFLAGS

These should move to packaging.

14 years agoRemove the N8x0-specific CFLAGS config-ui
Steven Luo [Fri, 18 Dec 2009 07:20:15 +0000 (23:20 -0800)]
Remove the N8x0-specific CFLAGS

These should move to packaging.

14 years agoHUP running browser-switchboard processes after saving config
Steven Luo [Thu, 17 Dec 2009 14:56:34 +0000 (06:56 -0800)]
HUP running browser-switchboard processes after saving config

Sending SIGHUP to a running browser-switchboard in continuous mode
causes it to reload its config.  If not in continuous mode, it'll die
and the next browser-switchboard will pick up the config changes.

14 years agoUse a stock GTK+ dialog
Steven Luo [Thu, 17 Dec 2009 14:34:40 +0000 (06:34 -0800)]
Use a stock GTK+ dialog

Use the stock OK/Cancel GTK+ dialog instead of making our own.  Also
use the response from gtk_dialog_run() to decide whether to save instead
of using custom callbacks for the buttons.  Should make the dialog more
Maemo 5 friendly.

Also, eliminate some unnecessary crap in the hildon-control-panel plugin
path, and reintroduce do_reconfig() in preparation for adding HUPing of
a running browser-switchboard.

14 years agoDon't execute hildon_program_get_instance() before gtk_init()
Steven Luo [Thu, 17 Dec 2009 14:05:23 +0000 (06:05 -0800)]
Don't execute hildon_program_get_instance() before gtk_init()

Shuts up some runtime assertions in the Hildon app.

14 years agoReplace the continuous_mode checkbox with a radiobutton group
Steven Luo [Thu, 17 Dec 2009 13:56:13 +0000 (05:56 -0800)]
Replace the continuous_mode checkbox with a radiobutton group

The wording of the continuous mode checkbox confused 100% of respondents
in an unscientific poll, and no one (including me) could come up with
better wording.

Instead, take a suggestion from Robin Luo, and try a radiobutton group
where the choices reflect the observed effect (continuous_mode off =
"Lower memory usage", continuous_mode on = "Faster browser startup
time"), not the implementation.

14 years agoAdd some padding at sides and bottom of the window
Steven Luo [Thu, 17 Dec 2009 13:06:53 +0000 (05:06 -0800)]
Add some padding at sides and bottom of the window

The widgets were going right up to the edge of the window, which looks
wrong; fix this by adding padding where it's needed.

14 years agoTry to create CONFIGFILE_DIR if it doesn't exist
Steven Luo [Thu, 17 Dec 2009 12:49:37 +0000 (04:49 -0800)]
Try to create CONFIGFILE_DIR if it doesn't exist

14 years agoMerge changes to configfile.h from c-implementation branch
Steven Luo [Thu, 17 Dec 2009 12:42:12 +0000 (04:42 -0800)]
Merge changes to configfile.h from c-implementation branch

Need CONFIGFILE_DIR from this change.

14 years agoSplit up CONFIGFILE_LOC into CONFIGFILE_DIR and CONFIGFILE_NAME
Steven Luo [Thu, 17 Dec 2009 12:40:28 +0000 (04:40 -0800)]
Split up CONFIGFILE_LOC into CONFIGFILE_DIR and CONFIGFILE_NAME

The config UI needs to be able to create CONFIGFILE_DIR if it doesn't
exist, so make this easier on it.

14 years agoDon't explicitly set a size for the dialog
Steven Luo [Thu, 17 Dec 2009 12:14:27 +0000 (04:14 -0800)]
Don't explicitly set a size for the dialog

14 years agoUse the browser logo for our control panel applet for now
Steven Luo [Thu, 17 Dec 2009 12:08:04 +0000 (04:08 -0800)]
Use the browser logo for our control panel applet for now

Until we get a custom logo, use the browser globe instead of the
generic wrench as our logo.

14 years agoAlign labels to the right, not to the left
Steven Luo [Thu, 17 Dec 2009 12:06:00 +0000 (04:06 -0800)]
Align labels to the right, not to the left

The convention on Maemo for labels to the left of combo boxes or entries
seems to be right alignment, not left alignment as on my GNOME desktop.

14 years agoMerge changes to configfile.c from c-implementation
Steven Luo [Thu, 17 Dec 2009 11:14:39 +0000 (03:14 -0800)]
Merge changes to configfile.c from c-implementation

Fixes a crash in the UI.

14 years agoMake parse_config_file_end() clear re_init
Steven Luo [Thu, 17 Dec 2009 11:12:12 +0000 (03:12 -0800)]
Make parse_config_file_end() clear re_init

Without this, another call to parse_config_file_begin() does nothing,
which causes a crash in parse_config_file_line().

14 years agoStyle changes
Steven Luo [Thu, 17 Dec 2009 11:11:34 +0000 (03:11 -0800)]
Style changes

14 years agoImplement loading and saving config settings
Steven Luo [Thu, 17 Dec 2009 11:08:11 +0000 (03:08 -0800)]
Implement loading and saving config settings

14 years agoRemove maemo.org contact address from copyright notice
Steven Luo [Thu, 17 Dec 2009 08:02:44 +0000 (00:02 -0800)]
Remove maemo.org contact address from copyright notice

The maemo/Nokia folks aren't responsible for this code in any way, so
don't give that impression.

14 years agoMerge config file parsing routines from the c-implementation branch
Steven Luo [Thu, 17 Dec 2009 08:00:00 +0000 (00:00 -0800)]
Merge config file parsing routines from the c-implementation branch

14 years agoRemove unnecessary #includes
Steven Luo [Thu, 17 Dec 2009 07:57:34 +0000 (23:57 -0800)]
Remove unnecessary #includes

14 years agoZap stray debugging printf()s
Steven Luo [Thu, 17 Dec 2009 07:48:27 +0000 (23:48 -0800)]
Zap stray debugging printf()s

14 years agoMove the regex #defines to configfile.c
Steven Luo [Thu, 17 Dec 2009 07:47:00 +0000 (23:47 -0800)]
Move the regex #defines to configfile.c

They're not needed anywhere else, so no need for them to be in the
header file.

14 years agoSwitch the proxy over to use shared config file parsing functions
Steven Luo [Thu, 17 Dec 2009 07:42:32 +0000 (23:42 -0800)]
Switch the proxy over to use shared config file parsing functions

14 years agoAdd independent config file parsing functions
Steven Luo [Thu, 17 Dec 2009 07:31:51 +0000 (23:31 -0800)]
Add independent config file parsing functions

Config file parsing will also be needed by the config UI, so break out
into its own function so that it can be shared between the config UI
and the C implementation.

14 years agoInitial refactor of config file handling
Steven Luo [Wed, 16 Dec 2009 12:02:08 +0000 (04:02 -0800)]
Initial refactor of config file handling

Move the config file locating code, the location #defines, and the
parsing regexes into new files, so that they can be shared by the config
UI.

14 years agoAdd a .desktop file for the control panel plugin
Steven Luo [Tue, 15 Dec 2009 14:21:07 +0000 (06:21 -0800)]
Add a .desktop file for the control panel plugin

The .desktop file is needed for hildon-control-panel to pick up the
applet.  Modify the Makefile to install it, and also fix a silly
plugin installation bug in the process.

14 years agoMakefile updates
Steven Luo [Tue, 15 Dec 2009 14:07:27 +0000 (06:07 -0800)]
Makefile updates

Make three build modes (app, hildon-app, plugin) instead of two, and use
up pkg-config flags so that the plugin mode actually builds.

14 years agoCompile fix for the Hildon control panel applet
Steven Luo [Tue, 15 Dec 2009 14:06:57 +0000 (06:06 -0800)]
Compile fix for the Hildon control panel applet

14 years agoShrink dialog window width/height
Steven Luo [Tue, 15 Dec 2009 14:00:14 +0000 (06:00 -0800)]
Shrink dialog window width/height

Shrink the window a bit so that it doesn't look so ridiculously large.

14 years agoCommit the beginnings of a config UI
Steven Luo [Tue, 15 Dec 2009 13:32:42 +0000 (05:32 -0800)]
Commit the beginnings of a config UI

UI doesn't actually do anything other than look pretty yet.

14 years agoGet rid of www on this branch
Steven Luo [Tue, 15 Dec 2009 10:42:45 +0000 (02:42 -0800)]
Get rid of www on this branch

14 years agoBe more consistent with debug printf()s for the launcher functions
Steven Luo [Tue, 15 Dec 2009 06:43:23 +0000 (22:43 -0800)]
Be more consistent with debug printf()s for the launcher functions

14 years agoAdd some comments to the code
Steven Luo [Tue, 15 Dec 2009 06:37:53 +0000 (22:37 -0800)]
Add some comments to the code

Restore some of the comments from the Python script, plus a few other
points that might make the code clearer.

14 years agoTry legacy config file location if config file not found
Steven Luo [Tue, 15 Dec 2009 06:14:27 +0000 (22:14 -0800)]
Try legacy config file location if config file not found

Before we renamed the project, the config file used to be found in
$HOME/.config/browser-proxy, so if we don't find a config file in the
new place, try the old one before giving up.

14 years agoLaunch MicroB if default_browser not set and Tear isn't installed
Steven Luo [Tue, 15 Dec 2009 06:07:28 +0000 (22:07 -0800)]
Launch MicroB if default_browser not set and Tear isn't installed

Change the handling of default_browser == NULL in
update_default_browser() to check for the presence of Tear before
setting it as the default browser, and to use MicroB as the default
otherwise.

14 years agoMerge branch 'www'
Steven Luo [Mon, 14 Dec 2009 14:13:25 +0000 (06:13 -0800)]
Merge branch 'www'

14 years agoInitial revision of the homepage.
Steven Luo [Mon, 14 Dec 2009 14:10:19 +0000 (06:10 -0800)]
Initial revision of the homepage.

14 years agoActually provide a friendly name for the package diablo-package-python-implementation diablo-package-2.2-1
Steven Luo [Mon, 14 Dec 2009 12:21:02 +0000 (04:21 -0800)]
Actually provide a friendly name for the package

Without the XB- prefix, debhelper doesn't recognize the line and drops
it.

14 years agoDon't try to support installing over browser-proxy
Steven Luo [Mon, 14 Dec 2009 12:20:00 +0000 (04:20 -0800)]
Don't try to support installing over browser-proxy

The diversions seem to make it impossible to support directly installing
over browser-proxy without a dummy package, and that's not worth it
given that we're not in any repositories yet.  So just conflict with
browser-proxy to make sure no one tries to install directly over, and
tell users to remove browser-proxy instead.

14 years agoUpdate debian/changelog
Steven Luo [Mon, 14 Dec 2009 11:40:20 +0000 (03:40 -0800)]
Update debian/changelog

14 years agoAdd a Maemo-Display-Name for the GUI application manager
Steven Luo [Mon, 14 Dec 2009 11:40:00 +0000 (03:40 -0800)]
Add a Maemo-Display-Name for the GUI application manager

14 years agoMerge documentation updates from 2.2 into c-implementation
Steven Luo [Mon, 14 Dec 2009 11:27:51 +0000 (03:27 -0800)]
Merge documentation updates from 2.2 into c-implementation

14 years agoMerge commit 'v2.2' into diablo-package
Steven Luo [Mon, 14 Dec 2009 11:22:29 +0000 (03:22 -0800)]
Merge commit 'v2.2' into diablo-package