Update gcconfig.pri.in for latest libkml

.. minimum versions (i.e. 64bit) .. additional dependencies (minizip etc)
Repaint in DiaryWindow
2026-02-13 16:18:42 +00:00 · 2013-03-31 16:01:44 +01:00 · 2013-03-31 14:46:34 +01:00 · 2013-03-31 13:10:54 +01:00 · 2013-03-31 02:05:06 +01:00 · 2013-03-31 00:59:32 +00:00
1275 changed files with 305722 additions and 40614 deletions
--- a/403
+++ b/403
@@ -0,0 +1,403 @@
+                                 +++++++++++++++++++++++
+                                 LINUX BUILD WALKTHROUGH
+                                 +++++++++++++++++++++++
+
+                                     Mark Liversedge
+                                     John Ehrlinger
+
+                                        May 2011
+                                      Version 1.1
+
+A walkthrough of building GoldenCheetah from scratch on Ubuntu linux. This walkthrough
+should be largely the same for any Linux distro.
+
+CONTENTS
+
+1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
+   - QT
+   - git
+
+2. ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 2
+   - FTDI D2XX
+   - SRMIO
+   - liboauth
+   - QwtPlot3d
+   - libkml
+
+3. ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 3
+   - checking out the release 3 branch & building with MANDATORY dependencies
+     - flex
+     - bison
+   - libical - Diary window and CalDAV support (google/mobileme calendar integration)
+   - libvlc  - Video playback in training mode
+   - clucene - Indexing/Searching ride files
+
+
+1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
+=================================================
+
+Installed Ubuntu 11.04 from CD image amd-64.iso. You will not need to do this if you
+already have a Linux distribution installed. Left this step in to highlight the
+Linux distribution the commands below were executed on.
+
+login and open a terminal to get a shell prompt
+
+Download MANDATORY DEPENDENCIES (browser)
+-----------------------------------------
+Download Qt-sdk1.1 from http://developer.qt.nokia.com/prereleases, chose Linux 64-bit
+Run the Qt installer (need to chmod +x it first) and install to default location (home)
+Put qmake in path (e.g. sudo cp ~/QtSDK/Desktop/Qt/473/gcc/bin/qmake /usr/local/bin)
+Test qmake is ok with: qmake --version (should report 4.7.0 or higher)
+
+Install git with:
+$ sudo apt-get install git
+Said Y to prompt about all git files installed (git-gui et al)
+
+Install FLEX and BISON
+----------------------
+
+You will need flex v2.5.9 or later
+$ sudo apt-get install bison
+$ sudo apt-get install flex
+$ vi gcconfig.pri
+
+Ensure you have the following lines (which are now also in gcconfig.pri.in which has
+been updated to reflect the new dependencies in version 3)
+
+QMAKE_LEX  = flex
+QMAKE_YACC = bison
+win32 {
+  QMAKE_YACC = bison --file-prefix=y -t
+  QMAKE_MOVE = cmd /c move
+  QMAKE_DEL_FILE = rm -f
+}
+
+Build!
+------
+$ make clean
+$ qmake
+$ make
+
+You will now have a release3 binary but with none of the release3 dependencies compiled in.
+Get latest GOLDEN CHEETAH source files
+--------------------------------------
+$ mkdir -p ~/Projects/Live
+$ cd ~/Projects/Live
+$ git clone git://github.com/GoldenCheetah/GoldenCheetah.git
+$ cd GoldenCheetah
+
+Configure MANDATORY DEPENDENCIES
+--------------------------------
+$ cd qwt
+$ cp qwtconfig.pri.in qwtconfig.pri
+$ cd ../src
+$ cp gcconfig.pri.in gcconfig.pri
+$ vi gcconfig.pri
+
+Comment out the D2XX_INCLUDE and SRMIO_INSTALL lines for now (put # in first character of the line
+to comment out), we will install that in a moment, if we need to.
+
+If you are building for your local host you may find that you get better performance if
+compiling with gcc -O3 (tree vectorization can have a significat impact) [or -Ofast]
+
+If so you might like to uncomment:
+
+QMAKE_CXXFLAGS += -O3
+
+Save and exit
+
+$ cd ..
+
+BUILD WITH BASIC CONFIGURATION
+$ qmake -recursive
+$ make
+
+Congratulations you have now build a basic GoldenCheetah and can run this safely. See below for
+optional dependencies you can install to support other features.
+
+ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 2
+====================================================
+
+D2XX - For Powertap downloads via USB
+-------------------------------------
+
+Download the FTDI drivers from http://www.ftdichip.com/Drivers/D2XX.htm (e.g. I used Linux 
+64-bit drivers from http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx1.0.4.tar.gz)
+
+Extract into your home directory (I put mine into ~/Projects/ with archive manager which
+created a sub-directory ~/Projects/libftd2xx1.0.4
+
+$ cd src
+$ vi gcconfig.pri
+
+Uncomment the D2XX_INCLUDE entry and make it match (my home is /home/markl)
+D2XX_INCLUDE = /home/markl/libftd2xx1.0.4
+
+Make clean is needed if you have previouslt built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
+$ make clean
+$ qmake
+$ make
+
+You now have D2XX support, for downloading from a PT via a USB cradle.
+
+SRMIO - For SRM powercontrol V downloads via Serial
+---------------------------------------------------
+
+$ cd ~/Projects
+$ git clone git://github.com/rclasen/srmio srmio
+$ cd srmio
+
+Get automake and tools, if you don't already have them (I didn't after a fresh install)
+$ sudo apt-get install automake
+$ sudo apt-get install libtool
+
+Generate the configure script, run it, build and install srmio
+$ sh genautomake.sh
+$ ./configure
+$ make
+$ sudo make install
+
+Lets go config GC and build with SRMIO
+$ cd ~/Projects/Live/GoldenCheetah/src
+$ vi gcconfig.pri
+
+Uncomment the SRMIO_INSTALL and replace with the target used from srmio install:
+SRMIO_INSTALL = /usr/local/
+
+At the bottom of gcconfig.pri you will see the include directory should reference from
+the base install location (/usr/local) make sure it says:
+
+SRMIO_INCLUDE = $${SRMIO_INSTALL}/include
+SRMIO_LIB = $${SRMIO_INSTALL}/lib/libsrmio.a
+
+Make clean is needed if you have previouslt built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
+$ make clean
+$ qmake
+$ make
+
+You now have SRM support built in.
+
+OAUTH/CRYPT - For Tweet my ride (twitter) support
+-------------------------------------------------
+
+You should be able to install liboauth and dependencies
+directly with:
+$ sudo apt-get install liboauth-dev
+
+If this does not work then:
+
+    Download the source from: http://sourceforge.net/projects/liboauth/files/liboauth-0.9.4.tar.gz/download and
+    unpack it into ~/Projects/liboauth-0.9.4 using archive manager
+
+    $ cd ~/Projects/liboauth-0.9.4
+
+    You may find that libcurl is not installed (which liboauth depends upon) so download it
+    from http://curl.haxx.se/download/curl-7.21.6.tar.gz and unpack it into ~/Projects/curl-7.21.6
+    using archive manager to drag and drop into your Projects folder
+
+    $ cd ~/Projects/curl-7.21.6
+    $ ./configure
+    $ make
+    $ sudo make install
+
+    You should now have libcurl and friends installed in /usr/local
+
+    You may find that liboauth also requires the openssl libs installed, these are available
+    pre-packaged thankfully so:
+    $ sudo apt-get install libssl-dev
+
+    This will also install zlibg which liboauth also desires.
+
+    $ cd ~/Projects/liboauth-0.9.4
+    $ ./configure
+    $ make
+    $ sudo make install
+
+Now we have liboauth and libcurl in /usr/local and libssl in /usr/lib, so we can go back to
+GoldenCheetah and update the gcconfig.pri to point at the right places:
+
+$ cd ~/Projects/Live/GoldenCheetah/src
+$ vi gcconfig.pri
+
+Make sure the following are set:
+LIBOAUTH_INSTALL = /usr/local
+LIBCRYPTO_INSTALL = -lcrypto
+LIBCURL_INSTALL=-lcurl
+
+Make clean is needed if you have previously built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
+$ make clean
+$ qmake
+$ make
+
+You can now tweet your rides and amaze your friends, or alternatively tweet your rides but
+omit to mention average power to hide your weaknesses.
+
+LIBQWTPLOT3D - For 3D plot
+--------------------------
+
+Download the tarball from http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d/branches/maintain_0_2_x/qwtplot3d/?view=tar
+and unarchive it into your Projects directory using archive manager. There is no version number it just creates a
+subdirectory called qwtplot3d
+
+You will need to install libgl and extensions, this can be done with;
+$ sudo apt-get install libgl1-mesa-dev
+$ sudo apt-get install libglu-dev
+
+On Ubuntu 12.10 I also ran
+$ sudo apt-get install freeglut3 freeglut3-dev
+
+$ cd ~/Projects/qwtplot3d
+Edit the qwtplot3d.pri and add
+CONFIG += staticlib
+
+You will find that on modern Linuxes you also need to fix include/qwt3d_global.h by adding the line:
+#include <GL/glu.h>
+
+then build
+$ qmake
+$ make
+
+Then to let gc know where the qwtplot3d libs are you need to edit gcconfig.pri;
+$ cd ~/Projects/Live/GoldenCheetah/src
+$ vi gcconfig.pri
+
+And uncomment the following line and set the install directory to where you build
+QWT3D_INSTALL = ~/Projects/qwtplot3d
+
+
+
+LIBKML - For export to Google Earth
+-----------------------------------
+
+You will need Google Earth 5.2 or later and therefore libkml that supports this. Unfortunately at the time of writing
+the officially packaged libkml is too old, so you will need to install from source, which means you will need to have
+subversion installed and expat. You may be able to use the currently packaged libkml with
+
+$ sudo apt-get install libkml-dev
+
+if this does not work you will need to build from source:
+
+    $ sudo apt-get install subversion
+    $ sudo apt-get install expat libexpat1 libexpat1-dev
+
+    Once svn is installed you can grab the libkml source and configure build etc:
+    $ cd ~/Projects
+    $ svn checkout http://libkml.googlecode.com/svn/trunk/ libkml
+    $ cd libkml
+
+    You will need automake and friends (see SRMIO above)
+    $ sh autogen.sh
+    $ ./configure
+    $ make
+    $ make install
+    $ sudo make install
+
+    If you get errors about use of 'long long' then edit:
+    - src/kml/{convenience,dom,engine,regionator,xsd}/Makefile
+    - examples/{engine,gpx,gx,hellonet,helloworld,regionator,xsd}/Makefile
+    - and look for the flag -pedantic and remove it. I got this on Linux 64bit builds ymmv.
+
+Once libkml is installed and built:
+
+$ cd ~/Projects/Live/GoldenCheetah/src
+$ vi gcconfig.pri
+
+Ensure KML_INSTALL=/usr/local
+
+Make clean is needed if you have previously built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
+$ make clean
+$ qmake
+$ make
+
+You can now export rides to Google Earth kml format.
+
+ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 3
+====================================================
+
+
+NOTE: When you run version 3 it will refresh ride metrics and CP files -- this only occurs the
+      first time it runs (and will refresh only rides that change after that). I find it is best
+      to import ride files once your build where you want it. i.e. don't import until you have
+      got all your dependencies sorted.
+
+NOTE: To reduce the dependencies on 'dormant' code there are a number of new pieces of source
+      that are included in the release3 tree. Notably; qtsoap from qt-solutions, since they
+      work but are likely to be archived and deprecated. If and when that happens we may well
+      adopt whatever classes Trolltech introduce.
+
+
+LIBICAL - Diary integration with Google or MobileMe calendars
+-------------------------------------------------------------
+
+$ cd ~/Projects/Live/GoldenCheetah/src
+
+$ sudo apt-get install libical-dev
+$ vi gcconfig.pri
+
+ICAL_INSTALL=/usr/include
+ICAL_LIBS=-lical
+
+Since the src.pro wants ICAL installed in a different place we need to hack it, *** this will
+be fixed shortly ***
+
+$ vi src.pro
+
+Comment out the ICAL_LIBS entry:
+
+#ICAL_LIBS = $${ICAL_INSTALL}/lib/libical.a
+
+$ make clean
+$ qmake
+$ make
+
+You should now have diary functions.
+
+NOTE: That upload to MobileMe and Google requires a functioning https lib in QT. Depending
+      upon the version installed this might not be the case and will need to be built and
+      configured -- this is beyond the scope of this walkthough. Sorry.
+
+LIBVLC - Video playback in Realtime (Experimental)
+--------------------------------------------------
+
+You will need libvlc 1.1.9 or higher (1.1.8 is ok but will segv on exit)
+$ sudo apt-get install libvlc-dev
+
+$ vi gcconfig.pri
+
+Comment out VLC_INSTALL and it should read:
+
+VLC_INSTALL = /usr/include/vlc/
+
+$ make clean
+$ qmake
+$ make
+
+CLUCENE - Indexing and Searching ride files (search box)
+--------------------------------------------------------
+
+You will need clucene runtime and core libraries, we developed against 0.9.21b-2 but
+any 0.9 branch should work fine, let us know if you experience any issues. You may find
+that the libclucene0ldbl runtime is already installed, this is fine and typical since
+clucene is a very popular search library.
+
+$ sudo apt-get install libclucene-dev
+$ sudo apt-get install libclucene0ldbl
+
+By default, and this is deliberate, the clucene install places the config headers into
+a platform specific location. For my install I just copy the platform (linux) specific
+header config into the normal /usr/include/CLucene directory with the following:
+
+$ sudo cp /usr/lib/CLucene/clucene-config.h /usr/include/CLucene
+
+Next we need to comment out the two CLUCENE lines in gcconfig.pri and they should read:
+
+CLUCENE_INCLUDE = /usr/include/CLucene
+CLUCENE_LIBS    = -lclucene
+
+$ make clean
+$ qmake
+$ make
--- a/311
+++ b/311
@@ -0,0 +1,311 @@
+                                 +++++++++++++++++++++++
+                                MAC OSX BUILD WALKTHROUGH
+                                 +++++++++++++++++++++++
+
+                                     Mark Liversedge
+
+                                        Nov 2011
+                                      Version 1.1
+
+A walkthrough of building GoldenCheetah from scratch on Mac OSX. This was performed
+on Mac OSX Lion (10.7) but the instructions are largely the same for all versions of
+Mac OS X.
+
+CONTENTS
+
+1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
+   - Xcode
+   - Qt
+
+2. ADDING OPTIONAL DEPENDENCIES
+   - FTDI D2XX
+   - SRMIO
+   - liboauth
+   - QwtPlot3d
+   - libkml
+   - libusb
+   - libical
+   - libclucene
+
+
+1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
+=================================================
+
+Depending upon the speed of your internet connection and availability of the
+required software the steps in section 1 will take approximately 1 hour.
+
+1.1 Ensure OS X is up-to-date
+-----------------------------
+
+Make sure you have applied all the latest updates to Mac OS X. This can be
+found from the system menu, apple, about this mac, software update.
+
+This walkthrough was performed on an iMac running 10.7.2 (Lion)
+
+1.2 Install XCode from App Store
+--------------------------------
+
+If you are building on 10.6 or higher you should install Xcode4, for earlier
+releases you will need Xcode 3.1.4. If you have capable hardware you should
+consider upgrading to Lion to get the latest bug fixes and capabilities.
+
+To install Xcode on Lion you need to download it via the App Store. You can
+launch the App Store from launchpad, or it may be already in your dock.
+
+Under the search box type in Xcode and it will return a few optios, generally
+Xcode is the first item and shows a blueprint with a hammer icon. Click on
+this to install it. It should be free. The usual app store process will apply
+as the application is downloaded and installed. The download is about 2GB
+so do bear this in mind if you have limits on your internet bandwidth or cap.
+
+1.3 Run the Xcode installer
+---------------------------
+
+The app store download will have added an Install Xcode icon in the launchpad.
+Go ahead and run it.
+
+Xcode includes all the development tools such as a compiler, debugger and
+SDKs. It also installs the 'git' tool for working with Git repositories.
+
+It will run through a wizard to install, just read and then accept the license
+agreement and let it get on with it. If you don't like the license then quit
+and use the development builds from goldencheetah.stand2surtf.net.
+
+You may find it borks at iTunes helper running, you will
+need to force quit the iTunes helper via Finder, Applications, Utilities,
+Activity Monitor if this happens.
+
+1.4 Get the source code
+-----------------------
+
+We store all the Golden Cheetah source code on github.com, it is a great
+site holding repositories for many open source projects. 
+
+First open up a terminal session, then;
+
+$ cd
+$ mkdir Projects
+$ cd Projects
+$ git clone git://github.com/GoldenCheetah/GoldenCheetah.git
+
+You will now have the GoldenCheetah sources downloaded into a 'GoldenCheetah'
+directory in your home directory, under another folder called 'Projects'.
+
+$ cd GoldenCheetah
+$ ls
+
+You should see a number of directories such as doc, qwt, src etc. If you are
+building the latest development release you may need to check it out. At the
+time of writing the latest development release is release_3.0.0dev, if you
+want to build version 3 then you should perform the next command, otherwise 
+skip to 1.5.
+
+$ checkout release_3.0.0dev
+$ ls
+
+You will now see an updated version of this walkthrough, please jump to using
+that since it may be more up-to-date than this walkthrough (depending upon
+where you got it from of course!).
+
+1.5 Install the QT SDK
+----------------------
+
+GoldenCheetah is developed using the Nokia QT toolkit, it is large and will
+need to be downloaded and installed from their website. Alternatively, you 
+can intall qt via macports (http://www.macports.org) as described in section 
+1.5.1. 
+
+As of today, the latest stable release is 4.7.4, we need 4.7 or higher so
+go ahead and download the offline installer - it has everything you need
+but is about 1.3GB. Please make sure you download the installer for Mac
+OS X 10.6 or later, 64-bit.
+
+The url for QT downloads is: http://qt.nokia.com/downloads and whilst the
+offline installer is only 12mb it will still call back and download the
+required objects as you install, I think it is better to get it all in
+one hit (and you can save it to reinstall on another computer or if you
+want to rebuild/reinstall for any other reason).
+
+Once the QT SDK is downloaded you will have a .dmg (disk image) that you
+need to mount by double clicking on it. You will then get a volume mounted
+and shown on your desktop. Go ahead and double click that to start the install
+process. It is probably called something like 'Qt SDK Installer'.
+
+It will popup with a dialog warning that this is downloaded from the internet
+and are you sure you want to open it? Go ahead and click Open.
+
+A wizard will now guide you through the QT install process. Go ahead and accept
+all the defaults, it will install in your home directory and avoid updating the
+system directories, this means you are less likely to bork your Mac OSX installation.
+
+Read and accept the license agreement and then continue and install.
+
+We need to make sure that a program called qmake is installed in a directory where
+it can be found. So, we need to create a link from what we just installed in the
+user programs folder. For QT SDK1.1 (4.7.4) we need to:
+
+$ sudo ln -s ~/QtSDK/Desktop/Qt/474/gcc/bin/qmake /usr/bin/qmake
+
+1.5.1 Install via Mac Ports
+---------------------------
+
+If you have macports installed, you can install the qt dependices 
+with the following commands: 
+
+$ sudo port install qt4-mac
+$ sudo port install qt4-mac-sqlite3-plugin
+
+1.6 DEPRECATED
+--------------
+
+No longer need this step (install boost)
+
+1.7 Configure and Build GoldenCheetah (with no optional dependencies)
+---------------------------------------------------------------------
+
+First thing we need to do is set the build configuration, this means editing the
+private build profile settings. There is one for qwt (a charting library) and
+there is another for GoldenCheetah itself.
+
+$ cd ~/Projects/GoldenCheetah/qwt
+$ cp qwtconfig.pri.in qwtconfig.pri
+$ cd ../src
+$ cp gcconfig.pri.in gcconfig.pri
+$ vi gcconfig.pri 
+
+In that last step you can use whatever editor you feel most comfortable with.
+
+For now we will comment out some of the dependencies we have not installed
+support for yet:
+
+#SRMIO_INSTALL = /usr/local/srmio
+#D2XX_INCLUDE = /usr/local/include/D2XX
+
+we may need to additionally configure to use the local compression
+libraries (at least I did), by adding the following line:
+
+LIBS += -lz
+
+Lastly, since we are on Lion, we can also uncomment and change the following line:
+
+DEFINES += GC_HAVE_LION
+
+Once the changes have been made we are now ready to build for the first time. You
+may notice a lot of warning messages about the version of O/S not being supported.
+This is because QT does not officially support Lion at this point in time (but it
+does work). You can either ignore the warning messages or (like me) go and edit out
+the warning (once you have seen the message once you don't need reminding every
+time you compile).
+
+To do this, edit the file in question as an administrator:
+
+$ sudo vi ~/QtSDK/Desktop/Qt/474/gcc/include/QtCore/qglobal.h
+
+And comment out line 320 (or thereabouts):
+
+//#    warning "This version of Mac OS X is unsupported"
+
+Once this is done you can kick off the build:
+
+$ cd .. #this should put you in the top level dir containing this file
+$ qmake -recursive
+$ make
+
+If make fails to find a Makefile then qmake is configured, by default, to create
+an xcode project file. You will need to change the qmake command above to tell it
+to create a makefile with the following:
+$ qmake -spec macx-g++ -recursive
+$ make
+
+Once this completes you will have a GoldenCheetah.app in the src directory which
+can be launched:
+
+$ open src/GoldenCheetah.app
+
+And you're up and running.
+
+2. ADDING OPTIONAL DEPENDENCIES
+===============================
+
+   - SRMIO
+   - liboauth
+   - QwtPlot3d
+   - libkml
+   - libusb
+   - libical
+
+Since these optional dependencies are more complex and require more advanced
+technical skills we do not provide a walkthrough for building them all but
+instead provide the configure settings and any special considerations that
+should be taken into account.
+
+2.1 SRMIO - For working with PC 5/6/7
+-------------------------------------
+
+SRMIO (git)
+./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking
+
+2.2 Liboauth - For Twitter support
+----------------------------------
+
+oauth (0.8.8)
+
+./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64 CURL_CFLAGS="-I/Developer/SDKs/MacOSX10.7.sdk/usr/include/curl"  CURL_LIBS="-lcurl" --disable-dependency-tracking
+
+2.3 QwtPlot3d - For 3d plot support
+-----------------------------------
+
+qwtplot3d (maintain_0_2_x)
+
+Add the following to qwtplot3d.pro:
+CONFIG += x86_64 static
+QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.7.sdk
+
+2.4 libkml - For export to Google Earth
+---------------------------------------
+
+expat (2.0.1)
+./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking 
+
+libkml (pulled down from the svn repo)
+
+./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking --with-expat-include-dir=/usr/local/include --with-expat-lib-dir=/usr/local/lib --disable-swig CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64"
+
+note: the added CXXFLAGS helped clear the -Werror flag that stopped compilation.
+
+2.5 libusb - For Garmin USB2 stick support
+------------------------------------------
+
+libusb (0.1.12)
+
+To compile on OSX you need to apply the patch here:
+https://trac.macports.org/browser/trunk/dports/devel/libusb-legacy/files?rev=97840
+
+Then:
+./configure --prefix=/opt/libusb/ CFLAGS="-arch x86_64" CXXFLAGS="-arch x86_64" --disable-dependency-tracking
+then 
+sed -i 'bak' 's|CC -dynamiclib|CC -dynamiclib -arch x86_64|g' libtool
+make
+make install
+
+note: that the sed line updates some commands in libtool.  not sure why the arch clags are not getting passed.  
+
+2.6 libical
+-----------
+
+libical (0.46)
+first run autogen.sh
+then
+./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking
+
+2.7 clucene
+-----------
+
+DO NOT USE THE MACPORTS VERSION (0.9.23) IT DOES NOT WORK.
+
+git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene 
+cmake -G "Unix Makefiles"
+make
+sudo make install
+
+will install clucene into /usr/local/include/clucene and /usr/local/lib
--- a/117
+++ b/117
@@ -0,0 +1,117 @@
+Please note: This is an old build instruction set for Version 2.x.
+
+Most of it is still fairly valid for version 3.x.
+
+Minimum build requirements are: Qt 4.8 with Qt.4.8.4 recommended.
+
+All other libs are find the best that you can except for libusb which requires 0.1.12.
+
+I have found that the cross compiler at http://mxe.cc/ to be great for building GC and SRMIO.
+
+                                 +++++++++++++++++++++++
+                                 WIN32 BUILD WALKTHROUGH
+                                 +++++++++++++++++++++++
+
+                                       Gareth Coco
+
+                                        May 2011
+
+For my install, I am installing all my files into the directory: d:\coding.
+You can use any directory structure you like, you’ll just have to change paths.
+Just ensure that any folder path you use does not have a space in it.
+
+Download the NSI installer application. I use the Portable Apps version from:
+  http://portableapps.com/apps/development/nsis_portable
+- Install in D:\Coding\NSISPortable\
+
+Download Qt SDK from:
+ http://qt.nokia.com/downloads/sdk-windows-cpp
+ (File I am using is qt-sdk-win-opensource-2010.02.1.exe)
+- Install in D:\Coding\Qt
+
+Download the D2XX drivers:
+ http://www.ftdichip.com/Drivers/D2XX.htm
+ (File I am using is: CDM 202.06.00 WHQL Certified.zip)
+- Install in D:\Coding\D2XX
+
+Download qwt-plot3d from:
+ http://sourceforge.net/projects/qwtplot3d/files/
+ (File I am using is qwtplot3d-0.2.7.zip)
+- Install in D:\Coding\qwtplot3d
+
+Edit D:\coding\qwtplot3d\src\qwt3d_function.cpp
+- Add at top of file: #include <cstdio>
+Edit D:\coding\qwtplot3d\qwtplot3d.pro
+- Comment out: #win32:TEMPLATE    = vclib
+
+Then I start the “Qt Command Prompt” from the Qt SDK folder.
+
+d:
+cd d:\coding\qwtplot3d\
+qmake -win32
+mingw32-make release
+
+Now check out your favourite web sites until the code is built.
+
+Leave the Qt Command Prompt window open as we use it later.
+
+Download GoldenCheetah source
+(Either use GIT – git://github.com/GoldenCheetah/GoldenCheetah.git
+ or download the zip file:
+ http://github.com/GoldenCheetah/GoldenCheetah/zipball/master)
+- Install in D:\Coding\GoldenCheetah
+
+Copy D:\Coding\GoldenCheetah\src\gccconfig.pri.in
+  to D:\Coding\GoldenCheetah\src\gccconfig.pri and edit
+- Set: D2XX_INCLUDE = d:/coding/D2XX
+- Comment out #SRMIO_INSTALL
+- Comment out: CONFIG += debug
+- Uncomment: CONFIG += static
+
+Copy D:\Coding\GoldenCheetah\qwt\qwtconfig.pri.in
+  to D:\Coding\GoldenCheetah\qwt\qwtconfig.pri and edit
+- Set win32 { INSTALLBASE    = D:/Coding/Qt  }
+- In #Qt4 win32 { section
+  – Comment out: #CONFIG           += debug     # release/debug/debug_and_release
+  – Add in:   CONFIG           += release
+
+Using the “Qt Command Prompt” window from before:
+
+cd d:\coding\GoldenCheetah
+qmake -win32 -recursive
+mingw32-make release
+
+Go back to checking your email or favourite web sites while this builds.
+
+When all is finished, you should have a release version in:
+
+D:\Coding\GoldenCheetah\src\release\
+
+Next , move required build files into the d:\coding\GoldenCheetah\src\release directory.
+
+cd d:\coding\GoldenCheetah
+copy /y ..\Qt\qt\bin\mingwm10.dll src\release\
+copy /y ..\Qt\qt\bin\QtCore4.dll src\release\
+copy /y ..\Qt\qt\bin\QtGui4.dll src\release\
+copy /y ..\Qt\qt\bin\QtSql4.dll src\release\
+copy /y ..\Qt\qt\bin\QtXml4.dll src\release\
+copy /y ..\Qt\qt\bin\QtNetwork4.dll src\release\
+copy /y ..\Qt\qt\bin\QtOpenGL4.dll src\release\
+copy /y ..\Qt\qt\bin\QtWebKit4.dll src\release\
+copy /y ..\Qt\qt\bin\QtXmlPatterns4.dll src\release\
+copy /y ..\Qt\qt\bin\phonon4.dll src\release\
+copy /y ..\Qt\qt\bin\libgcc_s_dw2-1.dll src\release\
+copy /y ..\qwtplot3d\lib\qwtplot3d.dll src\release\
+mkdir src\release\sqldrivers
+copy /y ..\Qt\qt\plugins\sqldrivers\qsqlite4.dll src\release\sqldrivers\
+mkdir src\release\imageformats
+copy /y ..\Qt\qt\plugins\imageformats\qjpeg4.dll src\release\imageformats\
+
+To build the self installer:
+
+cd d:\coding\GoldenCheetah\src\win32
+d:\coding\NSISPortable\App\NSIS\makensis.exe GoldenCheetahInstall.nsi
+
+You should find the installer file in the directory you are in.
+
+Install and enjoy.
--- a/20
+++ b/20
@@ -1,15 +1,9 @@
-To build
+Golden Cheetah install and build instructions are documented
+for each platform;

-  cp src/gcconfig.pri.in src/gcconfig.pri
-  cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
+INSTALL-WIN32   For building on Microsoft Windows
+INSTALL-LINUX   For building on Ubuntu Linux
+INSTALL-MAC     For building on Apple OS X

-Edit both src/gcconfig.pri and qwt/qwtconfig.pri as necessary, then
-
-  qmake
-  make
-
-To uninstall the older FTDI VCP drivers on Mac OS X, open a Terminal and type:
-
-  sudo mv /System/Library/Extensions/FTDIUSBSerialDriver.kext /tmp
-
-Type your password when prompted, then restart your computer.
+Alternatively official builds are available from http://www.goldencheetah.org
+whilst latest developer builds are available from http://goldencheetah.stand2surf.net
--- a/build.pro
+++ b/build.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qwt src
+CONFIG += ordered
--- a/contrib/Fortius
+++ b/contrib/Fortius
--- a/contrib/Install_D2XX_drivers.mpkg.zip
+++ b/contrib/Install_D2XX_drivers.mpkg.zip
--- a/contrib/Universal_D2XX0.1.6.dmg
+++ b/contrib/Universal_D2XX0.1.6.dmg
--- a/contrib/libusb-0.1.12.tar.gz
+++ b/contrib/libusb-0.1.12.tar.gz
--- a/doc/bug-tracker.content
+++ b/doc/bug-tracker.content
@@ -1,97 +0,0 @@
-<p>We have an issue tracker set up at
-<a href=http://bugs.goldencheetah.org/projects/show/goldencheetah>
-bugs.goldencheetah.org</a>.  Below are some guidelines for users and
-developers for working with the issue tracker.</p>
-<big><font face="arial,helvetica,sanserif">
-Report a new bug/feature
-</font></big>
-
-<p> If you think that you have found a bug in GoldenCheetah or would like
-to request a new feature please report it by filing a new issue at our <a
-href=http://bugs.goldencheetah.org/projects/show/goldencheetah>issue
-tracker</a>. To report a bug/feature request go to the above link and
-follow these steps:
-
-<ol>
-<li>Login or register for a new account.</li>
-<li>Click the "new issue" link near the top of the page.</li>
-<li>Select either "bug" or "feature" from the tracker drop-down menu.</li>
-<li>Fill out the form including as much detail as possible.<br>
-    You can upload crashreports, problem files, or screenshots if they
-    help document the issue.</li>
-<li>Click the create button to save your report.<br>
-    This will also  send a copy of your report to the Golden-Cheetah-Users
-    mailing list.</li>
-</ol>
-<p>Thanks for helping to improve GoldenCheetah.</p>
-
-<big><font face="arial,helvetica,sanserif">
-Managing issues in the tracker
-</font></big>
-
-<p>To make it easier for all of us to track the status please try to
-adhere to a few simple guidelines listed below.</p>
-
-<font face="arial,helvetica,sanserif">
-<b>Issue Status:</b>
-</font>
-<p>Depending on your account status (non-member, reporter, developer, or
-manager) you may be able to update the status of an existing issue. When
-working in the bug tracker please update the status appropriately.
-Current status options are:</p>
-
-<ul>
-<li>New: Default status.
-
-<li>Assigned: issue has been assigned to someone on the project.  If you
-    are a Developer you can assign an issue to someone, including
-    yourself.  If you are working on a fix, please change the status to
-    Assigned, and post a message stating your plan of attack etc.
-
-<li>Feedback: This could be used to alert others that you have a
-    proposed fix that you want feed back on.  Please attach patches and
-    make a note. Also remember to tag the issue in your patches.
-
-<li>Resolved: The issue has been corrected. People that have tested the
-    patch or that submitted the bug should update to this status when
-    they feel that it has been fixed. If it turns out that it was not
-    resolved, most users can change the status back to "feedback".  If
-    you do so, please leave a note.
-
-<li>Tempfix: A workaround for the issue has been posted, but we may still be
-    working on a more long term solution.
-
-<li>Closed: Those with commit access to Github are the only ones that
-    can mark an issue as closed.  That said, if you are submitting a
-    patch that fixes and issue, please include the "fixes #<issuenum>"
-    tag to your commit as this will automatically close the issue when your
-    patch is accepted and pushed to github.
-</ul>
-
-<font face="arial,helvetica,sanserif">
-<b>Tagging in messages</b>
-</font>
-<p>The tracker has a very basic tagging and markup scheme that is described in
-detail <a href="http://bugs.goldencheetah.org/help/wiki_syntax.html">here</a>.
-Perhaps the most useful feature is the ability to use tags to link issues,
-commits, etc. When commenting on an issue please use the following tags
-when appropriate to automatically create links when:</p>
-
-<table align="center" width="600">
-<tr>
-  <th>Tag</th>
-  <th>Effect</th>
-</tr>
-<tr>
-  <td>Issue #2</td>
-  <td>Creates a link to existing Issue #2</td>
-</tr>
-<tr>
-  <td>commit:e76247a</td>
-  <td>Creates a link to commit e76247a</td>
-</tr>
-<tr>
-  <td>source:src/MainWindow.cpp</td>
-  <td>Creates a link to src/Mainwindow.cpp in our git repo</td>
-</tr>
-</table>
--- a/doc/contrib/ChungVE.pdf
+++ b/doc/contrib/ChungVE.pdf
--- a/doc/contrib/gnupress.tex
+++ b/doc/contrib/gnupress.tex
@@ -0,0 +1,18 @@
+@c gnupress.tex -- Common Texinfo macros for GNU Press books.
+@c
+@c Print in 7" x 9.25" format.
+@smallbook
+@advance@voffset by -0.25in
+@special{papersize=7in,9.25in}
+@c
+@c Since we are using @smallbook, we ought to use @smallfonts
+@tex
+\global\let\lisporig=\lisp
+\gdef\lisp{\smallexamplefonts\lisporig}%
+\global\let\exampleorig=\example
+\gdef\example{\smallexamplefonts\exampleorig}%
+\global\let\displayorig=\display
+\gdef\display{\smallexamplefonts\displayorig}%
+\global\let\formatorig=\format
+\gdef\format{\smallexamplefonts\formatorig}%
+@end tex
--- a/doc/contrib/palatino.tex
+++ b/doc/contrib/palatino.tex
@@ -0,0 +1,161 @@
+@c palatino.tex -- TeXinfo macros to set the default Roman font to Palatino
+@c
+@def@palatinoversion{2003-04-01.00}
+@c
+@c Copyright (C) 2003  Free Software Foundation, Inc.
+@c
+@c This palatino.tex file is free software; you can redistribute it and/or
+@c modify it under the terms of the GNU General Public License as
+@c published by the Free Software Foundation; either version 2, or (at
+@c your option) any later version.
+@c
+@c This palatino.tex file is distributed in the hope that it will be
+@c useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+@c of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+@c General Public License for more details.
+@c
+@c You should have received a copy of the GNU General Public License
+@c along with this texinfo.tex file; see the file COPYING.  If not, write
+@c to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+@c Boston, MA 02111-1307, USA.
+@c
+@c You should use this module, go to your root .texi file and make sure
+@c it reads like this:
+@c     \input texinfo  @c -*-texinfo-*-
+@c     @input palatino
+
+@message{Loading palatino [version @palatinoversion]:}
+
+@c Turn on the normal TeX command characters.
+@catcode`\=0
+\catcode`\%=14
+% Set the font macro #1 to the font named #2#3. #4 is the point size.
+% We save \setfont as \setfontorig, so we can restore it at the end of this
+% section.
+\catcode`\#=6
+\let\setfontorig=\setfont
+\def\setfont#1#2#3#4{\font#1=#2#3 at #4}
+\catcode`\#=\other
+
+% Set Palatino as the default roman font face
+\def\rmfontprefix{ppl}
+
+% Only define roman font attributes here.
+\def\rmshape{r}
+\def\rmbshape{b}
+\def\bfshape{b}
+\def\bxshape{b}
+\def\itshape{ri}
+\def\itbshape{bi}
+\def\slshape{ro}
+\def\slbshape{bo}
+\def\scshape{rc}
+\def\scbshape{bc}
+
+\ifx\bigger\relax
+  % not really supported.
+  \def\mainmagstep{12pt}
+  \setfont\textrm\rmfontprefix\rmshape{\mainmagstep}
+\else
+  \def\mainmagstep{10pt}
+  \setfont\textrm\rmfontprefix\rmshape{\mainmagstep}
+\fi
+% Instead of cmb10, you many want to use cmbx10.
+% cmbx10 is a prettier font on its own, but cmb10
+% looks better when embedded in a line with cmr10.
+\setfont\textbf\rmfontprefix\bfshape{\mainmagstep}
+\setfont\textit\rmfontprefix\itshape{\mainmagstep}
+\setfont\textsl\rmfontprefix\slshape{\mainmagstep}
+\setfont\textsc\rmfontprefix\scshape{\mainmagstep}
+\font\texti=zppler7m at \mainmagstep
+\font\textsy=zppler7y at \mainmagstep
+
+% A few fonts for \defun, etc.
+\setfont\defbf\rmfontprefix\bxshape{10pt} %was 1314
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\setfont\smallrm\rmfontprefix\rmshape{9pt}
+\setfont\smallbf\rmfontprefix\bfshape{9pt}
+\setfont\smallit\rmfontprefix\itshape{9pt}
+\setfont\smallsl\rmfontprefix\slshape{9pt}
+\setfont\smallsc\rmfontprefix\scshape{9pt}
+\font\smalli=zppler7m at 9pt
+\font\smallsy=zppler7y at 9pt
+
+% Fonts for small examples (8pt).
+\setfont\smallerrm\rmfontprefix\rmshape{8pt}
+\setfont\smallerbf\rmfontprefix\bfshape{8pt}
+\setfont\smallerit\rmfontprefix\itshape{8pt}
+\setfont\smallersl\rmfontprefix\slshape{8pt}
+\setfont\smallersc\rmfontprefix\scshape{8pt}
+\font\smalleri=zppler7m at 8pt
+\font\smallersy=zppler7y at 8pt
+
+% Fonts for title page:
+\setfont\titlerm\rmfontprefix\rmbshape{18pt}
+\setfont\titleit\rmfontprefix\itbshape{18pt}
+\setfont\titlesl\rmfontprefix\slbshape{18pt}
+\let\titlebf=\titlerm
+\setfont\titlesc\rmfontprefix\scbshape{18pt}
+\font\titlei=zppler7m at 18pt
+\font\titlesy=zppler7y at 18pt
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+
+% Chapter (and unnumbered) fonts (17.28pt).
+\setfont\chaprm\rmfontprefix\rmbshape{17.28pt}
+\setfont\chapit\rmfontprefix\itbshape{17.28pt}
+\setfont\chapsl\rmfontprefix\slbshape{17.28pt}
+\let\chapbf=\chaprm
+\setfont\chapsc\rmfontprefix\scbshape{17.28pt}
+\font\chapi=zppler7m at 17.28pt
+\font\chapsy=zppler7y at 17.28pt
+
+% Section fonts (14.4pt).
+\setfont\secrm\rmfontprefix\rmbshape{14.4pt}
+\setfont\secit\rmfontprefix\itbshape{14.4pt}
+\setfont\secsl\rmfontprefix\slbshape{14.4pt}
+\let\secbf\secrm
+\setfont\secsc\rmfontprefix\scbshape{14.4pt}
+\font\seci=zppler7m at 14.4pt
+\font\secsy=zppler7y at 14.4pt
+
+% Subsection fonts (13.15pt).
+\setfont\ssecrm\rmfontprefix\rmbshape{13.15pt}
+\setfont\ssecit\rmfontprefix\itbshape{13.15pt}
+\setfont\ssecsl\rmfontprefix\slbshape{13.15pt}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\rmfontprefix\scbshape{13.15pt}
+\font\sseci=zppler7m at 13.15pt
+\font\ssecsy=zppler7y at 13.15pt
+% The smallcaps and symbol fonts should actually be scaled \magstep1.5,
+% but that is not a standard magnification.
+
+% Fonts for short table of contents.
+\setfont\shortcontrm\rmfontprefix\rmshape{12pt}
+\setfont\shortcontbf\rmfontprefix\bxshape{12pt}
+\setfont\shortcontsl\rmfontprefix\slshape{12pt}
+
+% Set keyfont as well.
+\setfont\keyrm\rmfontprefix\rmshape{8pt}
+\font\keysy=zppler7y at 9pt
+
+\let\setfont=\setfontorig
+\def\setfontorig{\relax}
+
+% Restore the TeXinfo character set.
+\catcode`\\=\active
+@catcode`@%=@other
+
+@c Set initial fonts (again)
+@textfonts
+@rm
+
+@c Local variables:
+@c eval: (add-hook 'write-file-hooks 'time-stamp)
+@c page-delimiter: "^\\\\message"
+@c time-stamp-start: "def\\\\palatinoversion{"
+@c time-stamp-format: "%:y-%02m-%02d.%02H"
+@c time-stamp-end: "}"
+@c End:
--- a/doc/contrib/texinfo.tex
+++ b/doc/contrib/texinfo.tex
--- a/doc/logo.jpg
+++ b/doc/logo.jpg
--- a/doc/logo.png
+++ b/doc/logo.png
--- a/doc/release-notes.content
+++ b/doc/release-notes.content
@@ -1,99 +0,0 @@
-
-<p>
-<font face="arial,helvetica,sanserif">
-<big><strong>GoldenCheetah 1.3</strong></big>
-</font>
-
-<p>
-Realtime Mode:
-  <ul>
-  <li>Graph data as you ride (Mark Liversedge, Justin Knotzke, Steve Gribble)</li>
-  </ul>
-</p>
-
-<p>
-Charts:
-  <ul>
-  <li>Added Performance Manager (Eric Murray)</li>
-  <li>Added 3D Modeling (Mark Liversedge and Greg Steele)</li>
-  <li>Up to four y-axes on Ride Plot (Sean Rhea)</li>
-  <li>Option to show work instead of power in Critical Power Plot (Sean Rhea)</li>
-  </ul>
-</p>
-
-<p>
-Intervals:
-  <ul>
-  <li>Configurable metrics for intervals (Sean Rhea)</li>
-  <li>Find peak powers and add to intervals (Mark Liversedge)</li>
-  <li>Highlight intervals in plots (Damien Grauser)</li>
-  </ul>
-</p>
-
-<p>
-Device support:
-  <ul>
-  <li>Serial port support on Windows (Mark Liversedge)</li>
-  <li>Erase SRM memory without downloading (Sean Rhea)</li>
-  </ul>
-</p>
-
-<p>
-Imports:
-  <ul>
-  <li>New ride import wizard (Mark Liversedge, Jamie Kimberley)</li>
-  <li>Support Computrainer 3dp file format (Greg Lonnon)</li>
-  <li>Support WKO v3 file format (Mark Liversedge)</li>
-  <li>Support files with Garmin "smart recording" (Greg Lonnon)</li>
-  <li>New GoldenCheetah (.gc) file format (Sean Rhea)</li>
-  </ul>
-</p>
-
-<p>
-New/improved ride metrics:
-  <ul>
-  <li>Added Joe Friel's Aerobic Decoupling (Sean Rhea)</li>
-  <li>Added training points system by running coach Jack Daniels (Sean Rhea)</li>
-  <li>Better elevation gain estimates (Sean Rhea)</li>
-  </ul>
-</p>
-
-<p>
-Support for more languages:
-  <ul>
-  <li>French (Damien Grauser)</li>
-  <li>Japanese (Mitsukuni Sato, Keisuke Yamaguchi)</li>
-  </ul>
-</p>
-
-<p>
-Other new features:
-  <ul>
-  <li>Group rides into seasons (Justin Knotzke)</li>
-  <li>Better ride calendar (Berend De Schouwer)</li>
-  <li>Ride list pop-up menu (Thomas Weichmann)</li>
-  </ul>
-</p>
-
-<p>
-Lots of bug fixes by:
-  <ul>
-  <li>Rob Carlsen</li>
-  <li>Rainer Clasen</li>
-  <li>Chris Cleeland</li>
-  <li>Steve Gribble</li>
-  <li>Dag Gruneau</li>
-  <li>Ned Harding</li>
-  <li>Jamie Kimberley</li>
-  <li>Justin Knotzke</li>
-  <li>Mark Liversedge</li>
-  <li>Greg Lonnon</li>
-  <li>Eric Murray</li>
-  <li>Sean Rhea</li>
-  <li>Robb Romans</li>
-  <li>Berend De Schouwer</li>
-  <li>Julian Simioni</li>
-  <li>Thomas Weichmann</li>
-  </ul>
-</p>
-
--- a/doc/ride-plot.png
+++ b/doc/ride-plot.png
--- a/doc/ride-summary.png
+++ b/doc/ride-summary.png
--- a/doc/screenshots.content
+++ b/doc/screenshots.content
@@ -1,50 +0,0 @@
-<!-- $Id: faq.content,v 1.4 2006/07/05 16:59:56 srhea Exp $ -->
-
-<p>
-<center>
-
-<p>
-<big><font face="arial,helvetica,sanserif">
-Ride Summary
-</font></big>
-<p>
-<img src="ride-summary.png" alt="Ride Summary Screen" align="center">
-
-<p>
-<big><font face="arial,helvetica,sanserif">
-Plotting Altitude, Cadence, Heart Rate, Power, and Speed
-</font></big>
-<p>
-<img src="ride-plot.png" alt="Power and HR Plot" align="center">
-
-<p>
-<big><font face="arial,helvetica,sanserif">
-Plotting Critical Power
-</font></big>
-<p>
-<img src="critical-power-plot.png" alt="The Critical Power Plot" align="center">
-
-<p>
-<big><font face="arial,helvetica,sanserif">
-Histogram Analysis
-</font></big>
-<p>
-<img src="histogram-analysis.png" alt="The Power Histogram" align="center">
-
-<p>
-<big><font face="arial,helvetica,sanserif">
-Plotting Pedal Force Versus Pedal Velocity
-</font></big>
-<p>
-<img src="pf-pv-plot.png" alt="The Power Histogram" align="center">
-
-<p>
-<big><font face="arial,helvetica,sanserif">
-The Weekly Summary
-</font></big>
-<p>
-<img src="weekly-summary.png" alt="The Weekly Summary" align="center">
-
-</center>
-
-
--- a/doc/user/.gitignore
+++ b/doc/user/.gitignore
@@ -0,0 +1,10 @@
+*.aux
+*.cp
+*.cps
+*.fn
+*.ky
+*.log
+*.pg
+*.toc
+*.tp
+*.vr
--- a/doc/user/GC3-FAQ.info
+++ b/doc/user/GC3-FAQ.info
@@ -0,0 +1,793 @@
+This is GC3-FAQ.info, produced by makeinfo version 4.13 from
+GC3-FAQ.texinfo.
+
+This manual is for Golden Cheetah, version 3.0.
+
+Copyright (C) 2013 Mark Liversedge
+
+
+File: GC3-FAQ.info,  Node: Top,  Next: Top,  Prev: Top
+
+title
+*****
+
+This manual is for GoldenCheetah, version 3.0.
+
+* Menu:
+
+* MOST COMMON QUESTIONS OF ALL::    Most common questions
+* GENERAL:: General Questions
+* DATA::    Working with Data
+* METRICS:: Working with Metrics
+* UPLOADING AND DOWNLOADING::   Uploading and Downloading Data
+* SEASONS AND EVENTS::  Seasons and Events
+* CHARTS::  Configuring and Using Charts
+* INDEX::   Index
+
+
+File: GC3-FAQ.info,  Node: MOST COMMON QUESTIONS OF ALL,  Next: GENERAL,  Prev: INDEX,  Up: Top
+
+1 MOST COMMON QUESTIONS OF ALL
+******************************
+
+1.1 How do I override / manually enter TSS for a ride?
+======================================================
+
+The details chart on the analysis view allows you to override metrics
+on the metrics tab.  By default the most common metrics are listed,
+including average HR, distance and so on.  From v3.0 the default setup
+will also include TSS as a metric you can override here.
+
+If the metric is not there you will need to configure GoldenCheetah to
+allow it to be shown.  This is simple to do and described in 3.9 below.
+
+1.2 How do I add or remove a chart?
+===================================
+
+To add a new chart to the view you can select from the + menu on the
+right hand side of the scope bar (the scope bar is underneath the
+toolbar and lets you select from Home, Analysis, Train etc).
+
+Depending upon which view you are on the charts available will differ.
+For example realtime plots only appear on the Train view, whilst charts
+that work with individual rides will only appear on the analysis view.
+
+To remove a chart, when you mouse over a chart (in tabbed or tiled
+mode) a small triangle will appear in the top left of the chart. This
+is a menu drop down, if you click on it you will see a `Close' option.
+This is the option to remove (close) the chart.
+
+1.3 Can I enter my weight and track/plot it?
+============================================
+
+Weight can be maintained in 3 ways;
+
+   * Every athlete is setup with a weight value - this is the fallback
+     value should no     other weight measure be available. It can be
+     found under preferences and athlete.
+
+   * The 'Weight' field can be maintained in the details screen. This
+     is found on the     'Workout' tab in the details screen by
+     default. Any entry here will be used for this ride     ONLY.
+
+   * You can download weight from a withings scale. This is performed
+     manually via the     menu option Tools->Get Withings Data. This is
+     then used to update the local measures     database.
+
+When calculating W/KG the Activity value is used if present, if not we
+then fall back to the last Withing measure that was collected, and if
+that is not available we then fall back to the default value for the
+athlete.
+
+The weight from withings and weight from the activity can both be
+plotted separately in the LTM plots.
+
+1.4 How do I plot x sec power best?
+===================================
+
+As of v3.0 it is still not possible to plot custom durations for power
+bests. We are looking to add this in version 3.1, but for now you can
+only plot 1s, 5s, 10s, 15s, 20s, 30s, 1min, 2min, 5min, 10min, 20min,
+30min and 60min bests.
+
+1.5 I can't find Aerolab / Performance Manager?
+===============================================
+
+By default we do not add these charts to the layout. Aerolab can be
+added to the Analysis view via the '+' menu found to the right hand
+side of the GoldenCheetah scope bar.
+
+Similarly, the Performance manager can be added to the Home layout via
+the '+' menu. We may deprecate this chart in the near future since the
+LTM charts can be used to plot a PMC and we expect to implement an
+interactive PMC for planning in v3.1.
+
+1.6 What happened to weekly summary?
+====================================
+
+It has been deprecated since the Diary view allows you to summarise by
+day, week and month and add charts to the view that summarise for the
+selection. As the weekly summary was fixed on specific charts and did
+not handle other selections (e.g. monthly) it has been deprecated in
+view of the diary view.
+
+At present you can treat the Diary view as you would have the weekly
+summary - they offer the same functionality. We expect the diary view
+to extend to planned workouts when we implement planning functionality
+in v3.1.
+
+1.7 Where are all the chart settings?
+=====================================
+
+All chart settings can be found under the drop down menu that appears
+in the top left hand corner of a chart when you mouse over it. They
+will appear as a popup dialog box.
+
+Additionally, when you move the cursor towards the title of a chart in
+a view that is tabbed (not tiled) then a small selection of the most
+important settings for the chart will appear for convenience.
+
+1.8 Where is the preferences / options panel?
+=============================================
+
+On a Mac the configurations page can be found under 'GoldenCheetah ->
+Preferences' on the main menu. Whilst on all other platforms it is
+found via 'Tools -> Options'.
+
+We do this to match the general guidelines for the operating system.
+
+1.9 How do I change the colour of the rides on the calendar/list?
+=================================================================
+
+Activities are coloured according to keywords embedded in their details
+(metadata) you can configure the field that is used and the values that
+are matched and the colours they are shown in from the preferences pane
+via the 'Data Fields' toolbar option then select Notes Processing. The
+keywords and related words are scanned for to determine if the
+associated colour should be used for this ride.
+
+They are processed in the order they are defined with the first match
+being returned. Take care when using values such as 'TT' and 'race'
+since these can also be part of an English word (e.g. ATTEMPT contains
+'TT' and graceful contains 'race'.
+
+
+File: GC3-FAQ.info,  Node: GENERAL,  Next: METRICS,  Prev: MOST COMMON QUESTIONS OF ALL,  Up: Top
+
+2 GENERAL
+*********
+
+2.1 What is GoldenCheetah?
+==========================
+
+GoldenCheetah is primarily a program for cyclists that own a power
+meter. It allows them to record, track and review their performance
+against recorded data. It also allows you to ride your turbo and
+collect data as you ride.
+
+If you do not have a power meter then some of the functionality will
+not be of use to you as a cyclist. But you can still record and track
+progress. We support HR based TRIMP metrics for a HR based PMC for
+example.
+
+2.2 What is a good book or resource on training with power?
+===========================================================
+
+Unquestionably the bible for working with a power meter is Training and
+Racing with a Power Meter by Hunter Allan and Andy Coggan. Make sure
+you look at the 2nd edition since it is revised quite dramatically.
+Whilst it is heavily  biased towards WKO+ as a software package most of
+the functions of note are also available in GoldenCheetah.
+
+2.3 Where can I download the installer for GoldenCheetah ?
+==========================================================
+
+Stable releases are available from www.goldencheetah.org whilst the
+latest and greatest code build is available from
+goldencheetah.stand2surf.net. Development builds are for the brave,
+since they may contain bugs. In reality the development builds are a
+changing feast and often contain latest fixes too.
+
+2.4 Where can I get the source code?
+====================================
+
+The GoldenCheetah source code is hosted on github here:
+www.github.com/GoldenCheetah/GoldenCheetah. It can be cloned locally
+using 'git clone git://github.com/GoldenCheetah/GoldenCheetah.git'.
+
+2.5 I am a triathlete is GoldenCheetah appropriate for me?
+==========================================================
+
+GoldenCheetah is not a multi-sport program. For tracking cycling
+performance it is a good choice. But if you are looking for running and
+swimming metrics and tracking then these features are not available at
+present. It is an excellent choice for analysing cycling aspects of
+triathlon, or working on the trainer.
+
+2.6 Is there a mailing list?
+============================
+
+The mailing list for GoldenCheetah users is maintained via Google
+Groups at
+http://groups.google.com/forum/?fromgroups=#forum/golden-cheetah-uers
+the first post you make is moderated and may take a while to appear.
+Once your first post is made you can make future posts without
+moderation.
+
+2.7 How do I report a bug or request a new feature?
+===================================================
+
+We use Github issues to record bugs and feature requests. You will need
+to create an account on github and then post a new request or bug at
+www.github.com/GoldenCheetah/GoldenCheetah/issues
+
+2.8 How can I contribute?
+=========================
+
+Patches are most welcome via the mailing list or a pull request in
+github. Of equal importance is the timely reporting of bugs and help in
+testing fixes. We also desperately need volunteers to translate into
+non-English languages and help with writing documentation including the
+maintenance of this FAQ.
+
+If you want to help, post a note on the golden-cheetah-users mailing
+list.
+
+2.9 Can I donate to the project?
+================================
+
+We are an open source project. Our software is developed by a
+community. We do not have any facility to collect funding or spend it!
+We would rather you spread the word if you think our software is good,
+and maybe help out with documentation, tutorials or translations if you
+can.
+
+
+File: GC3-FAQ.info,  Node: METRICS,  Next: DATA,  Prev: GENERAL,  Up: Top
+
+3 METRICS
+*********
+
+3.1 What is the difference between xPower, NP and Daniels EqP?
+==============================================================
+
+They all serve the same purpose - to express the variable power you
+have generated over a given period of time as a single value. This is
+so you can quantify the intensity of the ride and therefore the
+training stress of the ride.
+
+In practice, NP and xPower are largely the same, whilst Daniels EqP
+place much higher emphasise on upper intensity work. For more info on
+xPower see Dr Skiba's paper on BikeScore
+http://www.physfarm.com/bikescore.pdf
+
+3.2 What is the difference between CP and FTP?
+==============================================
+
+CP is a shorthand for CP60 in GoldenCheetah, and is computed using the
+Scherer/Monod protocol using 3 and 20 minutes. Functional Threshold
+Power (FTP) is an actual measure of the power an athlete sustains for
+60 minutes.
+
+Since it is very difficult for an athlete to maintain the desired
+intensity FTP 'reality' tends to result in a number that is much lower
+than CP 'theory'. Often users will consider the two as the same.
+
+In GC we compute TSS and BikeScore using your 'CP' value. If you set it
+to your FTP value TSS will be accurate, BikeScore is likely to be
+lower. And if you set it to your CP value BikeScore will be accurate,
+but TSS will be overstated.
+
+3.3 Why does my CP chart show higher watts for a longer duration?
+=================================================================
+
+A higher power average for a longer time is possible if an effort has
+been "book ended".  If, for example, you did a massive 30 second
+effort, followed by freewheeling for 29:30 then another massive 30
+second effort, then your best average for a continuous 30 minutes would
+in fact be lower that your best average for a continuous 30minutes and
+30 seconds.  (Thanks for Jon Hill from the Golden Cheetah Users mailing
+list for this example).
+
+3.4 Can I set a different CP/FTP for different reasons e.g. CP/FTP on a trainer?
+================================================================================
+
+We allow you to override the CP value for a specific ride by setting
+the "CP" field to the value you wish to use for the ride in question.
+We do not have a concept of 'separate' Cps for different purposes - you
+will need to specify the CP when the data is imported into GC. But this
+allows you to make manual adjustments.
+
+We provide this functionality at user request - we do not endorse the
+concept of multiple CP values. But we do recognise the ongoing debate
+regarding physiological stress from working on a trainer vs on the road.
+
+3.5 How do I seed the CTL for my PMC?
+=====================================
+
+You can seed the starting CTL (we call it LTS, for long term stress)
+when you define a season. That way it is re-usable in a number of
+places. To do this you edit the season (date range) in the Home View
+and can set the Starting LTS.
+
+3.6 Why is elevation different in GoldenCheetah to my other training software / website?
+========================================================================================
+
+Different programs will use different hysteresis values to smooth the
+small changes in altitude. In GC we use a hysteresis value of 3m.
+
+If this is of great concern you can adjust the hysteresis value in
+preferences under the general tab.
+
+3.7 Why is a metric e.g. TSS or average power different in GoldenCheetah to Garmin Connect?
+===========================================================================================
+
+The algorithms for calculating TSS, AP etc are static. They are
+implemented exactly the same way in GoldenCheetah, Garmin Connect,
+TrainingPeaks etc. The algorithms are extremely simple and not prone to
+difficulty in implementation.
+
+However, how each application treats pauses and stops or loss of data
+accounts for most differences. In GoldenCheetah we always calculate
+AP,TSS etc including stop time. Other applications choose to ignore or
+smooth segments of short duration.
+
+In addition, if there are anomalies in your data, with large gaps or
+even time going backwards, this will drastically affect GoldenCheetah's
+calculations.
+
+We NEVER attempt to interpret data anomalies - if the results are not
+as you would expect you will need to correct the data. We do not
+'silently' fix the data for you. There is no secret sauce in
+GoldenCheetah, we are open and transparent with your data.
+
+3.8 How do I set the metrics shown for intervals in the various summaries?
+==========================================================================
+
+In the GoldenCheetah preference pane under the Metrics tab you can
+choose the metrics that will be shown in the ride summary charts and
+the metrics that will be shown in the interval summary in the analysis
+sidebar.
+
+3.9 How do I add a metric to the details screen (so I can override it) ?
+========================================================================
+
+If the metric you want (e.g. TSS) is not shown then you will need to
+add it via the GoldenCheetah preferences pane. On Mac this is from the
+menu option GoldenCheetah->Preferences whilst on Windows and Linux it
+is under Tools->Options.
+
+You will need to select 'Data Fields' option from preferences toolbar
+and then the 'fields' tab. You will see a list of fields that are
+associated with a particular screen tab. If you scroll down you should
+find entries for the 'Metrics' screen tab, you can insert a new entry
+here with the '+' button. You should make sure the new entry is called
+exactly the same thing as the metric in question.
+
+For 'TSS' this is relatively straight forward. For others, e.g.
+'Average Heart Rate' you must make sure that the name includes spaces
+etc. Once your metric has been added to the configuration you should
+save that and return to the details screen where you can now maintain
+it.
+
+If you are creating a manual entry then there is no 'details' tab in
+the dialog. Once you have created the entry (and again in this case TSS
+can be entered in the dialog) you should go to the details tab to
+maintain any other specific fields. The manual entry dialog is designed
+to be simple and accept only the most common of entries.
+
+3.10 Can you calculate gradient, virtual power or other derived series from the ride data?
+==========================================================================================
+
+Not in 3.0. We may introduce derived data series in the future.
+
+3.11 Can I export metrics or access the metric database GC uses?
+================================================================
+
+The metrics are stored within a Sqlite 3 Database called 'metricDBv3'
+that can be found in the athlete directory. You can use any Sqlite 3
+tools to query and work with the db.
+
+Alternatively you can export the db in its entirety using the
+Activity->Export Metrics as CSV to export to a format you can use in a
+spreadsheet program.
+
+
+File: GC3-FAQ.info,  Node: DATA,  Next: UPLOADING AND DOWNLOADING,  Prev: METRICS,  Up: Top
+
+4 DATA
+******
+
+4.1 How do I split, merge or join files?
+========================================
+
+You can split a file by time using the activity->split ride menu item
+(or toolbar button).
+
+To join two rides together (making one longer ride from two rides) you
+can copy rows in the activity editor and paste special in the ride
+editor (right click) and then select append mode.
+
+If you wish to merge rides, that is much harder and would need to be
+performed outside of GC or by cutting and pasting columns in the
+activity editor.
+
+4.2 How can I find 'spikes' or specific values in activity data?
+================================================================
+
+The activity editor has a function to find data on its toolbar. You can
+specify a range or upper or lower limit and find values less than,
+greater than or between a range of values.
+
+Additionally, the editor will scan the file looking for anomalies -
+where the data appears to be out of normal ranges. These are shown with
+a wiggly red line in the editor and can also be listed by clicking on
+the anomalies icon on the editor toolbar.
+
+If the anomalies icon is not enabled on the toolbar then there are no
+anomalies in the currently selected ride.
+
+4.3 How can I fix 'spikes' or 'anomalies' in activity data?
+===========================================================
+
+You can either manually edit the values in the activity editor (there
+is full undo and redo in the editor). Or you can use the fix tools that
+are listed under the tool menu option (fix power spikes, fix gaps in
+recording, fix gps errors, fix torque.
+
+Each of the fix tools opens a dialog that displays texts to explain
+what the fix tool does.
+
+4.4 How can I add/remove a field to edit on the details screen?
+===============================================================
+
+The fields (metadata) that is editable can be configured in the
+preferences pane under the data fields tab. Where no screen is
+specified (its left blank) it will not be made available.
+
+GoldenCheetah ships with a number of fields defined in the config but
+with no screen set.  If you wish to use them simply set the screen tab
+to the tab you would like it to be shown on. To remove a field set the
+field tab to blank.
+
+4.5 What are 'special fields' ?
+===============================
+
+There are a number of fields that when maintained in the details screen
+will be used elsewhere in the code to calculate metrics or for other
+purposes.
+
+Some examples include;
+
+Weight - used in W/KG calculations, Sport and Workout code are     used
+when exporting to other file formats, Identifier is used to assign a
+UUID to the     activity when it is uploaded to online services and so
+on.
+
+There is a full list of special fields and their meaning in the Golden
+Cheetah user guide appendices.
+
+4.6 How do I find/add/sort/delete/edit intervals ?
+==================================================
+
+The context menu (on the right hand side of the splitter handle) for
+the interval sidebar in Analysis view contains a number of options for
+working with intervals.
+
+Additionally, you can click and drag on the performance (aka ride) plot
+to visually define an interval.
+
+4.7 How can I export to a specific file format?
+===============================================
+
+Activity->Export allows you to export the activity to csv, fitlog, gc
+(xml), json, Training Peaks PWX or Garmin TCX format.
+
+4.8 Can I use GC to convert data from one format to another on the command line?
+================================================================================
+
+No. It is something we may add in v3.1
+
+4.9 Can I delete an athlete and all his/her data?
+=================================================
+
+No. It must be done manually by removing the athlete directory via the
+operating system. Please ensure you do this when GoldenCheetah is not
+running.
+
+
+File: GC3-FAQ.info,  Node: UPLOADING AND DOWNLOADING,  Next: SEASONS AND EVENTS,  Prev: DATA,  Up: Top
+
+5 UPLOADING AND DOWNLOADING
+***************************
+
+5.1 Why does upload to TrainingPeaks keep failing?
+==================================================
+
+The Sport field in TrainingPeaks must have very specific values,
+although this is not documented in the XML Schema. We recommend using a
+sport of "Bike" if you plan on uploading rides to training peaks.
+
+5.2 Why does download from TrainingPeaks say I need a premium account?
+======================================================================
+
+Training Peaks only allow paid up members to get access to their data.
+If you are using a free service they do not let you retrieve your data.
+
+5.3 Why is data uploaded to Strava all wrong?
+=============================================
+
+In general Strava will only use GPS data. If your ride does not contain
+GPS data then Strava is not likely to play nice. In addition many of
+the other data series will be ignored. This is related to Strava data
+processing in V2.0 of their API.
+
+We always upload as TCX since the JSON flavour of their API appears to
+have less functionality.
+
+5.4 What settings do I need to get GoldenCheetah to upload to my Google Calendar?
+=================================================================================
+
+The upload to Google Calendar uses their CalDAV API, and as such needs
+to specify a collection. This means when entering the details in the
+passwords pane of preferences you should use the following for the
+caldav url:
+
+https://www.google.com/calendar/dav/xxxx@gmail.com/events/
+
+Where xxxx is your username. The username will need to be repeated in
+the username field and obviously set the password too.
+
+
+File: GC3-FAQ.info,  Node: SEASONS AND EVENTS,  Next: CHARTS,  Prev: UPLOADING AND DOWNLOADING,  Up: Top
+
+6 SEASONS AND EVENTS
+********************
+
+6.1 Why are there different types of seasons?
+=============================================
+
+This is to help with planning functions. As of v3 there is no real
+distinction made.  Adhoc seasons are expected to be used solely as date
+ranges and have no associated plan.  Whilst other season types may
+contain plans. This is only relevant for planning functions that are
+not available yet.
+
+6.2 What is event used for?
+===========================
+
+It is only used to annotate a LTM chart - so you can show an 'event'
+that happened at a particular date. There are no rules about what
+constitutes and event. It could be a race, a training camp or just a
+day that was particularly meaningful e.g. illness, crash.
+
+
+File: GC3-FAQ.info,  Node: CHARTS,  Next: INDEX,  Prev: SEASONS AND EVENTS,  Up: Top
+
+7 CHARTS
+********
+
+7.1 I want to plot month -1,-2 and -3 how do I do that?
+=======================================================
+
+Assuming the chart allows you to specify a date range you can select
+'This' 'month' and select prior '3' to specify a month 3 years prior,
+similarly 'This' 'month' and prior '2' is a month 2 months ago, whilst
+'This' 'month' and prior '1' is last month.
+
+'This' 'month' prior and 0 is just this month.
+
+7.2 How does the mean max chart calculate CP when showing power?
+================================================================
+
+The CP algorithm searches your best power for two durations; for
+anaerobic efforts it looks between 15s and 1min, for aerobic it looks
+for best efforts between 10mins and an hour.
+
+Once it has found these two best values it will curve fit the two to
+enable the 60min value to be extracted. Bear in mind this is a
+theoretical number and as described above is applicable to the
+BikeScore algorithm. The value for FTP that the TSS algorithm requires
+is simply the highest value for 60mins for the time period, assuming
+you have performed a 60minute test recently.
+
+7.3 How should I use Aerolab?
+=============================
+
+The following is a brief piece of advice from Robert Chung, from a
+discussion on the Golden Cheetah Users mailing list:
+
+Ideally, you'll want calm conditions (both in terms of wind and
+traffic) but here's a     quickie test you can do just to get a handle
+on what to do. Try to find a loop without     stop signs, or an
+out-and-back with maybe a little dip or something in the middle. Make
+ sure you won't get hit by a car and have good sight lines. I just go
+around my block a     few times. Do a loop in the drops, then another
+loop faster, then a loop slower; then     repeat with your hands on the
+hoods.
+
+Weigh yourself and the bike and ballpark the air density.
+
+See whether you can come close to modeling the "true" elevation profile
+by sliding the     CdA slider around. Even with this informal test, as
+long as the wind isn't blowing too     hard, you ought to be able to
+see a difference between the loops where you were in the     drops and
+the loops where you on the hoods, and to spot little bumps and dips in
+the road.
+
+There is also an overview of Virtual Elevation to measure aerodynamics
+in this YouTube video from the power seminar at Interbike 2011 given by
+Jim Meyer the founder of Quarq:
+
+http://www.youtube.com/watch?v=b8tJnFE_BFg&feature=youtu.be&t=27m58s
+
+Finally, Robert Chung's original paper is included in the docs section
+of the GoldenCheetah repository, you can it up here (click on 'View
+Raw' to download):
+
+https://github.com/GoldenCheetah/GoldenCheetah/blob/master/doc/contrib/ChungVE.pdf
+
+7.4 My map doesn't show?
+========================
+
+This is most likely because you have a proxy that requires
+authentication or session details. We do not have sophisticated support
+for internet proxy servers. We will re-use the operating system
+settings where they are configured.
+
+7.5 What is the treemap plot used for?
+======================================
+
+Typically it is used to visualise where you spend your time or where
+you get best results.  It is not particularly useful if you do not
+maintain details for each ride e.g. workout code, sport et al.
+
+7.6 Can I change the colors in plot x ?
+=======================================
+
+With the exception of the Long Term Metric plots the colours on the
+charts are configured in the GoldenCheetah preferences pane.
+
+We want to use the same colours to plot each data series across the
+charts, so you can change them globally.
+
+The only colours you cannot change are the colours assigned to
+intervals when plotting them on scatterplot or PfPv. These colours are
+assigned according to their sequence.
+
+7.7 How do you zoom in on a chart?
+==================================
+
+You can zoom in on the distribution, scatterplot and PfPv charts by
+selecting the zoom area with the left click of the mouse.
+
+On the performance (ride) plot you can zoom with the span slider at the
+bottom of the chart (if you select the full plot in the chart settings).
+
+There are no other zoom options for the other charts.
+
+7.8 I zoomed in but can't zoom out?
+===================================
+
+Right click will zoom back out to the previous zoom level (in the case
+of zooming multiple times).  If you select another activity the chart
+will return to fully zoomed out.
+
+7.9 GoldenCheetah is saying there is no data for a chart, but I'm sure there is?
+================================================================================
+
+You should check in the editor if the data series is present. if the
+activity is a manual activity entry it will contain no data.
+
+
+File: GC3-FAQ.info,  Node: INDEX,  Next: MOST COMMON QUESTIONS OF ALL,  Prev: CHARTS,  Up: Top
+
+Index
+*****
+
+[index]
+* Menu:
+
+* add:                                   MOST COMMON QUESTIONS OF ALL.
+                                                              (line  20)
+* adhoc:                                 SEASONS AND EVENTS.  (line   9)
+* Aerolab <1>:                           MOST COMMON QUESTIONS OF ALL.
+                                                              (line  69)
+* Aerolab:                               CHARTS.              (line  33)
+* algorithm:                             CHARTS.              (line  19)
+* anomalies:                             DATA.                (line  38)
+* AP:                                    METRICS.             (line  80)
+* best:                                  MOST COMMON QUESTIONS OF ALL.
+                                                              (line  61)
+* bug:                                   GENERAL.             (line  66)
+* Chung:                                 CHARTS.              (line  33)
+* clone:                                 GENERAL.             (line  40)
+* colour <1>:                            CHARTS.              (line  84)
+* colour:                                MOST COMMON QUESTIONS OF ALL.
+                                                              (line 115)
+* contribute:                            GENERAL.             (line  73)
+* CP <1>:                                METRICS.             (line  22)
+* CP <2>:                                CHARTS.              (line  19)
+* CP:                                    METRICS.             (line  50)
+* CSV:                                   DATA.                (line  88)
+* CTL:                                   METRICS.             (line  63)
+* cycle:                                 SEASONS AND EVENTS.  (line   9)
+* Daniels:                               METRICS.             (line   9)
+* donate:                                GENERAL.             (line  85)
+* download <1>:                          GENERAL.             (line  31)
+* download:                              UPLOADING AND DOWNLOADING.
+                                                              (line  16)
+* elevation:                             METRICS.             (line  71)
+* EqP:                                   METRICS.             (line   9)
+* event:                                 SEASONS AND EVENTS.  (line  18)
+* feature:                               GENERAL.             (line  66)
+* FITLOG:                                DATA.                (line  88)
+* FTP:                                   METRICS.             (line  50)
+* Garmin Connect:                        METRICS.             (line  80)
+* github:                                GENERAL.             (line  40)
+* Google:                                UPLOADING AND DOWNLOADING.
+                                                              (line  33)
+* install:                               GENERAL.             (line  31)
+* join:                                  DATA.                (line   9)
+* JSON:                                  DATA.                (line  88)
+* LTS:                                   METRICS.             (line  63)
+* mail:                                  GENERAL.             (line  56)
+* map:                                   CHARTS.              (line  69)
+* merge:                                 DATA.                (line   9)
+* month:                                 CHARTS.              (line   9)
+* NP:                                    METRICS.             (line   9)
+* options:                               MOST COMMON QUESTIONS OF ALL.
+                                                              (line 106)
+* override:                              METRICS.             (line 110)
+* PMC <1>:                               METRICS.             (line  63)
+* PMC:                                   MOST COMMON QUESTIONS OF ALL.
+                                                              (line  69)
+* preferences:                           MOST COMMON QUESTIONS OF ALL.
+                                                              (line 106)
+* prior:                                 CHARTS.              (line   9)
+* PWX:                                   DATA.                (line  88)
+* remove:                                MOST COMMON QUESTIONS OF ALL.
+                                                              (line  20)
+* report:                                GENERAL.             (line  66)
+* season:                                SEASONS AND EVENTS.  (line   9)
+* settings:                              MOST COMMON QUESTIONS OF ALL.
+                                                              (line  95)
+* source:                                GENERAL.             (line  40)
+* spikes:                                DATA.                (line  23)
+* split:                                 DATA.                (line   9)
+* Strava:                                UPLOADING AND DOWNLOADING.
+                                                              (line  22)
+* TCX:                                   DATA.                (line  88)
+* trainer:                               METRICS.             (line  50)
+* TrainingPeaks:                         UPLOADING AND DOWNLOADING.
+                                                              (line  16)
+* treemap:                               CHARTS.              (line  77)
+* triathlete:                            GENERAL.             (line  47)
+* TSS <1>:                               METRICS.             (line  80)
+* TSS:                                   MOST COMMON QUESTIONS OF ALL.
+                                                              (line   9)
+* unzoom:                                CHARTS.              (line 108)
+* upload:                                UPLOADING AND DOWNLOADING.
+                                                              (line   9)
+* VE:                                    CHARTS.              (line  33)
+* weekly summary:                        MOST COMMON QUESTIONS OF ALL.
+                                                              (line  81)
+* weight:                                MOST COMMON QUESTIONS OF ALL.
+                                                              (line  36)
+* xPower:                                METRICS.             (line   9)
+* zoom:                                  CHARTS.              (line 108)
+
+
+
+Tag Table:
+Node: Top164
+Node: MOST COMMON QUESTIONS OF ALL609
+Node: GENERAL6062
+Node: METRICS9703
+Node: DATA16693
+Node: UPLOADING AND DOWNLOADING20623
+Node: SEASONS AND EVENTS22386
+Node: CHARTS23245
+Node: INDEX28042
+
+End Tag Table
--- a/doc/user/GC3-FAQ.pdf
+++ b/doc/user/GC3-FAQ.pdf
--- a/doc/user/GC3-FAQ.texinfo
+++ b/doc/user/GC3-FAQ.texinfo
@@ -0,0 +1,754 @@
+\input texinfo   @c -*-texinfo-*-
+@input palatino
+@c %**start of header
+@setfilename FAQ.texinfo
+@settitle Golden Cheetah FAQ
+@c %**end of header
+@paragraphindent 0
+
+@copying
+This manual is for Golden Cheetah, version 3.0.
+
+Copyright @copyright{} 2013 Mark Liversedge
+@end copying
+
+@titlepage
+@title Golden Cheetah FAQ
+@c @subtitle subtitle-if-any
+@c @subtitle second-subtitle
+@author Mark Liversedge
+
+@c  The following two commands
+@c  start the copyright page.
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+
+@end titlepage
+
+@c So the toc is printed at the start.
+@contents
+
+@ifnottex
+@node Top,Top,Top,
+@top title
+
+This manual is for GoldenCheetah, version 3.0.
+@end ifnottex
+
+@menu
+* MOST COMMON QUESTIONS OF ALL::    Most common questions
+* GENERAL:: General Questions
+* DATA::    Working with Data
+* METRICS:: Working with Metrics
+* UPLOADING AND DOWNLOADING::   Uploading and Downloading Data
+* SEASONS AND EVENTS::  Seasons and Events
+* CHARTS::  Configuring and Using Charts
+* INDEX::   Index
+@end menu
+
+@node MOST COMMON QUESTIONS OF ALL,GENERAL,INDEX,Top
+@chapter MOST COMMON QUESTIONS OF ALL
+
+
+@section How do I override / manually enter TSS for a ride?
+@cindex TSS
+
+The details chart on the analysis view allows you to override metrics on the metrics tab. 
+By default the most common metrics are listed, including average HR, distance and so on.
+From v3.0 the default setup will also include TSS as a metric you can override here.
+
+If the metric is not there you will need to configure GoldenCheetah to allow it to be shown.
+This is simple to do and described in 3.9 below.
+
+@section How do I add or remove a chart?
+@cindex add
+@cindex remove
+
+To add a new chart to the view you can select from the + menu on the right hand side of 
+the scope bar (the scope bar is underneath the toolbar and lets you select from Home,
+Analysis, Train etc).
+
+Depending upon which view you are on the charts available will differ. For example realtime
+plots only appear on the Train view, whilst charts that work with individual rides will only
+appear on the analysis view.
+
+To remove a chart, when you mouse over a chart (in tabbed or tiled mode) a small triangle
+will appear in the top left of the chart. This is a menu drop down, if you click on it
+you will see a `Close' option. This is the option to remove (close) the chart.
+
+@section Can I enter my weight and track/plot it?
+@cindex weight
+
+Weight can be maintained in 3 ways;
+
+@itemize @bullet
+
+@item Every athlete is setup with a weight value -- this is the fallback value should no
+    other weight measure be available. It can be found under preferences and athlete.
+
+@item The 'Weight' field can be maintained in the details screen. This is found on the 
+    'Workout' tab in the details screen by default. Any entry here will be used for this ride
+    ONLY.
+
+@item You can download weight from a withings scale. This is performed manually via the
+    menu option Tools->Get Withings Data. This is then used to update the local measures
+    database.
+@end itemize
+
+When calculating W/KG the Activity value is used if present, if not we then fall back to
+the last Withing measure that was collected, and if that is not available we then fall
+back to the default value for the athlete.
+
+The weight from withings and weight from the activity can both be plotted separately in
+the LTM plots.
+
+
+
+@section How do I plot x sec power best?
+@cindex best
+
+As of v3.0 it is still not possible to plot custom durations for power bests. We are
+looking to add this in version 3.1, but for now you can only plot 1s, 5s, 10s, 15s, 20s,
+30s, 1min, 2min, 5min, 10min, 20min, 30min and 60min bests.
+
+
+
+@section I can't find Aerolab / Performance Manager?
+@cindex Aerolab
+@cindex PMC
+
+By default we do not add these charts to the layout. Aerolab can be added to the Analysis
+view via the '+' menu found to the right hand side of the GoldenCheetah scope bar.
+
+Similarly, the Performance manager can be added to the Home layout via the '+' menu. We
+may deprecate this chart in the near future since the LTM charts can be used to plot a PMC
+and we expect to implement an interactive PMC for planning in v3.1.
+
+
+
+@section What happened to weekly summary?
+@cindex weekly summary
+
+It has been deprecated since the Diary view allows you to summarise by day, week and month
+and add charts to the view that summarise for the selection. As the weekly summary was fixed
+on specific charts and did not handle other selections (e.g. monthly) it has been deprecated
+in view of the diary view.
+
+At present you can treat the Diary view as you would have the weekly summary -- they offer
+the same functionality. We expect the diary view to extend to planned workouts when we
+implement planning functionality in v3.1.
+
+
+
+@section Where are all the chart settings?
+@cindex settings
+
+All chart settings can be found under the drop down menu that appears in the top left hand
+corner of a chart when you mouse over it. They will appear as a popup dialog box.
+
+Additionally, when you move the cursor towards the title of a chart in a view that is tabbed
+(not tiled) then a small selection of the most important settings for the chart will appear
+for convenience.
+
+@section Where is the preferences / options panel?
+@cindex preferences
+@cindex options
+
+On a Mac the configurations page can be found under 'GoldenCheetah -> Preferences' on the
+main menu. Whilst on all other platforms it is found via 'Tools -> Options'.
+
+We do this to match the general guidelines for the operating system.
+
+@section How do I change the colour of the rides on the calendar/list?
+@cindex colour
+
+Activities are coloured according to keywords embedded in their details (metadata) you can
+configure the field that is used and the values that are matched and the colours they are
+shown in from the preferences pane via the 'Data Fields' toolbar option then select Notes
+Processing. The keywords and related words are scanned for to determine if the associated
+colour should be used for this ride.
+
+They are processed in the order they are defined with the first match being returned. Take
+care when using values such as 'TT' and 'race' since these can also be part of an English
+word (e.g. ATTEMPT contains 'TT' and graceful contains 'race'.
+
+
+
+@node GENERAL,METRICS,MOST COMMON QUESTIONS OF ALL,Top
+@chapter GENERAL
+
+
+@section What is GoldenCheetah?
+
+GoldenCheetah is primarily a program for cyclists that own a power meter. It allows them to
+record, track and review their performance against recorded data. It also allows you to ride
+your turbo and collect data as you ride.
+
+If you do not have a power meter then some of the functionality will not be of use to you
+as a cyclist. But you can still record and track progress. We support HR based TRIMP metrics
+for a HR based PMC for example.
+
+
+
+@section What is a good book or resource on training with power?
+
+Unquestionably the bible for working with a power meter is Training and Racing with a Power
+Meter by Hunter Allan and Andy Coggan. Make sure you look at the 2nd edition since it is
+revised quite dramatically. Whilst it is heavily  biased towards WKO+ as a software package
+most of the functions of note are also available in GoldenCheetah.
+
+
+
+@section Where can I download the installer for GoldenCheetah ?
+@cindex download
+@cindex install
+
+Stable releases are available from www.goldencheetah.org whilst the latest and greatest
+code build is available from goldencheetah.stand2surf.net. Development builds are for the
+brave, since they may contain bugs. In reality the development builds are a changing feast
+and often contain latest fixes too.
+
+
+
+@section Where can I get the source code?
+@cindex source
+@cindex github
+@cindex clone
+
+The GoldenCheetah source code is hosted on github here:
+www.github.com/GoldenCheetah/GoldenCheetah. It can be cloned locally using 
+'git clone git://github.com/GoldenCheetah/GoldenCheetah.git'.
+
+
+
+@section I am a triathlete is GoldenCheetah appropriate for me?
+@cindex triathlete
+
+GoldenCheetah is not a multi-sport program. For tracking cycling performance it is a good
+choice. But if you are looking for running and swimming metrics and tracking then these
+features are not available at present. It is an excellent choice for analysing cycling
+aspects of triathlon, or working on the trainer.
+
+
+
+@section Is there a mailing list?
+@cindex mail
+
+The mailing list for GoldenCheetah users is maintained via Google Groups at
+http://groups.google.com/forum/?fromgroups=#forum/golden-cheetah-uers the first post you
+make is moderated and may take a while to appear. Once your first post is made you can
+make future posts without moderation.
+
+
+
+@section How do I report a bug or request a new feature?
+@cindex feature
+@cindex bug
+@cindex report
+
+We use Github issues to record bugs and feature requests. You will need to create an
+account on github and then post a new request or bug at 
+www.github.com/GoldenCheetah/GoldenCheetah/issues
+
+
+
+@section How can I contribute?
+@cindex contribute
+
+Patches are most welcome via the mailing list or a pull request in github. Of equal
+importance is the timely reporting of bugs and help in testing fixes. We also desperately
+need volunteers to translate into non-English languages and help with writing documentation
+including the maintenance of this FAQ.
+
+If you want to help, post a note on the golden-cheetah-users mailing list.
+
+
+
+@section Can I donate to the project?
+@cindex donate
+
+We are an open source project. Our software is developed by a community. We do not have
+any facility to collect funding or spend it! We would rather you spread the word if you
+think our software is good, and maybe help out with documentation, tutorials or
+translations if you can.
+
+
+
+@node METRICS,DATA,GENERAL,Top
+@chapter METRICS
+
+
+@section What is the difference between xPower, NP and Daniels EqP?
+@cindex xPower
+@cindex NP
+@cindex Daniels
+@cindex EqP
+
+They all serve the same purpose -- to express the variable power you have generated over
+a given period of time as a single value. This is so you can quantify the intensity of
+the ride and therefore the training stress of the ride.
+
+In practice, NP and xPower are largely the same, whilst Daniels EqP place much higher
+emphasise on upper intensity work. For more info on xPower see Dr Skiba's paper on BikeScore
+http://www.physfarm.com/bikescore.pdf
+
+
+
+@section What is the difference between CP and FTP?
+@cindex CP
+@cindex FTP
+
+CP is a shorthand for CP60 in GoldenCheetah, and is computed using the Scherer/Monod
+protocol using 3 and 20 minutes. Functional Threshold Power (FTP) is an actual measure of
+the power an athlete sustains for 60 minutes.
+
+Since it is very difficult for an athlete to maintain the desired intensity FTP 'reality'
+tends to result in a number that is much lower than CP 'theory'. Often users will
+consider the two as the same.
+
+In GC we compute TSS and BikeScore using your 'CP' value. If you set it to your FTP value
+TSS will be accurate, BikeScore is likely to be lower. And if you set it to your CP value
+BikeScore will be accurate, but TSS will be overstated.
+
+
+
+@section Why does my CP chart show higher watts for a longer duration?
+@cindex CP
+
+A higher power average for a longer time is possible if an effort has been "book ended".
+If, for example, you did a massive 30 second effort, followed by freewheeling for 29:30
+then another massive 30 second effort, then your best average for a continuous 30 minutes
+would in fact be lower that your best average for a continuous 30minutes and 30 seconds.
+(Thanks for Jon Hill from the Golden Cheetah Users mailing list for this example).
+
+
+
+@section Can I set a different CP/FTP for different reasons e.g. CP/FTP on a trainer?
+@cindex CP
+@cindex FTP
+@cindex trainer
+
+We allow you to override the CP value for a specific ride by setting the "CP" field to
+the value you wish to use for the ride in question. We do not have a concept of 'separate'
+Cps for different purposes -- you will need to specify the CP when the data is imported
+into GC. But this allows you to make manual adjustments.
+
+We provide this functionality at user request -- we do not endorse the concept of multiple
+CP values. But we do recognise the ongoing debate regarding physiological stress from
+working on a trainer vs on the road.
+
+
+@section How do I seed the CTL for my PMC?
+@cindex PMC
+@cindex CTL
+@cindex LTS
+
+You can seed the starting CTL (we call it LTS, for long term stress) when you define a
+season. That way it is re-usable in a number of places. To do this you edit the season
+(date range) in the Home View and can set the Starting LTS.
+
+@section Why is elevation different in GoldenCheetah to my other training software / website?
+@cindex elevation
+
+Different programs will use different hysteresis values to smooth the small changes in
+altitude. In GC we use a hysteresis value of 3m.
+
+If this is of great concern you can adjust the hysteresis value in preferences under the
+general tab.
+
+
+
+@section Why is a metric e.g. TSS or average power different in GoldenCheetah to Garmin Connect?
+@cindex TSS
+@cindex AP
+@cindex Garmin Connect
+
+The algorithms for calculating TSS, AP etc are static. They are implemented exactly the
+same way in GoldenCheetah, Garmin Connect, TrainingPeaks etc. The algorithms are extremely
+simple and not prone to difficulty in implementation.
+
+However, how each application treats pauses and stops or loss of data accounts for most
+differences. In GoldenCheetah we always calculate AP,TSS etc including stop time. Other
+applications choose to ignore or smooth segments of short duration.
+
+In addition, if there are anomalies in your data, with large gaps or even time going
+backwards, this will drastically affect GoldenCheetah's calculations.
+
+We NEVER attempt to interpret data anomalies -- if the results are not as you would expect
+you will need to correct the data. We do not 'silently' fix the data for you. There is no
+secret sauce in GoldenCheetah, we are open and transparent with your data.
+
+
+
+@section How do I set the metrics shown for intervals in the various summaries?
+
+In the GoldenCheetah preference pane under the Metrics tab you can choose the metrics
+that will be shown in the ride summary charts and the metrics that will be shown in the
+interval summary in the analysis sidebar.
+
+
+
+@section How do I add a metric to the details screen (so I can override it) ?
+@cindex override
+
+If the metric you want (e.g. TSS) is not shown then you will need to add it via the
+GoldenCheetah preferences pane. On Mac this is from the menu option
+GoldenCheetah->Preferences whilst on Windows and Linux it is under Tools->Options.
+
+You will need to select 'Data Fields' option from preferences toolbar and then the
+'fields' tab. You will see a list of fields that are associated with a particular screen
+tab. If you scroll down you should find entries for the 'Metrics' screen tab, you can
+insert a new entry here with the '+' button. You should make sure the new entry is
+called exactly the same thing as the metric in question.
+
+For 'TSS' this is relatively straight forward. For others, e.g. 'Average Heart Rate' you
+must make sure that the name includes spaces etc. Once your metric has been added to the
+configuration you should save that and return to the details screen where you can now
+maintain it.
+
+If you are creating a manual entry then there is no 'details' tab in the dialog. Once
+you have created the entry (and again in this case TSS can be entered in the dialog)
+you should go to the details tab to maintain any other specific fields. The manual entry
+dialog is designed to be simple and accept only the most common of entries.
+
+
+
+@section Can you calculate gradient, virtual power or other derived series from the ride data?
+
+Not in 3.0. We may introduce derived data series in the future.
+
+
+
+@section Can I export metrics or access the metric database GC uses?
+
+The metrics are stored within a Sqlite 3 Database called 'metricDBv3' that can be found
+in the athlete directory. You can use any Sqlite 3 tools to query and work with the db.
+
+Alternatively you can export the db in its entirety using the Activity->Export Metrics
+as CSV to export to a format you can use in a spreadsheet program. 
+
+
+
+@node DATA,UPLOADING AND DOWNLOADING,METRICS,Top
+@chapter DATA
+
+
+
+@section How do I split, merge or join files?
+@cindex split
+@cindex merge
+@cindex join
+
+You can split a file by time using the activity->split ride menu item (or toolbar button).
+
+To join two rides together (making one longer ride from two rides) you can copy rows
+in the activity editor and paste special in the ride editor (right click) and then select
+append mode.
+
+If you wish to merge rides, that is much harder and would need to be performed outside
+of GC or by cutting and pasting columns in the activity editor.
+
+
+
+@section How can I find 'spikes' or specific values in activity data?
+@cindex spikes
+@cindex anomalies
+
+The activity editor has a function to find data on its toolbar. You can specify a range
+or upper or lower limit and find values less than, greater than or between a range of values.
+
+Additionally, the editor will scan the file looking for anomalies -- where the data
+appears to be out of normal ranges. These are shown with a wiggly red line in the editor
+and can also be listed by clicking on the anomalies icon on the editor toolbar.
+
+If the anomalies icon is not enabled on the toolbar then there are no anomalies in the
+currently selected ride.
+
+
+
+@section How can I fix 'spikes' or 'anomalies' in activity data?
+@cindex spikes
+@cindex anomalies
+
+You can either manually edit the values in the activity editor (there is full undo and
+redo in the editor). Or you can use the fix tools that are listed under the tool menu
+option (fix power spikes, fix gaps in recording, fix gps errors, fix torque.
+
+Each of the fix tools opens a dialog that displays texts to explain what the fix tool does.
+
+
+
+@section How can I add/remove a field to edit on the details screen?
+
+The fields (metadata) that is editable can be configured in the preferences pane under
+the data fields tab. Where no screen is specified (its left blank) it will not be made
+available.
+
+GoldenCheetah ships with a number of fields defined in the config but with no screen set.
+If you wish to use them simply set the screen tab to the tab you would like it to be
+shown on. To remove a field set the field tab to blank.
+
+
+
+@section What are 'special fields' ?
+
+There are a number of fields that when maintained in the details screen will be used
+elsewhere in the code to calculate metrics or for other purposes.
+
+Some examples include;
+
+    Weight - used in W/KG calculations, Sport and Workout code are
+    used  when exporting to other file formats, Identifier is used to assign a UUID to the
+    activity when it is uploaded to online services and so on.
+
+There is a full list of special fields and their meaning in the Golden Cheetah user
+guide appendices.
+
+
+
+@section How do I find/add/sort/delete/edit intervals ?
+
+The context menu (on the right hand side of the splitter handle) for the interval
+sidebar in Analysis view contains a number of options for working with intervals.
+
+Additionally, you can click and drag on the performance (aka ride) plot to visually
+define an interval.
+
+
+
+@section How can I export to a specific file format?
+@cindex PWX
+@cindex JSON
+@cindex TCX
+@cindex CSV
+@cindex FITLOG
+
+Activity->Export allows you to export the activity to csv, fitlog, gc (xml), json,
+Training Peaks PWX or Garmin TCX format.
+
+
+
+@section Can I use GC to convert data from one format to another on the command line?
+
+No. It is something we may add in v3.1
+
+
+
+@section Can I delete an athlete and all his/her data?
+
+No. It must be done manually by removing the athlete directory via the operating
+system. Please ensure you do this when GoldenCheetah is not running.
+
+
+
+@node UPLOADING AND DOWNLOADING,SEASONS AND EVENTS,DATA,Top
+@chapter UPLOADING AND DOWNLOADING
+
+
+
+@section Why does upload to TrainingPeaks keep failing?
+@cindex TrainingPeaks
+@cindex upload
+
+The Sport field in TrainingPeaks must have very specific values, although this is not
+documented in the XML Schema. We recommend using a sport of "Bike" if you plan on
+uploading rides to training peaks.
+
+
+
+@section Why does download from TrainingPeaks say I need a premium account?
+@cindex TrainingPeaks
+@cindex download
+
+Training Peaks only allow paid up members to get access to their data. If you are
+using a free service they do not let you retrieve your data.
+
+
+
+@section Why is data uploaded to Strava all wrong?
+@cindex Strava
+
+In general Strava will only use GPS data. If your ride does not contain GPS data then
+Strava is not likely to play nice. In addition many of the other data series will be
+ignored. This is related to Strava data processing in V2.0 of their API.
+
+We always upload as TCX since the JSON flavour of their API appears to have less
+functionality.
+
+
+
+@section What settings do I need to get GoldenCheetah to upload to my Google Calendar?
+@cindex Google
+
+The upload to Google Calendar uses their CalDAV API, and as such needs to specify a
+collection. This means when entering the details in the passwords pane of preferences
+you should use the following for the caldav url:
+    
+    https://www.google.com/calendar/dav/xxxx@@gmail.com/events/
+
+Where xxxx is your username. The username will need to be repeated in the username
+field and obviously set the password too.
+
+
+
+@node SEASONS AND EVENTS,CHARTS,UPLOADING AND DOWNLOADING,Top
+@chapter SEASONS AND EVENTS
+
+
+
+@section Why are there different types of seasons?
+@cindex season
+@cindex adhoc
+@cindex cycle
+
+This is to help with planning functions. As of v3 there is no real distinction made.
+Adhoc seasons are expected to be used solely as date ranges and have no associated plan.
+Whilst other season types may contain plans. This is only relevant for planning
+functions that are not available yet.
+
+
+
+@section What is event used for?
+@cindex event
+
+It is only used to annotate a LTM chart -- so you can show an 'event' that happened at
+a particular date. There are no rules about what constitutes and event. It could be a
+race, a training camp or just a day that was particularly meaningful e.g. illness, crash.
+
+
+
+@node CHARTS,INDEX,SEASONS AND EVENTS,Top
+@chapter CHARTS
+
+
+
+@section I want to plot month -1,-2 and -3 how do I do that?
+@cindex month
+@cindex prior
+
+Assuming the chart allows you to specify a date range you can select 'This' 'month'
+and select prior '3' to specify a month 3 years prior, similarly 'This' 'month' and
+prior '2' is a month 2 months ago, whilst 'This' 'month' and prior '1' is last month.
+
+'This' 'month' prior and 0 is just this month.
+
+
+
+@section How does the mean max chart calculate CP when showing power?
+@cindex CP
+@cindex algorithm
+
+The CP algorithm searches your best power for two durations; for anaerobic efforts it 
+looks between 15s and 1min, for aerobic it looks for best efforts between 10mins and
+an hour.
+
+Once it has found these two best values it will curve fit the two to enable the
+60min value to be extracted. Bear in mind this is a theoretical number and as described
+above is applicable to the BikeScore algorithm. The value for FTP that the TSS algorithm
+requires is simply the highest value for 60mins for the time period, assuming you have
+performed a 60minute test recently.
+
+
+
+@section How should I use Aerolab?
+@cindex Aerolab
+@cindex Chung
+@cindex VE
+
+The following is a brief piece of advice from Robert Chung, from a discussion on the
+Golden Cheetah Users mailing list:
+
+    Ideally, you'll want calm conditions (both in terms of wind and traffic) but here's a
+    quickie test you can do just to get a handle on what to do. Try to find a loop without
+    stop signs, or an out-and-back with maybe a little dip or something in the middle. Make
+    sure you won't get hit by a car and have good sight lines. I just go around my block a
+    few times. Do a loop in the drops, then another loop faster, then a loop slower; then
+    repeat with your hands on the hoods.
+
+    Weigh yourself and the bike and ballpark the air density. 
+
+    See whether you can come close to modeling the "true" elevation profile by sliding the
+    CdA slider around. Even with this informal test, as long as the wind isn't blowing too
+    hard, you ought to be able to see a difference between the loops where you were in the
+    drops and the loops where you on the hoods, and to spot little bumps and dips in the road. 
+
+There is also an overview of Virtual Elevation to measure aerodynamics in this
+YouTube video from the power seminar at Interbike 2011 given by Jim Meyer the founder
+of Quarq:
+
+    http://www.youtube.com/watch?v=b8tJnFE_BFg&feature=youtu.be&t=27m58s
+
+Finally, Robert Chung's original paper is included in the docs section of the GoldenCheetah
+repository, you can it up here (click on 'View Raw' to download):
+
+    https://github.com/GoldenCheetah/GoldenCheetah/blob/master/doc/contrib/ChungVE.pdf
+
+
+
+@section My map doesn't show?
+@cindex map
+
+This is most likely because you have a proxy that requires authentication or session
+details. We do not have sophisticated support for internet proxy servers. We will
+re-use the operating system settings where they are configured.
+
+
+
+@section What is the treemap plot used for?
+@cindex treemap
+
+Typically it is used to visualise where you spend your time or where you get best
+results.  It is not particularly useful if you do not maintain details for each ride
+e.g. workout code, sport et al.
+
+
+
+@section Can I change the colors in plot x ?
+@cindex colour
+
+With the exception of the Long Term Metric plots the colours on the charts are
+configured in the GoldenCheetah preferences pane.
+
+We want to use the same colours to plot each data series across the charts, so you
+can change them globally.
+
+The only colours you cannot change are the colours assigned to intervals when plotting
+them on scatterplot or PfPv. These colours are assigned according to their sequence.
+
+
+
+@section How do you zoom in on a chart?
+@cindex zoom
+
+You can zoom in on the distribution, scatterplot and PfPv charts by selecting the zoom
+area with the left click of the mouse.
+
+On the performance (ride) plot you can zoom with the span slider at the bottom of the
+chart (if you select the full plot in the chart settings).
+
+There are no other zoom options for the other charts.
+
+
+
+@section I zoomed in but can't zoom out?
+@cindex zoom
+@cindex unzoom
+
+Right click will zoom back out to the previous zoom level (in the case of zooming
+multiple times).  If you select another activity the chart will return to fully
+zoomed out.
+
+
+
+@section GoldenCheetah is saying there is no data for a chart, but I'm sure there is?
+
+You should check in the editor if the data series is present. if the activity is a
+manual activity entry it will contain no data.
+
+@node INDEX,MOST COMMON QUESTIONS OF ALL,CHARTS,Top
+@unnumbered Index
+
+@printindex cp
+
+@bye
--- a/doc/user/GC3-Manual.pdf
+++ b/doc/user/GC3-Manual.pdf
--- a/doc/user/GC3-Manual.texinfo
+++ b/doc/user/GC3-Manual.texinfo
@@ -0,0 +1,804 @@
+\input texinfo   @c -*-texinfo-*-
+@input palatino
+@c %**start of header
+@setfilename GC3-Manual.texinfo
+@settitle Golden Cheetah User Manual
+@c %**end of header
+@paragraphindent 0
+ 
+@copying
+This manual is for Golden Cheetah, version 3.0.
+ 
+Copyright @copyright{} 2013 Mark Liversedge
+@end copying
+ 
+@titlepage
+@image{"image/0-icon",140pt,140pt}
+@vskip 20pt
+@title Golden Cheetah User Manual
+@c @subtitle subtitle-if-any
+@c @subtitle second-subtitle
+@author Mark Liversedge
+ 
+@c  The following two commands
+@c  start the copyright page.
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+ 
+@end titlepage
+ 
+@c So the toc is printed at the start.
+@contents
+ 
+@c ********************************************************************************
+@c Welcome chapter
+@c ********************************************************************************
+@chapter WELCOME TO GOLDENCHEETAH
+@node WELCOME
+
+@vskip 6pt 
+@center @strong{GoldenCheetah is an open source program for cyclists.}
+@vskip 12pt
+ 
+In fact, it is primarily a program for cyclists with a power meter. It provides functions
+to download, import, edit, upload and analyse rides containing power data.
+ 
+It can be used to analyse bike rides that do not contain power, perhaps containing speed,
+cadence or GPS data. It can be used to analyse other kinds of workouts, perhaps run or
+swim activities. It can be used purely as a log or journal for any activity.
+ 
+@vskip 12pt 
+@center @strong{GoldenCheetah is primarily an open source program for cyclists that own a power meter.}
+@vskip 12pt
+ 
+In addition to the post-workout analysis it can also be used as a desktop application to
+record and monitor workouts on a cycle trainer. It captures telemetry from ANT+ sensors
+and can also work directly with Bike trainers that provide the right kind of interface.
+ 
+In this manual we will be explaining how to use and configure the functions within GoldenCheetah.
+We will be describing it from the perspective of a bike rider. In all cases we will be describing
+how the functions within GoldenCheetah work, and how to configure them.
+ 
+This is not a manual on how to train with power. We would urge you to read other books for that
+kind of information and would recommend `Racing and Training with a Power Meter' by
+Dr Andrew Coggan and Hunter Allan.
+ 
+@section About this latest version, V3.0
+
+This manual has been written as a companion to the latest release of GoldenCheetah, v3.0.
+Released in Spring 2013, it represented an overhaul of the code and was a major update.
+ 
+If you are new to GoldenCheetah then all the functions it provides will be new to you, but
+for existing users, version 3.0 had introduced;
+ 
+@heading 500+ bug fixes and minor enhancements
+ 
+It fixed 46 serious issues and over 400 bugs in over 1,500 different
+commits. GoldenCheetah is now over 100,000 lines of code.  In addition
+to addressing stability issues it also addressed a number of performance
+related issues.  Whilst the new metric functionality and database means that
+a modern PC is recommended, the code is still efficient enough to run on
+a netbook.
+ 
+@heading Redesigned UI and UX
+ 
+One of the most immediate changes you will notice with v3.0 are the
+major changes to the user experience and user interface. From the
+initial help screens for new users through to the redesigned preferences
+pane for advanced users, it is slicker and more professional.
+ 
+There are 4 views available with specific and detailed sidebars for
+performance tracking (home), short term tracking (diary) as well as
+the well known analysis and training views from earlier releases.
+ 
+It now allows you to view charts tabbed and tiled, you can resize and
+move charts around and customise them using roll-over controls. The
+activity list is fully configurable and can be configured to show any
+number of columns.
+ 
+@heading Support for the latest bike computers
+ 
+It supports direct download features for the Cyclops Joule and Joule GPS
+as well as the latest SRM Powercontrol 6 and 7. We also added support for
+the O-sync Macro and Macro X.
+ 
+@heading Support for more telemetry
+ 
+Alongside the support for the latest bike computers it also added the ability to
+track and plot new data series, including; Headwind, LR Balance, Temperature and
+Slope.
+ 
+@heading Export and Batch Export as well as lots of new file formats
+ 
+It will now export and batch export your data to a wide variety of file
+formats include TCX, PWX, JSON and XML as well as FITLOG and GPX.
+ 
+It also supports reading files from SportTracks, GPX, Tacx CAF and the
+SLF/SMF file formats. We have also added legacy WKO+ file format support
+(CP 1.0 and 1.1) as well as import of Wattbike TXT exports.
+ 
+@heading Support for a wide selection of internet services
+ 
+It can upload and download data from; Withings, Zeo, Strava, TrainingPeaks,
+Training Stage Buch, RideWithGPS as well as Internet based calendars (calDAV)
+such as Google Calendar.
+ 
+@heading Realtime training significantly enhanced
+ 
+Support has been added for native ANT+ removing the need for quarqd. Video Playback
+is built in using VLC/QTKit. It now has a  media library to organise and reference
+any video content you may have from Tacx Ergvideos through Sufferfest.
+ 
+It supports Virtual Power for popular devices from KK, LeMond and many other
+trainers.  We have added support for the amazing new Wahoo Fitness Kickr trainer
+as well as the old Tacx Fortius.
+ 
+It also introduces new ways to ride on the trainer including;
+Streetview, SpinScan (on Computrainer) and an enhanced Workout Plot that plots
+telemetry against the workout as you ride.
+ 
+It also includes Computrainer calibration, a workout wizard and download
+from ErgDB as well as Multi-device Support allowing you to ride with with
+your ANT+ powermeter on your Computrainer, Kickr or Fortius.
+ 
+@heading Advanced search and data filtering
+ 
+It introduces free text search across all activities and a data filter (using the same search box)
+to filter activities with specific properties. Some examples of using the filter might be
+finding all rides with a TSS > 300 or perhaps those with an IF >0.9 and a duration of > 1hr.
+ 
+The search and filter functions can be applied to the charts -- which means that
+you can plot a PMC only where sport is "Bike" or perhaps power distribution but only
+where the workout code is FTPTEST.
+ 
+@heading Lots of new charts
+ 
+It provides a new HR to Power analysis chart as well as a more utilitarian 2d scatter
+plot. It will also use Bing as map provider for the Map chart.
+ 
+The histogram and CP curve plots will now plot data for a date range rather than for
+a specific ride and it will also now plot a mean max curve for HR, Power, Speed, Cadence,
+xPower, VAM and NP.
+ 
+@heading New metrics, including TrainingPeaks' TSS and NP
+ 
+The TrainingPeaks metrics have been added to both the analysis functions as well as the
+training functions (e.g. track TSS as you ride the trainer).
+ 
+There are now over 100 different metrics and measures you can work with including things
+like; Pace, Maximums, Gradient, VAM, wpk, time in HR Zones and many, many more.
+ 
+@section Open Source
+ 
+GoldenCheetah is an open source program. This means the source code is freely available to
+download and compile. You can add new features and fix bugs. All we ask is that you then
+share your work back to the main project.
+ 
+This is how GoldenCheetah has developed since it was first created in 2006. Over 50 different
+people have contributed new features and fixes in the 7 years since then.
+ 
+@heading Mailing list
+ 
+As you would expect there is an active community of users and developers, you can join the
+discussion and contribute. The main GoldenCheetah website is @url{www.goldencheetah.org}
+and the main mailing list is hosted on Google Groups and is called golden-cheetah-users.
+ 
+@heading Reporting bugs and requesting new features
+ 
+The code is hosted in a repository at GitHub. Github is an internet service hosting open
+source and commercial code repositories for thousands of projects. In addition to hosting
+projects GitHub also provides an issue tracker.
+ 
+The issue tracker URL is: @url{github.com/GoldenCheetah/GoldenCheetah/issues}.
+ 
+We use the GitHub issue tracker to manage all bug reports and feature requests. If you are
+looking for a new feature or have experienced a problem using the software then you should
+consider raising it on the issue tracker.
+ 
+As a non-developer one of the most valuable contributions you can make to the project is to
+provide accurate and informative bug reports. This makes it easier for the developers to fix
+the code and in turn makes the software better for everyone.
+
+@section Bit of Past and Present
+ 
+In early 2006 a Cat 1 racer called Sean Rhea bought a Powertap. Back then power meters were not
+very common. They certainly weren't very open. The software options were very limited. But
+Sean was a bit of a geek.
+ 
+He set about reverse engineering the protocol the Powertap used to communicate with the PC and
+he developed a couple of command line utilities in the C programming language; `ptdl' and `ptunpk'.
+These utilities downloaded data from a Powertap via its serial interface saving to `raw' files
+on disk, and then read that raw file and formatted the output for inputting into GNU plot.
+ 
+But it soon became clear that using the command line was not at all user friendly. A GUI was
+going to be required. And so, in late 2006 Sean set about writing a GUI version using the
+QT framework and moving to the C++ language (because he needed to learn QT for his new job).
+ 
+This early version had the main charts you see today, indeed a lot of that early code is still
+present. It could plot the ride, histograms and the CP curve that it is famous for.
+ 
+From 2007 with Sean leading many new people became involved and new features
+were introduced; support for SRM using the libsrm project written by Rainer Clasen. Support for
+Linux, Windows, Metrics, File Formats, Power Zones and a large number of new charts including
+a Performance Manager written by Eric Murray. Google Map written by Greg Lonnon.
+ 
+During this time the project moved from a `hack' project to a fully fledged open source development
+project and saw Jamie Kimberley, Robert Carlsen and Justin Knotzke assist Sean in managing development
+with the introduction of a bugs database and more formalised releases for Linux, Mac and Windows.
+ 
+In Summer 2009 a lot of the current developers joined the project, notably Damien Grauser who added
+much needed support for interval analysis and Mark Liversedge who contributed WKO+ file support and
+the 3d plot. Over the next 12 months v2.0 was developed introducing the training View (with Justin Knotzke)
+as well as the editor and tools, metadata and long term plotting charts.
+ 
+At the tail end of 2010 Sean handed leadership of the project to Mark. Sean was no longer racing and most
+develpoment was now being delivered by others anyway. So in January 2011 Mark merged a number of features
+that were being developed in private into the main repository and thus V3 development began.
+ 
+In Spring 2013, after 3 years of development version 3 was released, along with this user guide.
+ 
+Version 3 is a landmark release and provides a platform for future development - the modular views and
+configurable layouts means it will be very easy to introduce new functionality and concepts without
+needing to adjust the underlying code. In short, v3 provides a future platform.
+
+@section Future Plans
+ 
+Version 3.1 is already being planned and the high priority features include;
+
+@itemize @bullet 
+@item Planning functions centred around the concept of an interactive performance manager chart
+where you set target events and physical adaptations or performance targets with a progression of
+daily stress and long term stress.
+ 
+@item Interval Analysis and Comparison across separate rides, to compare efforts and track and rank
+performance in intervals or `segments' of rides and routes.
+ 
+@item Season by Season progression to compare and rank performance development in cycles and seasons
+across the long term charts, but also the critical power and distribution charts.
+ 
+@item Separation of the training view into a separate program `OpenTrainer' to enable more advanced
+graphical displays including video with overlay and animations.
+@end itemize
+ 
+Version 3.1, hopefully, will not take so long to come to fruition and is currently targetted for Spring
+2014.
+ 
+@c ********************************************************************************
+@c Quick start guide
+@c ********************************************************************************
+@chapter QUICK START GUIDE
+@node QUICK
+
+For those of you that are new to GoldenCheetah this section gets you up and running
+with the software and using its basic features. For those of you with experience of
+GoldenCheetah from previous releases, you might like to skip this chapter.
+ 
+@section Downloading and Installing
+There are four ways to get GoldenCheetah onto your PC and available for use:
+@itemize @bullet
+
+@item @strong{Download a Stable release build} - We maintain a stable release binary for download and installation
+on the GoldenCheetah website, at @url{www.goldencheetah.org/download}.
+
+@item @strong{Download a Development build}  - We also provide regular build updated of the
+very latest code on the GoldenCheetah development build website, at @url{www.stand2surf.net}.
+
+@item @strong{Build from Source} - Since we provide the source code for the program
+you can get the source from GitHub and build your own.  But unless you plan on
+contributing to the project this is probably a pointless exercise. You
+could just use the pre-built binaries described above.
+
+@item @strong{Apt-get install} - If you are running a Linux distro you can get the GoldenCheetah
+binary and dependencies installed via apt-get. It is worth noting that at the time of writing
+the V3 build has not yet been packaged.
+
+@end itemize
+
+Once you have the binary installed you can go ahead and run it, it doesn't need any
+configuration before you start.
+ 
+@section Running for the first time
+
+When you run GoldenCheetah for the very first time it will prompt you with the Athlete 
+selection dialog box. In GoldenCheetah we allow you to create as many athletes as you
+like. This may sound like it is only useful for coaches, but in fact you may want to
+set up a scratch athlete to play and learn.
+
+Either way in this first run you will not have an athlete created, and will see a blank
+dialog, asking you to select or create an athlete to work with:
+
+@vskip 12pt
+@center @image{"image/1-noathlete",140pt}
+@center @emph{Figure 1: Initial Dialog}
+@vskip 6pt
+
+At this point you should go ahead and click `New...'. This will open another dialog
+window to create a new athlete and set some basic data. 
+
+@vskip 12pt
+@center @image{"image/1-newathlete",140pt}
+@center @emph{Figure 2: New Athlete Dialog}
+@vskip 6pt
+
+Whilst it is possible to configure these values in preferences or within an individual activity
+you should go ahead and set up as much of the data as accurately as possible. These values
+are used as defaults in many metric calculations. 
+
+If you click on the blank athlete icon on the right it is possible to set an image for the athlete
+too. This isn't used anywhere at present, but that may change in the future.
+
+The LTHR value is the HR at which the onset of blood lactate accumulates, whilst the CP value is
+the maximum theoretical watts you can hold for an hour. It is very similar to your FTP (if that
+is a term you understand).
+
+Once you're happy with the settings click save and you will then be able to select your new athlete
+in that initial dialog (except of course there is now an athlete listed). Go ahead and open that
+athlete and you wil be greeted with GoldenCheetah, but a splash page.
+
+@vskip 12pt
+@center @image{"image/1-blankstate",280pt}
+@center @emph{Figure 3: Analysis view splash screen}
+@vskip 6pt
+
+This page is shown because there is no data associated with this athlete. We need to go ahead and
+download some data from your bike computer or import some data from disk or USB.
+
+@section Downloading a ride from device
+
+If you use a Powertap, SRM, Joule, Joule GPS or Macro-X device you will be able to download from
+it directly. Please make sure the device is conected and plugged in correctly. For example, if you
+are downloading from a Powertap please make sure the computer is firmly connected and displays
+`HOST' on its screen.
+
+@vskip 12pt
+@center @image{"image/1-download",210pt}
+@center @emph{Figure 4: Download Dialog}
+@vskip 6pt
+
+To start the download go ahead and click the download from device button. This will open up the 
+download dialog. Select the right kind of device and serial port before clicking on the `Download'
+button. If no serial port is listed, or the port is not correct you can click on the `Rescan' 
+button to look again for your device. This is sometimes required if you click on `Download' before
+the device is connected.
+
+Any ride files will then be downloaded and imported into GoldenCheetah and the splash screen will
+disappear to reveal the Analysis view of GoldenCheetah. Congratulations - you can now start using
+GoldenCheetah to analyse and track your performance.
+ 
+@section Importing data from file 
+
+To import files into GoldenCheetah you have a couple of options. You can drag and drop them from 
+a file explorer or from the desktop into the main GoldenCheetah window, or you can select them via 
+the import files button on the splash screen.  Once you have done either the import activity 
+wizard will appear to process the selected files.
+
+@vskip 12pt
+@center @image{"image/1-import",280pt}
+@center @emph{Figure 5: Import Activity Wizard}
+@vskip 6pt
+
+You will notice that the files are opened first to ensure you have the required permissions to 
+read them before being validated. Once validated the dialog will prompt you to edit any of the dates 
+(some file formats do not include date information). Once you have set the dates (if needed) you can 
+click on save to complete the import and save the files to disk.
+ 
+The splash screen will now disapper and reveal the main GoldenCheetah analysis view and you can
+now start analysing and tracking your performance.
+
+@c ********************************************************************************
+@c Basic Navigation
+@c ********************************************************************************
+@chapter GETTING AROUND GOLDENCHEETAH
+@node NAVIGATION
+ 
+@vskip 12pt
+@center @image{"image/2-mainwindow",280pt}
+@center @emph{Figure 6: Main window elements}
+@vskip 6pt
+
+Regardless of whether you are training with your bike trainer, reviewing recent activities in the diary
+or tracking long term performance in the home view, the GoldenCheetah layout is always the same.
+
+Looking at the figure above you will see the following components;
+@itemize @bullet
+
+@item @strong{Menu Bar} - this contains all the menu options for GoldenCheetah. The screenshot shown is
+from the Mac OSX version, but the menu bar is similar in modern Linux distributions. On Windows the menu
+bar will be seen within the main window rather than at the top of the screen.
+
+@item @strong{Tool Bar} - the toolbar contains buttons to get quick access to functions that also available
+within the menu bar. We place them in the toolbar because they are used very commonly, and it is handy to be
+able to get at them quickly and easily.
+
+In V3 the toolbar is biased towards functions used during analysis, but this may change as we get more feedback
+from users about what they use most commonly in the other views.
+
+@item @strong{Scope Bar} - the scope bar is used to select the view. Each view offers different functionality as
+their names suggest. Additionally there is a `+' menu to the right of the scope bar for adding charts to the view
+selected.
+
+@item @strong{Side Bar} - the side bar contains selections and lists that are most appropriate for what the user
+is currently doing. It changes as different views are selected in the scope bar.
+
+@item @strong{Main View} - selected via the scope bar the main view shows the charts and windows relevant to the
+view in question. Analysis View contains analysis functions and so on. Note that the view can be shown in a tabbed
+style or a scrolling set of tiles.
+
+@end itemize
+
+The only time the main window looks different to that shown above is when running for the first time or when no
+data is available. In this case a `splash' screen is shown to assist new users in importing data or setting up
+devices etc.
+@page
+@section The Menu Bar
+
+The GoldenCheetah menu bar is no different to any other application. The only slight confusion is the location of the
+preferences pane across platform. On Windows and Linux the preferences pane can be found as Tools->Options whilst
+on a Mac it is found as GoldenCheetah->Preferences.
+
+@strong{NOTE:} Each menu is now explained in the section below, but depending upon the options installed when
+the program was built you may not see all the menu options listed. If you installed a stable build from the 
+GoldenCheetah website it will have all available options compiled in @emph{this is not the case for Development builds}.
+
+@heading The @emph{Athlete} menu
+
+The Athlete menu is largely about opening and closing new windows. Since in GoldenCheetah we open a new window to
+work with a specific athlete (you cannot switch athlete in the main window, you need to open another window). As a
+result this menu is rather trivial:
+
+@itemize @bullet
+
+@item @strong{New...} - Opens the new athlete dialog we saw in the quick start guide and then proceeds to open a
+@item @strong{Open...} - Opens the choose athlete dialog in order that you select an athlete to open in a new window.
+@item @strong{Close} - Closes the current athlete window.
+@end itemize
+
+@strong{NOTE:} When you restart GoldenCheetah it will always open the athlete you last opened, so if you open up an
+athlete and close to go back to a previous window the last Athlete that was opened will be displayed, rather than the
+last one you closed. You can specify which athlete to open on the command line e.g. @code{$ ./GoldenCheetah "Mark Liversedge"}.
+
+@heading The @emph{Activity} menu
+
+In GoldenCheetah we refer to a ride file or any file that contains data related to an exercise you have completed as an `Activity'
+this is because simply referring to it as a `ride' wouldn't be valid if, for example, it was a run!
+
+Additionally, a prescribed activity plan (e.g. 2x20 mins at L4) we refer to as a `workout'. This may be confusing to users
+that come to us from TrainingPeaks WKO+ where a workout refers to a past activity. We refer to future activities as planned
+activities and past activities as just activities. 
+
+So, this menu contains functions for working with activities -- past exercises that have been recorded and imported into GoldenCheetah.
+
+@itemize @bullet
+@item @strong{Download from device...} - Also available from the tool bar this function opens the dialog to download data 
+directly from a device. We support SRM Powercontrol, Powertap LYC, Joule and Macro-X devices.
+@item @strong{Import from file...} - This option will open a file selecton box to select one @emph{or more} files to import. Once 
+selected the files will be processed by the import wizard.  You can also import files by just dragging and dropping them 
+on the analysis view.
+
+@strong{NOTE:} If you try and drag and drop on the training view we will try and import videos and workouts (not activities).
+@item @strong{Manual activity entry...} - This will open up a dialog box to create a manual entry. There is also a button on
+the toolbar that does this. A manual activity gives you the opportunity to estimate time, distance, stress and other metrics
+for an activity that wasn't record (for example on a gym bike). @xref{Importing Exporting Downloading and Creating Data, Manual activity}.
+@item @strong{Export...} - Will open a dialog box to export the currently selected activity. You can select the directory
+to export to and the file format to write the export as. This is particularly useful if you want to send your data to a 
+coach who requires data in a format his software understands.
+
+For example; PWX files can be read by WKO+ and Garmin TCX files can be read by almost all sports software. 
+
+@strong{NOTE:} Whilst we offer FITLOG format for SportsTracks we would not recommend it, since the fidelity of the 
+file format is very suspect. 
+@item @strong{Batch export...} - This opens the batch export dialog, it provides the ability to select the output
+directory and format to export to as well as select the activities you wish to export. Since this functions is
+typically used to export data for import into another program there is a select all option too.
+@item @strong{Export Metrics as CSV...} - Although the metric database is a sqlite file it can be useful to export
+all the metrics as a comma separated variable format to work with in a spreadsheet. This function will export all
+columns and rows to a CSV file of your choice.
+@item @strong{Upload to TrainingPeaks} - This will upload the currently selected ride to TrainingPeaks.com. There are
+no options since the account and password need to be defined in the preferences pane before you start.
+@item @strong{Download from TrainingPeaks...} - This will open the download dialog for TrainingPeaks.com. It allows
+you to select the specific activities you want to download and will match the available activities to any existing
+activities by examining their date and time.
+@item @strong{Upload to Strava...} - This opens the upload to strava dialog to allow you to select which data
+series you want included.
+@item @strong{Download from Strava...} - Download from Strava requires a Strava activity ID. Once you provide this
+the activity will be downloaded and imported into your activity library. Note that there is no option to select
+activities from a list since Strava do not support this (data lock-in).
+@item @strong{Upload to RideWithGPS...} - This will upload the currently selected ride to RideWithGPS.com. There
+are no options required.
+@item @strong{Upload to Trainingstagebuch...} - This will upload the currently selected ride to TrainingStageBuch.com.
+The user id and password need to be configured in the preferences pane in order for this to work.
+@item @strong{Save activity} - We do not automatically save changes to activities, if you want to update the
+activity you must save it. The metrics for the activity will only be updated when it is saved.
+@item @strong{Delete activity...} - Permanently deletes the ride from the ride library. There is no undo so use
+with caution. It will prompt to confirm you really mean it.
+@item @strong{Split activity...} - Will open the split activity wizard, this wizard will allow you to find
+breaks in an activity and split it into separate activities. This is of particular use when you forget to
+stop recording and end up with multiple activites downloaded as a single activity.
+@end itemize
+
+@heading The @emph{Tools} menu
+
+The Tools menu contains a selection of `handy' utilities, its a bit of a catch all for functions that are
+either related to manipulating activities or don't really fit in anywhere else.
+
+@itemize @bullet
+@item @strong{Options...} - Only on Linux and Windows this opens the preferences pane. Note that the preferences
+pane is an application in its own right and will remain open even when you have closed the main windows. You can
+also have multiple preferences panes open at once @strong{we recommend you do not do this}.
+@item @strong{Critical Power Estimator...} - Opens a dialog to estimate your CP based upon a short and long
+power best or result from a specific test. We recommend using 3 minutes and 20 minutes since that aligns
+with the algorithm used (Monod/Scherer).
+@item @strong{Air Density (Rho) Estimator...} - Opens a tool for estimating Air Density based upon temperature
+and air pressure. This is useful when working with Aerolab.
+@item @strong{Get Withings Data...} - Downloads all measures for you Withings weight scale, but the user id
+and public key need to be configured in the passwords section of the preferences pane.
+@item @strong{Get Zeo Data...} - Downloads sleep data for your Zeo sleep monitor. You will need to have
+configured the user id and pasword in the preferences pane.
+@item @strong{Create a new workout...} - Opens the workout wizard for creating a training view workout. This
+will create a `.erg' or `.crs' workout.
+@item @strong{Download workouts from ErgDB...} - Opens a dialog to select and download training view workouts
+from the internet ErgDB website.
+@item @strong{Import workouts or videos...} - Opens a file dialog to select and import a workout or video into
+the training view library.
+@item @strong{Scan disk for videos and workouts...} - Opens a dialog to scan directoris for workouts and
+videos and import into the training view library.
+@item @strong{Upload Activity to Calendar} - Will create a calendar entry to any CalDAV based calendar service.
+You will need to configure the URL, user and password in the preferences pane before using this.
+@item @strong{Refresh Calendar} - Will read any entries from your CalDAV internet calendar to display on the 
+calendar view.
+@item @strong{Find intervals...} - Opens a dialog to find intervals in the current activity. This menu option
+is here since it has always been on the tools menu. It should really be moved to the @emph{Activity} menu.
+@item @strong{Adjust Torque Values...} - An editor tool for adjusting the torque data series. This is useful
+when using a Powertap without calibrating.
+@item @strong{Fix GPS Errors...} - An editor tool for extrapolating and adjusting GPS values, this is useful
+when your GPS device lost its satellite connection or after importing from other software and the data
+contains invalide values.
+@item @strong{Fix Gaps In Recording...} - GoldenCheetah expects all data series samples to have timestamps
+separated by a consistent recording interval (e.g. every 1 second). This tool dialog allows you to
+extrapolate values where there are gaps in recording. In future releases we may remove the need for the 
+data series to have regular timestamps.
+@item @strong{Fix HR Spikes...} - Find and smooth out spikes in HR, usually caused by loss of conection or
+iterference from overhead power lines.
+@item @strong{Fix Power Spikes...} - Find and smooth out spikes in Power, usually caused by reed switch
+being double triggered or recording interference.
+@end itemize
+
+@heading The @emph{View} menu
+
+The View menu provides a menu access to the view configuration, showing and hiding UI elements as well as
+switching fullscreen and adding charts to the layout.
+
+@itemize @bullet
+@item @strong{Toggle Full Screen} - As the name suggests toggles between normal and full screen. On
+Linux and Mac this is also available from the F11 key (and you can use the ESC key to leave full
+screen mode too). On Mac Lion we use the standard toolbar button for switching between normal and
+full screen mode.
+@item @strong{Show Left Sidebar} - Toggles the display of the sidebar.The button on the toolbar also
+does the same. You can also drag and close the sidebar by hand.
+@item @strong{Show Toolbar} -  Toggles showing or hiding the tool bar.
+@item @strong{Tabbed View} - Toggles tabbed or tiled mode for the current view.
+@item @strong{Analysis} - Switch to the Analysis view.
+@item @strong{Home} - Switch to the Home view.
+@item @strong{Train} - Switch to the Training view.
+@item @strong{Diary} - Switch to the Diary view.
+@item @strong{Add Chart} - Opens a submenu to select a chart to add. When selected an add chart dialog
+will be open showing the chart and allowing you to adjust the chart settings before it is added to the
+current view.
+@item @strong{Reset Layout} - Will reset the current view layout to the application default. This is
+useful if you spoil your setup, or want to fall back to the current application default. Note that the
+application default will change and improve over time.
+@end itemize
+
+@heading The @emph{Window} menu
+
+Simply lists the current windows you have open and allows you to select the window to raise and make 
+the current window focus.
+@page
+@section The Toolbar and Scope bar
+
+@vskip 12pt
+@center @image{"image/2-toolbar",350pt}
+@center @emph{Figure 7: Tool Bar and Scope Bar}
+@vskip 6pt
+ 
+@section Views & Sidebar
+scopebar, sidebar, tab/tiled, add chart menu
+ 
+@section Searching and Filtering
+free text search and basics of data filtering
+ 
+@section Adding and adjusting charts
+the dialog, title, settings, finding them again
+ 
+@section Going fullscreen
+key sequences, hiding and showing the toolbar
+screensaver?
+ 
+@section The Metric database
+why, what, where, refreshing, exporting
+ 
+ 
+@c ********************************************************************************
+@c Working with Data
+@c ********************************************************************************
+ 
+@chapter IMPORTING EXPORTING DOWNLOADING AND CREATING DATA
+@node Importing Exporting Downloading and Creating Data
+ 
+@section Download from device
+download dialog, basics for each device (plugging in etc)
+ 
+@section Import from file
+selecting a file, the import wizard
+ 
+@section Manual activity
+the manual activity dialog and refer to details screen for more "indepth" (need a better word) stuff
+ 
+@section Exporting data
+   i A single ride
+  ii Multiple rides
+ 
+@section Uploading and Downloading from the Cloud
+   i TrainingPeaks
+  ii Strava
+ iii TrainingStage Buch
+  iv RideWithGPS
+ 
+ 
+@c ********************************************************************************
+@c ANALYSIS
+@c ********************************************************************************
+ 
+@chapter THE ANALYSIS VIEW
+@node ANALYSIS
+ 
+@section About Activities and Intervals
+ 
+@section Sidebar actions and context menus
+      o activities
+      o intervals
+ 
+@section Editing and adjusting data
+     o using the editor
+       i basics
+      ii anomalies
+     iii find
+     o advanced editor functions
+       i the `fix' tools
+      ii copying, cutting and pasting
+ 
+@c ********************************************************************************
+@c ANALYSIS CHARTS
+@c ********************************************************************************
+@chapter ANALYSIS VIEW CHARTS
+@node ANALYSIS CHARTS
+       i Activity Summary
+      ii Details
+     iii Summary and Details
+      iv Editor
+       v Performance
+      vi Critical Mean Maximals
+     vii Histogram
+    viii Pedal Force vs Velocity
+      ix Heartrate vs Power
+       x Google Map
+      xi Bing Map
+     xii 2d Plot
+    xiii 3d Plot
+     xiv Aerolab Chung Analysis
+ 
+@c ********************************************************************************
+@c HOME
+@c ********************************************************************************
+@chapter THE HOME VIEW
+@node HOME
+ 
+@section About Date Ranges, Seasons and Events
+ 
+@c ********************************************************************************
+@c HOME CHARTS
+@c ********************************************************************************
+@chapter PERFORMANCE TRACKING CHARTS
+@node HOME CHARTS
+       i Long Term Metrics
+         - indepth howto incl. setting up a PMC++
+      ii Performance Manager
+     iii Collection TreeMap
+      iv Critical Mean Maximal
+       v Distribution
+ 
+@c ********************************************************************************
+@c DIARY
+@c ********************************************************************************
+@chapter THE DIARY VIEW
+@node DIARY
+ 
+@section Purpose
+ 
+@section Summarising for Day / Week / Month
+ 
+@section Longer term purpose (planning)
+ 
+@c ********************************************************************************
+@c TRAIN
+@c ********************************************************************************
+@chapter THE TRAIN VIEW
+@node TRAIN
+ 
+@section About Devices, Workouts and Video
+ 
+@section Sidebar actions and context menus
+      o devices
+      o workouts
+      o media
+ 
+@section Working with the Workout Library
+   - Creating a new Workout
+   - Getting Workouts from ErgDB
+  
+@section Setting up and starting a workout
+    - Using CT handlebar controller
+    - controlling workout from mouse + keyboard
+ 
+@c ********************************************************************************
+@c TRAIN CHARTS
+@c ********************************************************************************
+@chapter TRAINING VIEW CHARTS
+@node TRAIN CHARTS
+        i Telemetry
+       ii Workout
+      iii Realtime
+       iv Pedal Stroke
+        v Map
+       vi StreetView
+      vii Video Player
+ 
+ 
+@c ********************************************************************************
+@c Configuration
+@c ********************************************************************************
+@chapter CONFIGURING
+@node CONFIG
+ 
+Intro and explain opening the Preferences Pane
+ 
+@section General
+ 
+@section Athlete
+     i About
+    ii Power Zones
+   iii HR Zones
+ 
+@section Passwords
+    i General
+   ii Withings
+  iii Zeo
+   iv Google Calendar (calDAV)
+ 
+@section Appearance
+ 
+@section Data Fields
+   i Fields
+  ii Notes Keywords
+ iii Processing
+ 
+@section Metrics
+  
+@section Train Devices
+   i Using Multiple Devices
+  ii Adding a device
+ 
+@c ********************************************************************************
+@c Appendices
+@c ********************************************************************************
+@unnumbered A - Supported Devices, Formats & Services
+@unnumbered B - Metrics Reference
+@unnumbered B - Data Filtering Reference
+@unnumbered C - Glossary & Resources
+@unnumbered D - OS Specifics (Directories, Drivers and Permissions)
+ 
+@unnumbered Index
+@printindex cp
+ 
+@bye
--- a/doc/user/GC3-Release.info
+++ b/doc/user/GC3-Release.info
@@ -0,0 +1,310 @@
+This is GC3-Release.info, produced by makeinfo version 4.13 from GC3-Release.texinfo.
+
+
+File: GC3-Release.info,  Node: Top,  Next: Top,  Prev: Top
+
+title
+*****
+
+These release notes are for GoldenCheetah, version 3.0.
+
+* Menu:
+
+* WHATS NEW::  What's new in V3.0
+* CONTRIBUTORS::  List of Contributors to V3.0
+
+
+File: GC3-Release.info,  Node: WHATS NEW,  Next: CONTRIBUTORS,  Prev: CONTRIBUTORS,  Up: Top
+
+1 Whats New
+***********
+
+1.1 500+ bug fixes and minor enhancements
+=========================================
+
+Over the last 3 years the performance and stability of GoldenCheetah
+has been improved considerably. One of the major criticisms of the
+software was it crashing.
+
+We have fixed 46 serious issues and over 400 bugs in over 1,500
+different commits. GoldenCheetah is now over 100,000 lines of code and
+is used by 1000s of users around the world, from Santiago to Singapore
+and Auckland to Aberdeen.
+
+In addition to addressing stability issues we have also looked closely
+at performance. Whilst the new metric functionality and database means
+that a modern PC is recommended, the code is still efficient enough to
+run on a netbook.
+
+We have introduced pre-computed metrics alongside a cache of ride bests
+across all the main data series to ensure that analysis of long term
+data is as quick and responsive as possible. We also introduced our own
+file format using JSON as an open file format, with a custom parser. We
+can now read a 1hr ride 20x faster using our native format than using
+an equivalent and very popular XML format.
+
+In short, we've squashed the big bugs and made it run much faster.
+
+1.2 Redesigned UI and UX
+========================
+
+One of the most immediate changes you will notice with v3.0 are the
+major changes to the user experience and user interface. From the
+initial help screens for new users through to the redesigned preferences
+pane for advanced users, it is slicker and more professional.
+
+We wanted an elegant and clean user interface that was intuitive to use
+and revealed complexity when it was required. We think we've come
+pretty close.
+
+There are 4 views available with specific and detailed sidebars for
+peformancee tracking (home), short term tracking (diary) as well as the
+well known analysis and training views from earlier releases.
+
+We now allow you to view charts tabbed and tiled, you can resize and
+move charts around and customise them using roll-over controls. The
+activity list is fully configurable and can be configured to show any
+number of columns. We have overhauled and introduced friendly wizards
+for adding devices and athletes through to manual activity entry.
+
+The UI is largely native on a Mac and the same UI and UX has been
+replicated on Linux and Windows. We also support full screen including
+Lion fullscreen support on a Mac.
+
+We have been through many, many iterations to get to this UX and it has
+been widely tested and critiqued by a large community of GC users.
+
+We think this is the best looking and most intuitive version of
+GoldenCheetah ever released.
+
+1.3 Support for the latest bike computers
+=========================================
+
+We have added direct download support for the Cyclops Joule and Joule
+GPS as well as the latest SRM Powercontrol 6 and 7. We also added
+support for the O-sync Macro and Macro X.
+
+In addition to this we also fixed a few issues related to importing from
+newer Garmin devices since the file format changed.
+
+1.4 Support for more telemetry
+==============================
+
+Alongside the support for the latest bike computers we also added the
+ability to track and plot new data series, including; Headwind, LR
+Balance, Temperature and Slope.
+
+1.5 Export and Batch Export as well as lots of new file formats
+===============================================================
+
+We will now export and batch export your data to a wide variety of file
+formats. We believe it is your data and it should not be locked into any
+sotfware. We support open formats such as TCX, PWX, JSON and XML as well
+as FITLOG and GPX.
+
+We have also added support for reading files from SportTracks, GPX, Tacx
+CAF and the SLF/SMF file formats. We have also added legacy WKO+ file
+format support (CP 1.0 and 1.1) as well as import of Wattbike TXT
+exports.
+
+1.6 Support for a wide selection of Cloud services
+==================================================
+
+We can now upload and download data from cloud services offered by;
+Withings, Zeo, Strava, TrainingPeaks, Training Stage Buch, RideWithGPS
+as well as Internet based calendars (calDAV) such as Google Calendar.
+
+1.7 Improvements to Aerolab
+===========================
+
+There is now an autosolver for CdA and Crr Estimation in Aerolab that
+removes a lot of the guesswork from curve fitting in Virtual Elevation
+as well as a handy Air Density (Rho) estimator.
+
+1.8 Realtime training significantly enhanced
+============================================
+
+We now support Native ANT+ removing the need for quarqd. Video Playback
+is built in using VLC/QTKit. We manage a media library to make sure you
+can re-use any content you may have from Tacx Ergvideos through
+Sufferfest.
+
+We support Virtual Power for popular devices from KK, LeMond and many
+other trainers.  We have added support for the amazing new Wahoo
+Fitness Kickr trainer as well as the old Tacx Fortius.
+
+In the train view we have added lots of new ways to ride on the trainer
+including; Streetview, SpinScan (on Computrainer) and an enhanced
+Workout Plot that plots telemetry against the workout as you ride.
+
+Finally we've added Computrainer calibration, a workout wizard and
+download from ErgDB as well as Multi-device Support allowing you to
+ride with with your ANT+ powermeter on your Computrainer, Kickr or
+Fortius.
+
+1.9 Advanced search and data filtering
+======================================
+
+We now offer the ability to use free text search across all ativities,
+enabling lightning quick searches for past activities.  We use a well
+proven and lightning fast indexing tool (CLucene) to index all the
+details of your activities seamlessly.
+
+Additionally we have introduced a data filter (using the same search
+box) to allow you to filter activities for specific properties, for
+example for all rides with a TSS > 300 or perhaps those with an IF >0.9
+and a duration of > 1hr.
+
+Both the search and filter functions can be applied to the charts -
+which means that you can plot a PMC only where sport is "Bike" or
+perhaps power distribution but only where the workout code is FTPTEST.
+
+We are still discovering how powerful these tools are when applied to
+long term performance tracking.
+
+1.10 Lots of new charts
+=======================
+
+It wouldn't be a new release of GoldenCheeth if we didn't introduce
+some new charts for detailed forensic data analysis.
+
+We've added a new HR to Power analysis as well as a more utilitarian 2d
+scatter plot. We've added Bing as map provider for the Map chart.
+
+But the single most asked for feature, and one that has been on the GC
+wish list since it was first released is the ability to plot a
+distribution for a date range.  We can now do that - allowing you to
+plot power distribution for a season or month or any number of
+sophisticated date ranges (we also added lots of advance ways to
+express date ranges).
+
+Lastly, we have also extended the CP curve to plot more than just
+power. It will now plot a mean max curve for HR, Power, Speed, Cadence,
+xPower, NP et al. And we even added VAM too, for you mountain goats.
+
+1.11 New metrics, including TrainingPeaks' TSS and NP
+=====================================================
+
+Yes, we've been granted permission by our friends at TrainingPeaks to
+use their cylcing metrics in the latest version of GoldenCheetah. We
+know that it is one of the most popular additions.
+
+Not only have we added them as metrics to plot and track, we've also
+added them to the realtime training so you can target an intensity of
+stress for a workout and monitor and adjust the intensity of the
+workout as you ride.
+
+We have also added a whole host of new metrics, there are now over 100
+different metrics and measures you can work with including things like;
+Pace, Maximums, Gradient, VAM, wpk, time in HR Zones and many, many
+more.
+
+1.12 Build and Platform support
+===============================
+
+For the technical amongst you we have removed mandatory Boost
+Dependency, which means you can build GC with nothing more than QT4.8
+installed (we will support QT5 in v3.1).  We now support OpenBSD and
+have moved to using version 6.1 of the QWT library.
+
+On a related note, you can see all the versions used, contributors
+involved and build settigs as we have improved the about box to give
+much more useful information to developers.
+
+1.13 We wrote some documentation!
+=================================
+
+Shock. We now have an FAQ covering over 50 of the most commonly asked
+questions about GoldenCheetah. And a full user manual to compliment the
+existing wiki for user generated content.
+
+One of the other criticisms we often heard about GoldenCheetah was how
+hard it was to use, and how you needed to be a cycling nerd to
+understand it. We feel that the new UI and User Experience coupled with
+much better documentation and help mean this should make this version
+of GoldenCheetah the easiest to use yet.
+
+
+File: GC3-Release.info,  Node: CONTRIBUTORS,  Next: WHATS NEW,  Prev: WHATS NEW,  Up: Top
+
+2 Contributors
+**************
+
+2.1 Credits and Contributors
+============================
+
+Literally thousands of people regularly download, install, develop,
+critique and discuss GoldenCheetah and its features and functions.
+
+Back in 2006 a stupendously gifted guy (and Cat 1 racer) called Sean
+Rhea bought a Powertap. Frustrated with the software that was available
+he set about writing some utilities to plot the data. But first he had
+to reverse engineer the protocol to talk to it.  Back then, and to a
+lesser degree now, these sports and cycling products are closed. You buy
+their product and you're stuck with their software. Sean did something
+amazing - he open sourced his code. By doing that he changed power
+analysis completely.
+
+Here in 2013 with ANT+, BTLE, Wahoo, TrainerRoad, PerfPro and of course
+GoldenCheetah things look very different. The cycling world has gone
+open. Sean can take some of the credit for that.
+
+We stand on his shoulders.
+
+Here in 2013 by far and away the biggest contributors to this project
+are Damien Grauser and Mark Liversedge.  Between the two of them they
+have committed almost 90% of all code to GoldenCheetah in the last 3
+years. Often working on stuff for others they are the reason this
+release is written for you the cyclist .. and not us the developers.
+
+Of equal importance is Gareth Coco our devops guru. With unfathomable
+patience he has built countless release candidates and development
+builds for the last 3 years. He has worked with an ever changing and
+hideous array of wacky dependencies across Windows, Mac and Linux. He
+is pretty much the only reason you can download and install our
+software. Big, big thanks to Gareth.
+
+Thats not to say that there aren't many other significant contributions
+too; Ale Martinez has masterminded and developed multi-language support
+in V3. Translations have been undertaken by Ale himself, but also by
+Til Schmiedeberg, Keisuke Yamaguchi, Marco Piccirilli, Sergei
+Chekhovskii and Rafael Oliveira Ribeiro.
+
+A large number of developers have contributed small and large bits of
+code, and many clever coaches and athletes have donated their ideas and
+best practices. I must shout out to Dr Andrea Morelli the professional
+coach, for his encouragement and insight over the last 3 years and Greg
+Steele for some of the most interesting and inspriring thoughts.
+
+Here are all the contributors, all of them have made this version of
+GoldenCheetah the best yet;
+
+Alejandro Martinez, Andrew Bryson, Andy Froncioni, Austin Roach, Berend
+De Schouwer, Bruno Assis, Chris Cleeland, Claus Assmann, Dag Gruneau,
+Damien Grauser, Darren Hague, Dean Junk, Eric Brandt, Eric Murray,
+Frank Zschockelt, Gareth Coco, Greg Lonnon, Ilja Booij, Jaime Jofre,
+Jamie Kimberley, Jim Ley, John Ehrlinger, Josef Gebel, Julian
+Baumgartner, Julian Simioni, Justin Knotzke, Keisuke Yamaguchi, Ken
+Sallot, Luke NRG, Magnus Gille, Marc Boudreau, Mark Liversedge, Mark
+Rages, Mitsukuni Sato, Ned Harding, Patrick McNerthney, Rainer Clasen,
+Robb Romans, Robert Carlsen, Roberto Massa, Ron Alford, Sean Rhea,
+Steven Gribble, Thomas Weichmann, Walter Burki.
+
+Finally a big shout out to three amazing people; Jamie Kimberley who
+has been the glue that held the GoldenCheetah community together,
+Robert Carlsen who has always been the cool guy in the glasses that
+does the cool stuff. And last but not least, my friend Justin Knotzke
+who demands and gets the best from all of us.
+
+Jamie, Robert and Justin have stepped away from regular involvement in
+GoldenCheetah, but their contributions have set the standard and will
+not be forgotten. Cheers Guys.
+
+
+
+Tag Table:
+Node: Top0
+Node: WHATS NEW310
+Node: CONTRIBUTORS9287
+
+End Tag Table
--- a/doc/user/GC3-Release.pdf
+++ b/doc/user/GC3-Release.pdf
--- a/doc/user/GC3-Release.texinfo
+++ b/doc/user/GC3-Release.texinfo
@@ -0,0 +1,276 @@
+\input texinfo   @c -*-texinfo-*-
+@input palatino
+@c %**start of header
+@setfilename Release Notes.texinfo
+@settitle Golden Cheetah v3.0 Release Notes
+@c %**end of header
+@paragraphindent 0
+
+@titlepage
+@title Golden Cheetah v3.0 Release Notes
+@c @subtitle subtitle-if-any
+@c @subtitle second-subtitle
+@author Mark Liversedge
+
+@end titlepage
+
+@c So the toc is printed at the start.
+@contents
+
+@ifnottex
+@node Top,Top,Top,
+@top title
+
+These release notes are for GoldenCheetah, version 3.0.
+@end ifnottex
+
+@menu
+* WHATS NEW::  What's new in V3.0
+* CONTRIBUTORS::  List of Contributors to V3.0
+@end menu
+
+@node WHATS NEW,CONTRIBUTORS,CONTRIBUTORS,Top
+@chapter Whats New
+
+@section 500+ bug fixes and minor enhancements
+
+Over the last 3 years the performance and stability of GoldenCheetah
+has been improved considerably. One of the major criticisms of the 
+software was it crashing.
+
+We have fixed 46 serious issues and over 400 bugs in over 1,500 different
+commits. GoldenCheetah is now over 100,000 lines of code and is used by
+1000s of users around the world, from Santiago to Singapore and Auckland
+to Aberdeen.
+
+In addition to addressing stability issues we have also looked closely at
+performance. Whilst the new metric functionality and database means that
+a modern PC is recommended, the code is still efficient enough to run on
+a netbook.
+
+We have introduced pre-computed metrics alongside a cache of ride bests across
+all the main data series to ensure that analysis of long term data is
+as quick and responsive as possible. We also introduced our own file format
+using JSON as an open file format, with a custom parser. We can now read
+a 1hr ride 20x faster using our native format than using an equivalent
+and very popular XML format.
+
+In short, we've squashed the big bugs and made it run much faster.
+
+@section Redesigned UI and UX
+
+One of the most immediate changes you will notice with v3.0 are the 
+major changes to the user experience and user interface. From the
+initial help screens for new users through to the redesigned preferences
+pane for advanced users, it is slicker and more professional.
+
+We wanted an elegant and clean user interface that was intuitive to
+use and revealed complexity when it was required. We think we've
+come pretty close.
+
+There are 4 views available with specific and detailed sidebars for
+peformancee tracking (home), short term tracking (diary) as well as
+the well known analysis and training views from earlier releases.
+
+We now allow you to view charts tabbed and tiled, you can resize and
+move charts around and customise them using roll-over controls. The
+activity list is fully configurable and can be configured to show any
+number of columns. We have overhauled and introduced friendly wizards
+for adding devices and athletes through to manual activity entry.
+
+The UI is largely native on a Mac and the same UI and UX has been
+replicated on Linux and Windows. We also support full screen including
+Lion fullscreen support on a Mac.
+
+We have been through many, many iterations to get to this UX and it has
+been widely tested and critiqued by a large community of GC users.
+
+We think this is the best looking and most intuitive version of GoldenCheetah
+ever released.
+
+@section Support for the latest bike computers
+
+We have added direct download support for the Cyclops Joule and Joule GPS
+as well as the latest SRM Powercontrol 6 and 7. We also added support for
+the O-sync Macro and Macro X.
+
+In addition to this we also fixed a few issues related to importing from
+newer Garmin devices since the file format changed.
+
+@section Support for more telemetry
+
+Alongside the support for the latest bike computers we also added the ability to
+track and plot new data series, including; Headwind, LR Balance, Temperature and
+Slope.
+
+@section Export and Batch Export as well as lots of new file formats
+
+We will now export and batch export your data to a wide variety of file 
+formats. We believe it is your data and it should not be locked into any
+sotfware. We support open formats such as TCX, PWX, JSON and XML as well
+as FITLOG and GPX.
+
+We have also added support for reading files from SportTracks, GPX, Tacx
+CAF and the SLF/SMF file formats. We have also added legacy WKO+ file 
+format support (CP 1.0 and 1.1) as well as import of Wattbike TXT exports.
+
+@section Support for a wide selection of Cloud services
+
+We can now upload and download data from cloud services offered by; Withings,
+Zeo, Strava, TrainingPeaks, Training Stage Buch, RideWithGPS as well
+as Internet based calendars (calDAV) such as Google Calendar.
+
+@section Improvements to Aerolab
+
+There is now an autosolver for CdA and Crr Estimation in Aerolab that
+removes a lot of the guesswork from curve fitting in Virtual Elevation
+as well as a handy Air Density (Rho) estimator.
+
+@section Realtime training significantly enhanced
+
+We now support Native ANT+ removing the need for quarqd. Video Playback
+is built in using VLC/QTKit. We manage a media library to make sure you
+can re-use any content you may have from Tacx Ergvideos through Sufferfest.
+
+We support Virtual Power for popular devices from KK, LeMond and many other
+trainers.  We have added support for the amazing new Wahoo Fitness Kickr trainer
+as well as the old Tacx Fortius.
+
+In the train view we have added lots of new ways to ride on the trainer including;
+Streetview, SpinScan (on Computrainer) and an enhanced Workout Plot that plots
+telemetry against the workout as you ride.
+
+Finally we've added Computrainer calibration, a workout wizard and download 
+from ErgDB as well as Multi-device Support allowing you to ride with with
+your ANT+ powermeter on your Computrainer, Kickr or Fortius.
+
+@section Advanced search and data filtering
+
+We now offer the ability to use free text search across all ativities, enabling
+lightning quick searches for past activities.  We use a well proven and lightning fast
+indexing tool (CLucene) to index all the details of your activities seamlessly.
+
+Additionally we have introduced a data filter (using the same search box) to allow
+you to filter activities for specific properties, for example for all rides with a
+TSS > 300 or perhaps those with an IF >0.9 and a duration of > 1hr.
+
+Both the search and filter functions can be applied to the charts -- which means that
+you can plot a PMC only where sport is "Bike" or perhaps power distribution but only
+where the workout code is FTPTEST.
+
+We are still discovering how powerful these tools are when applied to long term
+performance tracking.
+
+@section Lots of new charts
+
+It wouldn't be a new release of GoldenCheeth if we didn't introduce some new 
+charts for detailed forensic data analysis.
+
+We've added a new HR to Power analysis as well as a more utilitarian 2d scatter
+plot. We've added Bing as map provider for the Map chart.
+
+But the single most asked for feature, and one that has been on the GC wish list
+since it was first released is the ability to plot a distribution for a date range.
+We can now do that -- allowing you to plot power distribution for a season or month
+or any number of sophisticated date ranges (we also added lots of advance ways to
+express date ranges).
+
+Lastly, we have also extended the CP curve to plot more than just power. It will
+now plot a mean max curve for HR, Power, Speed, Cadence, xPower, NP et al. And we
+even added VAM too, for you mountain goats.
+
+@section New metrics, including TrainingPeaks' TSS and NP
+
+Yes, we've been granted permission by our friends at TrainingPeaks to use their
+cylcing metrics in the latest version of GoldenCheetah. We know that it is one of
+the most popular additions.
+
+Not only have we added them as metrics to plot and track, we've also added them to
+the realtime training so you can target an intensity of stress for a workout and
+monitor and adjust the intensity of the workout as you ride.
+
+We have also added a whole host of new metrics, there are now over 100 different
+metrics and measures you can work with including things like; Pace, Maximums,
+Gradient, VAM, wpk, time in HR Zones and many, many more.
+
+@section Build and Platform support
+
+For the technical amongst you we have removed mandatory Boost Dependency, which means
+you can build GC with nothing more than QT4.8 installed (we will support QT5 in v3.1).  
+We now support OpenBSD and have moved to using version 6.1 of the QWT library.
+
+On a related note, you can see all the versions used, contributors involved and build
+settigs as we have improved the about box to give much more useful information to
+developers.
+
+@section We wrote some documentation!
+
+Shock. We now have an FAQ covering over 50 of the most commonly asked questions about
+GoldenCheetah. And a full user manual to compliment the existing wiki for user generated
+content.
+
+One of the other criticisms we often heard about GoldenCheetah was how hard it was to
+use, and how you needed to be a cycling nerd to understand it. We feel that the new UI
+and User Experience coupled with much better documentation and help mean this should
+make this version of GoldenCheetah the easiest to use yet.
+
+
+@node CONTRIBUTORS,WHATS NEW,WHATS NEW,Top
+@chapter Contributors
+
+@section Credits and Contributors
+
+Literally thousands of people regularly download, install, develop, critique and discuss
+GoldenCheetah and its features and functions.
+
+Back in 2006 a stupendously gifted guy (and Cat 1 racer) called Sean Rhea bought a 
+Powertap. Frustrated with the software that was available he set about writing some
+utilities to plot the data. But first he had to reverse engineer the protocol to talk to it. 
+Back then, and to a lesser degree now, these sports and cycling products are closed. You buy 
+their product and you're stuck with their software. Sean did something amazing -- he open 
+sourced his code. By doing that he changed power analysis completely. 
+
+Here in 2013 with ANT+, BTLE, Wahoo, TrainerRoad, PerfPro and of course GoldenCheetah things 
+look very different. The cycling world has gone open. Sean can take some of the credit for that. 
+
+We stand on his shoulders.
+
+Here in 2013 by far and away the biggest contributors to this project are Damien Grauser and 
+Mark Liversedge.  Between the two of them they have committed almost 90% of all code to 
+GoldenCheetah in the last 3 years. Often working on stuff for others they are the reason this 
+release is written for you the cyclist .. and not us the developers.
+
+Of equal importance is Gareth Coco our devops guru. With unfathomable patience he has built
+countless release candidates and development builds for the last 3 years. He has worked with an
+ever changing and hideous array of wacky dependencies across Windows, Mac and Linux. He is pretty
+much the only reason you can download and install our software. Big, big thanks to Gareth.
+
+Thats not to say that there aren't many other significant contributions too; Ale Martinez
+has masterminded and developed multi-language support in V3. Translations have been undertaken
+by Ale himself, but also by Til Schmiedeberg, Keisuke Yamaguchi, Marco Piccirilli, Sergei Chekhovskii
+and Rafael Oliveira Ribeiro.
+
+A large number of developers have contributed small and large bits of code, and many clever
+coaches and athletes have donated their ideas and best practices. I must shout out to
+Dr Andrea Morelli the professional coach, for his encouragement and insight over the last
+3 years and Greg Steele for some of the most interesting and inspriring thoughts.
+
+Here are all the contributors, all of them have made this version of GoldenCheetah the best yet;
+
+Alejandro Martinez, Andrew Bryson, Andy Froncioni, Austin Roach, Berend De Schouwer, Bruno Assis,
+Chris Cleeland, Claus Assmann, Dag Gruneau, Damien Grauser, Darren Hague, Dean Junk, Eric Brandt,
+Eric Murray, Frank Zschockelt, Gareth Coco, Greg Lonnon, Ilja Booij, Jaime Jofre, Jamie Kimberley,
+Jim Ley, John Ehrlinger, Josef Gebel, Julian Baumgartner, Julian Simioni, Justin Knotzke, Keisuke Yamaguchi,
+Ken Sallot, Luke NRG, Magnus Gille, Marc Boudreau, Mark Liversedge, Mark Rages, Mitsukuni Sato,
+Ned Harding, Patrick McNerthney, Rainer Clasen, Robb Romans, Robert Carlsen, Roberto Massa, Ron Alford,
+Sean Rhea, Steven Gribble, Thomas Weichmann, Walter Burki.
+
+Finally a big shout out to three amazing people; Jamie Kimberley who has been the glue
+that held the GoldenCheetah community together, Robert Carlsen who has always been the
+cool guy in the glasses that does the cool stuff. And last but not least, my friend Justin
+Knotzke who demands and gets the best from all of us.
+
+Jamie, Robert and Justin have stepped away from regular involvement in GoldenCheetah, but their
+contributions have set the standard and will not be forgotten. Cheers Guys.
+
+@bye
--- a/doc/user/Makefile
+++ b/doc/user/Makefile
@@ -0,0 +1,32 @@
+# 
+# Generate documentation files from the source .texinfo
+#
+
+all: FAQ RELEASE MANUAL
+	rm -f *.aux *.cp *.cps *.fn *.ky *.log *.pg *.toc *.tp *.vr
+
+clean:
+	rm -f GC3-Manual.pdf GC3-FAQ.pdf GC3-FAQ.html \
+    GC3-FAQ.info GC3-Release.pdf GC3-Release.html GC3-Release.info 
+	rm -f *.aux *.cp *.cps *.fn *.ky *.log *.pg *.toc *.tp *.vr
+
+MANUAL: GC3-Manual.pdf 
+FAQ: GC3-FAQ.pdf GC3-FAQ.info
+RELEASE: GC3-Release.pdf GC3-Release.info
+
+## The basic commands, good on Linux/Mac
+## need mingw on Windows
+TEXI2PDF    = texi2pdf
+TEXI2HTML   = texi2html
+MAKEINFO    = makeinfo
+
+.SUFFIXES: .pdf .texinfo .info .html
+
+.texinfo.info:
+	${MAKEINFO} $< -o $@ >/dev/null 2>&1
+
+.texinfo.pdf:
+	${TEXI2PDF} -I ../contrib $< -o $@  >/dev/null 2>&1
+
+.texinfo.html:
+	${TEXI2HTML} $< -o $@ >/dev/null 2>&1
--- a/doc/user/image/0-icon.pdf
+++ b/doc/user/image/0-icon.pdf
--- a/doc/user/image/1-blankstate.pdf
+++ b/doc/user/image/1-blankstate.pdf
--- a/doc/user/image/1-download.pdf
+++ b/doc/user/image/1-download.pdf
--- a/doc/user/image/1-import.pdf
+++ b/doc/user/image/1-import.pdf
--- a/doc/user/image/1-newathlete.pdf
+++ b/doc/user/image/1-newathlete.pdf
--- a/doc/user/image/1-noathlete.pdf
+++ b/doc/user/image/1-noathlete.pdf
--- a/doc/user/image/2-mainwindow.pdf
+++ b/doc/user/image/2-mainwindow.pdf
--- a/doc/user/image/2-toolbar.pdf
+++ b/doc/user/image/2-toolbar.pdf
--- a/doc/user/image/README
+++ b/doc/user/image/README
@@ -0,0 +1,10 @@
+We only have images for the Manual since they are so large and
+consume lots of disk space etc.
+
+Each image must be a PDF file, and to make it easier to manage
+and find images we name them;
+
+section-keyword.pdf
+
+e.g.
+0-icon.pdf       - the gc icon image on the first page (section 0)
--- a/doc/web/3d.png
+++ b/doc/web/3d.png
--- a/doc/web/Makefile
+++ b/doc/web/Makefile
@@ -2,12 +2,16 @@
 CONTENT=$(wildcard *.content)
 HTML=$(subst .content,.html,$(CONTENT))
 TARBALLS=$(wildcard gc_*.tgz)
-OTHER=logo.jpg sample.gp sample.png cpint.gp cpint.png \
-	critical-power-plot.png histogram-analysis.png pf-pv-plot.png \
-	ride-plot.png ride-summary.png weekly-summary.png \
-	choose-a-cyclist.png main-window.png critical-power.png \
-	power.zones cyclist-info.png
+OTHER= 3d.png choose-a-cyclist.png cpint.gp cpint.png critical-power-plot.png critical-power.png \
+       cyclist-info.png editor.png gui-preview.png histogram-analysis.png logo.jpg logo.png \
+       main-window.png map.png metrics-power.png metrics-timedist.png metrics-tiz.png pf-pv-plot.png \
+       pm.png power.zones realtime.png ride-plot.png ride-plot2.png ride-summary.png sample.gp \
+       sample.png weekly-summary.png google-earth.png aerolab.png

+BIN=    GoldenCheetah_2.1.0_Linux_x86_64.tgz \
+        GoldenCheetah_2.1.0_Linux_x86.tgz \
+        GoldenCheetah_2.1.0_Mac_Universal.dmg \
+        GoldenCheetah_2.1.0_Windows_Installer.exe

 all: $(HTML)
 .PHONY: all clean install
@@ -17,7 +21,11 @@ clean:

 install:
 	rsync -avz -e ssh $(HTML) $(TARBALLS) $(OTHER) \
-		srhea.net:/home/srhea/wwwroot/goldencheetah.org/
+		goldencheetah.org:/home/srhea/wwwroot/goldencheetah.org/
+
+install-bin:
+	rsync -avz -e ssh $(BIN) \
+		goldencheetah.org:/home/srhea/wwwroot/goldencheetah.org/

 bug-tracker.html: bug-tracker.content genpage.pl
 	./genpage.pl "Bug Tracker" $< > $@
@@ -64,6 +72,9 @@ search.html: search.content genpage.pl
 users-guide.html: users-guide.content genpage.pl
 	./genpage.pl "User's Guide" $< > $@

+wiki.html: wiki.content genpage.pl
+	./genpage.pl "Wiki" $< > $@
+
 wishlist.html: wishlist.content genpage.pl
 	./genpage.pl "Wish List" $< > $@

--- a/doc/web/aerolab.png
+++ b/doc/web/aerolab.png
--- a/doc/web/bug-tracker.content
+++ b/doc/web/bug-tracker.content
@@ -0,0 +1,4 @@
+<p>We have an issue tracker set up at
+<a href="https://github.com/GoldenCheetah/GoldenCheetah/issues">GitHub</a>.</p>
+<p>Here is a <a href="https://github.com/blog/411-github-issue-tracker">
+link to short video</a> about the Issue tracker.</p>
--- a/doc/web/cheetah_logo.eps
+++ b/doc/web/cheetah_logo.eps
--- a/doc/web/choose-a-cyclist.png
+++ b/doc/web/choose-a-cyclist.png
--- a/doc/web/command-line.content
+++ b/doc/web/command-line.content
--- a/doc/web/contact.content
+++ b/doc/web/contact.content
--- a/doc/web/contrib.content
+++ b/doc/web/contrib.content
--- a/doc/web/contributors.txt
+++ b/doc/web/contributors.txt
@@ -0,0 +1,44 @@
+Alejandro Martinez
+Andrew Bryson
+Andy Froncioni
+Austin Roach
+Berend De Schouwer
+Bruno Assis
+Chris Cleeland
+Claus Assmann
+Dag Gruneau
+Damien Grauser
+Darren Hague
+Eric Brandt
+Eric Murray
+Frank Zschockelt
+Gareth Coco
+Greg Lonnon
+Ilja Booij
+Jamie Kimberley
+Jim Ley
+John Ehrlinger
+Josef Gebel
+Julian Baumgartner
+Julian Simioni
+Justin Knotzke
+Keisuke Yamaguchi
+Ken Sallot
+Luke NRG
+Magnus Gille
+Marc Boudreau
+Mark Liversedge
+Mark Rages
+Mitsukuni Sato
+Ned Harding
+Patrick McNerthney
+Rainer Clasen
+Robb Romans
+Robert Carlsen
+Roberto Massa
+Ron Alford
+Sean Rhea
+Steven Gribble
+Thomas Weichmann
+Tom Weichmann
+Walter Bürki
--- a/doc/web/cpint.gp
+++ b/doc/web/cpint.gp
--- a/doc/web/cpint.png
+++ b/doc/web/cpint.png
--- a/doc/web/critical-power-plot.png
+++ b/doc/web/critical-power-plot.png
--- a/doc/web/critical-power.png
+++ b/doc/web/critical-power.png
--- a/doc/web/cyclist-info.png
+++ b/doc/web/cyclist-info.png
--- a/doc/web/developers-guide.content
+++ b/doc/web/developers-guide.content
@@ -16,7 +16,9 @@ Unixes, you can use whatever package manager your distribution provides.  (We
 list the package names for MacPorts and Ubuntu below.)  On Windows, you'll
 probably need to download and install everything by hand.  You might also want
 to read <a href="old-mailing-list-archives/2009-September/002502.html">this
-mailing list message</a>.</p>
+mailing list message</a> or check the
+ <a href="https://github.com/GoldenCheetah/GoldenCheetah">INSTALL</a> documents
+on GitHub.</p>

 <p>You'll need the following:</p>
 <table align="center" width="500">
@@ -28,16 +30,10 @@ mailing list message</a>.</p>
 </tr>
 <tr>
  <td><a href="http://qt.nokia.com/downloads">Qt</a></td>
-  <td>4.5.0 or later</td>
+  <td>4.8.0 or later</td>
  <td>qt4-mac</td>
  <td>libqt4-dev</td>
 </tr>
-<tr>
-  <td><a href="http://www.boost.org/users/download/">Boost</a></td>
-  <td>1.38.0 or later</td>
-  <td>boost</td>
-  <td>libboost-dev</td>
-</tr>
 <tr>
  <td><a href="http://git-scm.com/download">git</a></td>
  <td>any</td>
@@ -63,7 +59,7 @@ checkout the code, execute this command:</p>

 <blockquote>
 <pre>
-git clone git://github.com/srhea/GoldenCheetah.git
+git clone git://github.com/GoldenCheetah/GoldenCheetah.git
 </pre>
 </blockquote>

@@ -103,9 +99,9 @@ make
 for the build process.  We would too, but none of us know
 <a href="http://www.gnu.org/software/autoconf/">autoconf</a> well
 enough to integrate it with Qt on Mac, Linux, and Windows.  If you can help
-us out with that, please email the
-<a href="cgi-bin/mailman/listinfo/golden-cheetah-users">GoldenCheetah User's
-Mailing List</a>.</p>
+us out with that, please post a message on the
+<a href="https://groups.google.com/forum/?fromgroups&hl=en#!forum/golden-cheetah-users">GoldenCheetah User's
+Google Group</a>.</p>

 <big><font face="arial,helvetica,sanserif">
 Making changes
@@ -135,18 +131,16 @@ git show --color abcd0123
 variable, declare it <code>static</code> within a .cpp file.

 <li>Only call C++'s operator <code>new</code> within the constructors and
-<code>reset</code> functions of <code>std::auto_ptr</code>,
-<code>boost::scoped_pointer</code>, etc. or when passing a parent pointer to a
-Qt class (so that the parent deletes the child).  Never call
-<code>delete</code> explicitly.
+<code>reset</code> functions of <code>std::auto_ptr</code> etc. 
+or when passing a parent pointer to a Qt class (so that the parent
+deletes the child).  Never call <code>delete</code> explicitly.

 <li>Do not use <code>malloc</code> or <code>free</code> unless forced to by an
 external C library.

 <li>Allocate large buffers on the heap, not on the stack.

-<li>When the C++ standard library has an appropriate function, use it.
-Likewise for Qt and Boost.
+<li>When the Qt or C++ standard library has an appropriate function, use it.

 <li>Only use external libraries with GPL-compatible licenses.

@@ -486,11 +480,13 @@ file</em>, <code>0001-don-t-include-zero-metrics-in-ride-summary.patch</code>,
 that other people can use to include my change in their own local git
 repositories.</p>

-<p>If you have a patch you'd like to share with others, you can email it to
-the <a href="cgi-bin/mailman/listinfo/golden-cheetah-users">GoldenCheetah
-User's Mailing List</a>, and it will be considered for inclusion in the next
-release of GoldenCheetah.  In fact, if you join the mailing list, you'll see
-lots of patches like this.  You may even want to try some of them.</p>
+<p>If you have a patch you'd like to share with others, we recommend that you
+ <a href="https://help.github.com/articles/fork-a-repo">fork</a> the main GIT
+repository and submit a
+ <a href="https://help.github.com/articles/creating-a-pull-request">pull request</a>
+ with your patch. Alternatively you can join the
+ <a href="https://groups.google.com/forum/?fromgroups#!forum/golden-cheetah-developers">
+Golden Cheetah Developer's Group</a> and post a patch there.</p>

 <big><font face="arial,helvetica,sanserif">
 Applying patches
--- a/doc/web/download.content
+++ b/doc/web/download.content
@@ -8,7 +8,7 @@ It is also available as source code.

 <p>
 Golden Cheetah downloads data from all versions of the PowerTap
-computer except the Joule.  If you're using the PowerTap USB cradle
+computer including the new Joule.  If you're using the PowerTap USB cradle
 (as opposed to the older, serial cable), you may need to install the
 <a href="http://www.ftdichip.com/Drivers/D2XX.htm">FTDI USB driver</a>
 before downloading.
@@ -17,23 +17,32 @@ before downloading.
 <p>
 On Linux and Mac OS X, Golden Cheetah also downloads from the SRM PCV.  On Mac
 OS X, you'll need to install <a href="http://osx-pl2303.sourceforge.net/">the
-open source PL2303 driver</a> to download from an SRM.
+open source PL2303 driver</a> to download from an SRM. Please see the
+<a href="https://github.com/GoldenCheetah/GoldenCheetah/wiki/Installing-the-d2xx-drivers-on-mac-os">WIKI</a> article
+ - <a href="https://github.com/GoldenCheetah/GoldenCheetah/wiki/Pcv-on-mac-os-x">
+PCV on Mac OS X</a> for further information.
 </p>

 <p>
 <font face="arial,helvetica,sanserif">
-<big><strong>Download Release 1.3.0</strong></big>
+<big><strong>Download Release 2.1</strong></big>
 </font>
+</p>

 <ul>
-<li><a href="GoldenCheetah_1.3.0_Linux_x86.gz">Linux x86</a><br>
-<li><a href="GoldenCheetah_1.3.0_Linux_x86_64.gz">Linux x86_64</a><br>
-<li><a href="GoldenCheetah_1.3.0_Mac_Universal.zip">Mac OS X Universal</a><br>
-<li><a href="GoldenCheetah_1.3.0_Windows_Installer.exe">Windows 32-bit</a>
+<li><a href="GoldenCheetah_2.1.0_Windows_Installer.exe">Windows 32-bit (runs on 64bit as well)</a>
+<li><a href="GoldenCheetah_2.1.0_Mac_Universal.dmg">Mac OS X Universal 10.4->10.7</a><br>
+<li><a href="GoldenCheetah_2.1.0_Linux_x86.tgz">Linux x86</a><br>
+<li><a href="GoldenCheetah_2.1.0_Linux_x86_64.tgz">Linux x86_64</a><br>
 </ul>
+</p>

 <p>
-You can also <a href="release-notes.html">view the release notes</a> for 1.3.0
+Please follow the <a href="/users-guide.html">User's Guide</a> on how to install
+and use Golden Cheetah.
+</p>
+<p>
+You can also <a href="release-notes.html">view the release notes</a> for 2.1
 or <a href="older-releases.html">download older releases</a> of Golden Cheetah.
 </p>

@@ -41,21 +50,23 @@ or <a href="older-releases.html">download older releases</a> of Golden Cheetah.
 <font face="arial,helvetica,sanserif">
 <big><strong>Development Releases</strong></big>
 </font>
+</p>

 <p>Gareth Coco has also made
-<a href="http://goldencheetah.stand2surf.net/">nightly development builds</a>
-available.  These binaries are based on the latest code, so they have more
-features and (sometimes) more bugs than the 1.3.0 release above.
+<a href="http://goldencheetah.stand2surf.net/">regular development builds</a>
+available.  These binaries are based on the latest source code, so they may have
+more features and less (but sometime more) bugs than the stable release above.
+</p>

 <p>
 <font face="arial,helvetica,sanserif">
 <big><strong>Source Code</strong></big>
 </font>
+</p>

 <p>
 The Golden Cheetah source code is available via git.  See the
 <a href="developers-guide.html">Developer's Guide</a> for more information.
-You can also <a href="http://github.com/srhea/GoldenCheetah/tree/master/">browse
+You can also <a href="http://github.com/GoldenCheetah/GoldenCheetah/tree/master/">browse
 the source on github</a>.
-
-
+</p>
--- a/doc/web/editor.png
+++ b/doc/web/editor.png
--- a/doc/web/faq.content
+++ b/doc/web/faq.content
--- a/doc/web/genpage.pl
+++ b/doc/web/genpage.pl
@@ -55,6 +55,7 @@ body {

 <p>  <b><a href="index.html">Introduction</a></b>
 <br> <b><a href="screenshots.html">Screenshots</a>
+<br> <b><a href="wiki.html">Wiki</a>
 <br> <b><a href="users-guide.html">User's Guide</a>
 <br> <b><a href="developers-guide.html">Developer's Guide</a>
 <br> <b><a href="faq.html">FAQ</a>
--- a/doc/web/google-earth.png
+++ b/doc/web/google-earth.png
--- a/doc/web/gui-preview.png
+++ b/doc/web/gui-preview.png
--- a/doc/web/histogram-analysis.png
+++ b/doc/web/histogram-analysis.png
--- a/doc/web/index.content
+++ b/doc/web/index.content
--- a/doc/web/license.content
+++ b/doc/web/license.content
--- a/doc/web/logo.jpg
+++ b/doc/web/logo.jpg
--- a/doc/web/logo.png
+++ b/doc/web/logo.png
--- a/doc/web/mailing-list.content
+++ b/doc/web/mailing-list.content
--- a/doc/web/main-window.png
+++ b/doc/web/main-window.png
--- a/doc/web/make-release.sh
+++ b/doc/web/make-release.sh
--- a/doc/web/map.png
+++ b/doc/web/map.png
--- a/doc/web/metrics-power.png
+++ b/doc/web/metrics-power.png
--- a/doc/web/metrics-timedist.png
+++ b/doc/web/metrics-timedist.png
--- a/doc/web/metrics-tiz.png
+++ b/doc/web/metrics-tiz.png
--- a/doc/web/older-releases.content
+++ b/doc/web/older-releases.content
@@ -18,6 +18,192 @@ please see <a href="download.html">the download page</a> instead.
 <td><i>Description</i></td>
 </tr>

+<tr>
+<td valign="top">2.0.0</td>
+<td valign="top">
+<a href="GoldenCheetah_2.0.0_Linux_x86.gz">Linux x86</a><br>
+<a href="GoldenCheetah_2.0.0_Linux_x86_64.gz">Linux x86_64</a><br>
+<a href="GoldenCheetah_2.0.0_Mac_Universal.zip">Mac OS X Universal</a><br>
+<a href="GoldenCheetah_2.0.0_Windows_Installer.exe">Windows 32-bit</a>
+</td>
+<td valign="top">
+<p>
+New Features
+  <ul>
+  <li>Aerolab (Andy Froncioni)</li>
+  <li>View ride in Google Maps (Greg Lonnon)</li>
+  <li>Long Term Metrics (Mark Liversedge)</li>
+  <li>User configurable ride metadata (Mark Liversedge)</li>
+  <li>Ride editor and tools (Mark Liversedge)</li>
+  <li>HR Zones and TRIMP Metrics (Damien Grauser)</li>
+  <li>Twitter support (Justin Knotzke)</li>
+  </ul>
+</p>
+
+<p>
+Internationalisation
+  <ul>
+  <li>Updates to French translation (Damien Grauser)</li>
+  <li>Japanese translation (Mitsukuni Sato)</li>
+  </ul>
+</p>
+
+<p>
+New Logo and Icons
+  <ul>
+  <li>Golden Cheetah Logo(Dan Schmalz)</li>
+  </ul>
+</p>
+
+<p>
+Enhanced Ride Plot
+  <ul>
+  <li>Ride plot stacked view (Damien Grauser)</li>
+  <li>Scrolling Ride Plot (Mark Liversedge)</li>
+  </ul>
+</p>
+
+<p>
+New Devices and File Formats Supported
+  <ul>
+  <li>Support for Joule BIN File Format (Damien Grauser)</li>
+  <li>Tacx CAF Ride File Format Support (Ilja Booij)</li>
+  <li>Garmin FIT ride file support (Sean Rhea)</li>
+  <li>Export to Google Earth 5.2 KML (Mark Liversedge)</li>
+  <li>Training Peaks PWX ride file support (Mark Liversedge)</li>
+  <li>Polar SRD ride file support (Mark Liversedge)</li>
+  <li>Racermate CompCS/Ergvideo .TXT ride file support (Mark Liversedge)</li>
+  </ul>
+<p>
+
+<p>
+Numerous enhancements and bug fixes from
+  <ul>
+  <li>Julian Baumgartner</li>
+  <li>Robert Carlsen</li>
+  <li>Rainer Clasen</li>
+  <li>Gareth Coco</li>
+  <li>Dag Gruneau</li>
+  <li>Jamie Kimberley</li>
+  <li>Jim Ley</li>
+  <li>Patrick J. McNerthney</li>
+  <li>Austin Roach</li>
+  <li>Ken Sallot</li>
+  <li>Thomas Weichmann</li>
+  </ul>
+</p>
+
+<p>
+Builds, testing and support
+  <ul>
+  <li>Robert Carlsen</li>
+  <li>Gareth Coco</li>
+  <li>Jamie Kimberley</li>
+  <li>Justin Knotzke</li>
+  </ul>
+</p>
+</td>
+</tr>
+<tr>
+<td valign="top">1.3.0</td>
+<td valign="top">
+<a href="GoldenCheetah_1.3.0_Linux_x86.gz">Linux x86</a><br>
+<a href="GoldenCheetah_1.3.0_Linux_x86_64.gz">Linux x86_64</a><br>
+<a href="GoldenCheetah_1.3.0_Mac_Universal.zip">Mac OS X Universal</a><br>
+<a href="GoldenCheetah_1.3.0_Windows_Installer.exe">Windows 32-bit</a>
+</td>
+<td valign="top">
+<p>
+Lots of new features:
+<p>
+Realtime Mode:
+  <ul>
+  <li>Graph data as you ride (Mark Liversedge, Justin Knotzke, Steve Gribble)</li>
+  </ul>
+</p>
+
+<p>
+Charts:
+  <ul>
+  <li>Added Performance Manager (Eric Murray)</li>
+  <li>Added 3D Modeling (Mark Liversedge and Greg Steele)</li>
+  <li>Up to four y-axes on Ride Plot (Sean Rhea)</li>
+  <li>Option to show work instead of power in Critical Power Plot (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+Intervals:
+  <ul>
+  <li>Configurable metrics for intervals (Sean Rhea)</li>
+  <li>Find peak powers and add to intervals (Mark Liversedge)</li>
+  <li>Highlight intervals in plots (Damien Grauser)</li>
+  </ul>
+</p>
+
+<p>
+Device support:
+  <ul>
+  <li>Serial port support on Windows (Mark Liversedge)</li>
+  <li>Erase SRM memory without downloading (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+Imports:
+  <ul>
+  <li>New ride import wizard (Mark Liversedge, Jamie Kimberley)</li>
+  <li>Support Computrainer 3dp file format (Greg Lonnon)</li>
+  <li>Support WKO v3 file format (Mark Liversedge)</li>
+  <li>Support files with Garmin "smart recording" (Greg Lonnon)</li>
+  <li>New GoldenCheetah (.gc) file format (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+New/improved ride metrics:
+  <ul>
+  <li>Added Joe Friel's Aerobic Decoupling (Sean Rhea)</li>
+  <li>Added training points system by running coach Jack Daniels (Sean Rhea)</li>
+  <li>Better elevation gain estimates (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+Support for more languages:
+  <ul>
+  <li>French (Damien Grauser)</li>
+  <li>Japanese (Mitsukuni Sato, Keisuke Yamaguchi)</li>
+  </ul>
+</p>
+
+<p>
+Other new features:
+  <ul>
+  <li>Group rides into seasons (Justin Knotzke)</li>
+  <li>Better ride calendar (Berend De Schouwer)</li>
+  <li>Ride list pop-up menu (Thomas Weichmann)</li>
+  </ul>
+</p>
+
+</p>
+<ul>
+<li>Direct download from SRM (R. Clasen and S. Rhea)
+<li>WKO+ file import (M. Liversedge)
+<li>Qollector support (M. Rages)
+<li>Altitude plotting (T. Weichmann)
+<li>Manual ride entry (E. Murray)
+<li>Power zones shading (D. Connell)
+<li>Weekly summary histograms (R. Carlsen)
+<li>Automatic CP estimation from CP graph (D. Connell)
+<li>Support for running off a USB stick (J. Knotzke)
+<li>OS-specific directory layout (J. Simioni)
+<li>PF/PV plot improvements (B. de Schouwer)
+<li>Memory leak fixes (G. Lonnon)
+</ul>
+<p>Thanks also to Jamie Kimberley for extensive testing.
+</td>
+</tr>
 <tr>
 <td valign="top">1.2.0</td>
 <td valign="top">
--- a/doc/web/pf-pv-plot.png
+++ b/doc/web/pf-pv-plot.png
--- a/doc/web/pm.png
+++ b/doc/web/pm.png
--- a/doc/web/power.zones
+++ b/doc/web/power.zones
--- a/doc/web/realtime.png
+++ b/doc/web/realtime.png
--- a/doc/web/release-notes.content
+++ b/doc/web/release-notes.content
@@ -0,0 +1,252 @@
+<p>
+<font face="arial,helvetica,sanserif">
+<big><strong>GoldenCheetah 2.1</strong></big>
+</font>
+</p>
+
+<p>
+New Features and Enhancements
+  <ul>
+  <li>FIT file support for Mac OSX - Rainer Clasen</li>
+  <li>SRM 5 - Rainer Clasen</li>
+  <li>Aerolab Improvements - Damien Grauser</li>
+  <li>O-Sync Macro X device support - Damien Grauser</li>
+  <li>Air density (RHO) Calculator - Steven Gribble</li>
+  <li>Virtual Power - Darren Hague</li>
+  <li>GoldenCheetah JSON - Mark Liversedge</li>
+  <li>Support TrainerRoad.com TCX Files - Mark Liversedge</li>
+  <li>Garmin GPX - Greg Lonnon</li>
+  <li>Sigma SLF/SMF - Frank Zschockelt</li>
+  </ul>
+</p>
+
+<p>
+Internationalisation
+  <ul>
+  <li>Czech (David Kramar)</li>
+  <li>French (Damien Grauser, Guillaume LeMaitre)</li>
+  <li>German (Alexander Pietsch)</li>
+  <li>Italian (Robert Masso)</li>
+  <li>Portugese (Thomas Irps)</li>
+  <li>Portugese-Brazil (Bruno Assis)</li>
+  <li>Japanese (Mitsukuni Sato, Keisuke Yamaguchi)</li>
+  <li>Spanish (Alejandro Martinez)</li>
+  </ul>
+</p>
+
+<p>
+Development Builds
+  <ul>
+  <li>Gareth Coco</li>
+  <li>Jamie Kimberley</li>
+  </ul>
+</p>
+
+<p>
+Full Change Log
+<pre>
+Alejandro Martinez (7):
+      Add Spanish Translation and Enable Metrics Translation
+      Add Spanish Translation & Fix Translation Issues
+      Set UTF-8 in charts,metadata and seasons xml files
+      Add HrZones to Weekly Summary and Fix Spanish Translation
+      Update Spanish Translation
+      Enable 3d Plot Translation and include spanish translation
+      Rho Estimator Translation
+
+Bruno Assis (1):
+      Portugese (Brazil) Translation
+
+Damien (22):
+      Modify csv import for ergomo file with comma or semicolon separator
+      Remove error logs for unused datas in ride file
+      handle showHr/Speed/Cad/Alt state for stacked view
+      Add summary metrics list to preferences
+      Correct crash with truncated files
+      Add PeakPowerHr metric (average HR during peak power)
+      Altitude scale present with no altitude data.
+      Bug #178 TRIMP is not updated after modification in Rest Hr Tag -> compute metric after save
+      Add a setFocus on the Treelist to correct a MacOs Bug of Qt
+      Modification to handle odd start page and compatible with qt 4.6
+      Correct interval
+      Modify TRIMP formula to use time_riding instead of workout time
+      Modify Aerolab to add interval highlight and zoom + auto offset
+      Aerolab : Change LCD display to LineEdit
+      Correct bug in the peakPowerHr formula
+      Correct encoding in json parser
+      Correct bug #496 for longitude < -65
+      Remove Joule warnings
+      Update french translation for rho estimator
+      Change speed to double in Bin parser
+      Correct intialisation of altitude for TCX without altitude
+      Correct intialisation of altitude for TCX without altitude
+
+Damien Grauser (2):
+      Update French translation.
+      O_Sync Macro X device support
+
+Darren Hague (5):
+      Virtual Power; Better GSC-10 pairing support.
+      Corrected - to + in CycleOps formula
+      Use realtime clock for realtime-mode clock
+      Add virtual power support for BT-ATS trainer
+      Remove toMSecsSinceEpoch() and work around
+
+David (1):
+      Updated Czech translations
+
+Eric Brandt (1):
+      fix realtime mode load timer and lcd sig. digit display issues
+
+Frank Zschockelt (2):
+      Support for Sigma SLF/SMF file formats
+      Included 4 sample sigma files in the test/rides directory
+
+Gareth Coco (25):
+      Changes to map markers
+      FIT file reader fixes
+      Set default Smoothing (secs) in Ride Plot to one (1) second
+      Change start date from UTC to localtime for bin ride file
+      Make interval period on map user defineable
+      Reorder liboauth includes
+      Comment out QwtDesigner build in qwtconfig.pri.in
+      Changed kph to km/h in displays
+      Changed KPH to km/h in displays
+      Update translation .qm files
+      Update gc_fr.qm for updated French translation
+      Fixes for RealtimeController
+      Initialise LAT/LON to zero (0.0) in the parser
+      Updated Spanish Translation
+      Add a Portuguese translation
+      Add a TCX ride exporter
+      Fix interpolation of lat/lon when missing or 0/0
+      Allow CdA to lowest possible in AerolabWindow.cpp
+      Update translation files
+      Ordered build - qwt then src
+      Fixes for Manual Ride Entry
+      Comment added and replace tabs with spaces
+      v2.1dev - Allow ride to be added with no Average HR
+      Update documentation
+      Added v2.0.0 information.
+
+Greg Lonnon (3):
+      GPX RideFile Support
+      changes to the markers in google maps.
+      Added a QFilesystemWatcher to monitor adding files to the workout directory.
+
+Ilja Booij (1):
+      fix 'Wrong distance on Tacx caf file import'
+
+Jamie Kimberley (6):
+      Update download page to reflect build of mac 10.4
+      force use of no elide and scrollbars in main tab
+      Update user guide steps 1 and 2
+      clean up wishlist web page
+      Add other TRIMP metrics to performance manager.
+      update French Translation
+
+Justin Knotzke (2):
+      Cycleops Test Ride
+      Update of German translation by LukeNRG
+
+Keisuke Yamaguchi (1):
+      Update Japanese translation files
+
+LukeNRG (4):
+      German Translation
+      Updated German Translation
+      Updated German Translations
+      German Translations
+
+Mark Liversedge (59):
+      Updated www.goldencheetah.org for v2.0 release.
+      Joule support fixed on download page.
+      Add link to wiki from the website.
+      Mac PPC binary added to downloads page.
+      Translations Bonanza!
+      Fix Computrainer with Stereo FTDI adaptor
+      Fix 'Save data' in RealtimeWindow
+      Updated Czech translation
+      Fix Wko GPS parsing on 64bit
+      Fix Virtual Power for Fluid2
+      Revert "Add Spanish Translation and Enable Metrics Translation"
+      Fix WKO parser for Ergomo users
+      Better rounding of time in AllPlot
+      Fix WKO+ file reader GPS 'drops'
+      Remove console error for seasons.xml
+      Fix RideSummaryWindow crash
+      Fix RideEditor find dialog for 'between'
+      Fix .man crash in CP plot
+      Better support for Negative, Inf, NaN and High Values
+      Fix annoying gap in CP curve.
+      Fix Save when old .bak exists
+      Fix SummaryWindow crash
+      Don't allow Nan or Inf sample values
+      Fix LogY Intervals on Histogram
+      Fit files sometimes go backwards
+      Guess ride date time for Poweragent CSV files
+      Add JSON support to v2.1
+      Fix date/time handling when importing rides
+      Update .gitignore for Lex/yacc
+      Fix Macro device data crash
+      Support FR310xt latest firmware
+      Fix FitRideFile for header change
+      Fix Download Ride Dialog instructions refresh
+      SplitRide overwrites existing file
+      Revert "SplitRide overwrites existing file"
+      Fix Split Ride file loss bug
+      Check Date/Time unique
+      Summary fixups
+      Updated translation files.
+      Add virtual power for LeMond Revolution
+      Use strtod() to convert text to double
+      Fix FTDI Adaptor on Linux and Mac
+      Better Bounds Checking in RideFile::intervalBegin()
+      Forward support in .json for temp/slope
+      Add Virtual Power for 1UP USA bike trainer
+      FitRideFile distance of zero bug
+      Disable roch text in metadata
+      Fix zero speed in TxtRideFile for Imperial units
+      Support TrainerRoad.com TCX Files/Tcx speed in meters/sec The TCX parser ignored samples where distance is
+      Fix crash if TRIMP zones > 5
+      Fix PWX file intervals
+      Fix SEGV on empty/dodgy FIT files
+
+Mitsukuni Sato (1):
+      Japanese Translation
+
+Rainer Clasen (8):
+      Added SRM5 file format read support
+      whitespace cleanup
+      fix reading signed values from srm files
+      Fit: ignore unknown message types
+      Fit: support big/little endian data
+      Fit: handle unknown fields gracefully
+      SrmRideFile: turned assertions into graceful fail
+      FitRideFile: turned assertions into graceful fail
+
+Roberto Massa (1):
+      Italian Translation
+
+Roderic Campbell (1):
+      There was what looked like a copy paste error. I changed the zone 7 label to the appropriate 7 instead of
+
+Steven Gribble (1):
+      This patch adds an air density (rho) calculator feature to GoldenCheetah.
+
+Thomas Irps (1):
+      Portuguese translation
+
+Tim Shaffer (1):
+      Make the default date range for Performance Manager a user preference.
+
+kohasa (1):
+      enabled editing interval duration by keyboard.
+
+lemaitre (1):
+      Updating of the French translation
+
+unknown (1):
+      This patch correct altitude for TCX files converted from FIT files These files doesn't have altitude for e
+</pre>
+</p>
--- a/doc/web/ride-plot.png
+++ b/doc/web/ride-plot.png
--- a/doc/web/ride-plot2.png
+++ b/doc/web/ride-plot2.png
--- a/doc/web/ride-summary.png
+++ b/doc/web/ride-summary.png
--- a/doc/web/sample.gp
+++ b/doc/web/sample.gp
--- a/doc/web/sample.png
+++ b/doc/web/sample.png
--- a/doc/web/screenshots.content
+++ b/doc/web/screenshots.content
@@ -0,0 +1,117 @@
+<!-- $Id: faq.content,v 1.4 2006/07/05 16:59:56 srhea Exp $ -->
+
+<p>
+<center>
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Ride Summary
+</font></big>
+<p>
+<img src="ride-summary.png" alt="Ride Summary Screen" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plotting Altitude, Cadence, Heart Rate, Power, and Speed
+</font></big>
+<p>
+<img src="ride-plot.png" alt="Power and HR Plot" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plotting in a Stacked View
+</font></big>
+<p>
+<img src="ride-plot2.png" alt="Stacked Power and HR Plot" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plotting Critical Power
+</font></big>
+<p>
+<img src="critical-power-plot.png" alt="The Critical Power Plot" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Histogram Analysis
+</font></big>
+<p>
+<img src="histogram-analysis.png" alt="The Power Histogram" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plotting Pedal Force Versus Pedal Velocity
+</font></big>
+<p>
+<img src="pf-pv-plot.png" alt="The Power Histogram" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+The Weekly Summary
+</font></big>
+<p>
+<img src="weekly-summary.png" alt="The Weekly Summary" align="center">
+
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plot from a selection of over 30 metrics
+</font></big>
+<p>
+<img src="metrics-power.png" alt="The Power Metrics" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Including Time and Distance
+</font></big>
+<p>
+<img src="metrics-timedist.png" alt="The Time and Distance" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Time In Zone
+</font></big>
+<p>
+<img src="metrics-tiz.png" alt="The Time In Zone" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plot with Google Maps
+</font></big>
+<p>
+<img src="map.png" alt="Google Maps" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Plot in 3 Dimensions
+</font></big>
+<p>
+<img src="3d.png" alt="The 3d plot" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Edit and Correct Ride Data
+</font></big>
+<p>
+<img src="editor.png" alt="The Ride Editor" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+The Performance Manager
+</font></big>
+<p>
+<img src="pm.png" alt="The Performance Manager" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Train with a Computrainer or ANT+ Device
+</font></big>
+<p>
+<img src="realtime.png" alt="The Realtime Window" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+Export to Google Earth 5.2
+</font></big>
+<p>
+<img src="google-earth.png" alt="Google Earth 5.2" align="center">
+<p>
+<big><font face="arial,helvetica,sanserif">
+The Aerolab
+</font></big>
+<p>
+<img src="aerolab.png" alt="Aerolab" align="center">
+</center>
+
+
--- a/doc/web/search.content
+++ b/doc/web/search.content
--- a/doc/web/users-guide.content
+++ b/doc/web/users-guide.content
@@ -1,17 +1,35 @@
-<!-- $Id: users-guide.content,v 1.5 2006/05/27 16:32:46 srhea Exp $ -->
+<!-- $Id: users-guide.content,v 1.5 2006/05/27 16:32:46 GoldenCheetah Exp $ -->
+<p>
+Note that more detailed information is often available on the
+<a href ="wiki.html">
+Golden Cheetah Wiki</a>.

+<p>
+What follows is a brief step-by-step guide to installing and setting up
+Golden Cheetah.
+
+<p>
 <big><font face="arial,helvetica,sanserif">
-Step 1: Installing the FTDI drivers
+Step 1 (optional): Installing the FTDI drivers
 </font></big>

 <p>
-Depending on your operating system, you may need to install the <a
-href="http://www.ftdichip.com/Drivers/D2XX.htm">FTDI USB
-driver</a> if you're using the PowerTap's new USB download cradle. The FTDI USB drivers are an optional install if you do not plan on downloading from your device using Golden Cheetah.
-(Note: version 1.7 of the FTDI drivers for Mac seems to be buggy.  Until they
-post a patched version, you can download version 1.6
-<a href="http://bugs.goldencheetah.org/attachments/download/1/Universal_D2XX0.1.6.dmg">here</a>.)
-</p>
+This step is only needed if you want to download rides from a powertap
+pro/comp/cervo head unit via the supplied USB cradle. Furthermore, most
+Windows and Linux systems should recognize the device without installing
+the drivers below.
+
+<p>
+Depending on your operating system, you <i>may</i> need to install the
+<a href="http://www.ftdichip.com/Drivers/D2XX.htm">FTDI D2XX driver</a> if
+you're using the PowerTap's new USB download cradle.
+Note: version 0.1.7 of the FTDI drivers for Mac seems to be buggy.  Until they
+post a patched version, you can download version 0.1.6
+ <a href="https://github.com/GoldenCheetah/GoldenCheetah/blob/master/contrib/Universal_D2XX0.1.6.dmg?raw=true">here</a>
+ and install via the terminal. Or if you are not terminal savvy, download an installer that will
+perform the installation of the 0.1.6 drivers for you
+ <a href="https://github.com/GoldenCheetah/GoldenCheetah/blob/master/contrib/Install_D2XX_drivers.mpkg.zip?raw=true">
+here</a>.

 <p>
 If you're running Linux, you may also need to uninstall the <code>brtty</code>
@@ -44,22 +62,30 @@ and download the version for your operating system and processor.
 On Mac OS X, when the download finishes, Mac OS X should automatically open
 the <code>.dmg</code> file for you.  If not, double-click to open it.  Drag
 the GoldenCheetah icon into your Applications folder, and you're done.
+</p>

 <p>
-The Linux version of GoldenCheetah is distributed as a tarball.  Download this
-file and save it to <code>/tmp</code>, then from a terminal:
+The Windows version has an installer. Just run the Installer, select where
+to install the application and away you go.
+</p>
+
+<p>
+The Linux version of GoldenCheetah is distributed as a GZipped tar archive.
+Download this file and save it to <code>/tmp</code>, then from a terminal:

 <pre>
 cd /tmp
-tar xzvf GoldenCheetah_DATE_Linux_x86.tgz
-cd GoldenCheetah_DATE_Linux_x86
+tar xvzf GoldenCheetah_X.X.X_Linux_ARCH.tgz
+cd GoldenCheetah_X.X.X_Linux_ARCH
+sudo chmod u+x GoldenCheetah
 sudo cp GoldenCheetah /usr/local/bin
 cd ..
-rm -rf GoldenCheetah_DATE_Linux_x86.tgz
+rm -rf GoldenCheetah_X.X.X_Linux_ARCH
 </pre>

-Be sure to replace "DATE" with the date of the revision you downloaded, such
-as "2007-09-23".
+Be sure to replace "X.X.X" with the version of the release you downloaded,
+such as "2.1.0" and replace "ARCH" with the architecture of the release
+you download - either "x86" (32bit) or "x84_64" (64bit).

 <p>
 <big><font face="arial,helvetica,sanserif">
@@ -68,7 +94,9 @@ Step 3: Running GoldenCheetah

 <p>
 To run GoldenCheetah on Mac OS X, double-click on the GoldenCheetah icon in
-your Applications folder.  On Linux, just type "GoldenCheetah" at the prompt.
+your Applications folder. On Windows, click the Start button, All Programs
+link, GoldenCheetah folder and then the Golden Cheetah program. On Linux,
+just type "GoldenCheetah" at the prompt.

 <p>
 The first time you run GoldenCheetah, you'll get an empty "Choose a Cyclist"
@@ -231,7 +259,7 @@ based on percentages of your CP value.  The zones are:
   <td>150%</td>
 </tr>
 <tr>
-   <td>Z1</td>
+   <td>Z7</td>
   <td>Neuromuscular</td>
   <td>150%</td>
   <td>MAX</td>
--- a/doc/web/weekly-summary.png
+++ b/doc/web/weekly-summary.png
--- a/doc/web/wiki.content
+++ b/doc/web/wiki.content
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Your Page Title</title>
+<meta http-equiv="REFRESH" content="0;url=https://github.com/GoldenCheetah/GoldenCheetah/wiki"></HEAD>
+<body>
+Redirecting to: <a href="https://github.com/GoldenCheetah/GoldenCheetah/wiki">https://github.com/GoldenCheetah/GoldenCheetah/wiki</a>
+</body>
+</html>
--- a/doc/web/wishlist.content
+++ b/doc/web/wishlist.content
@@ -0,0 +1,18 @@
+<big><font face="arial,helvetica,sanserif">
+I wish GoldenCheetah would let me...
+</font></big>
+<p>If you have a new feature that you'd like to see in GoldenCheetah
+please create a new issue on our
+<a href="https://github.com/GoldenCheetah/GoldenCheetah/issues"> issue
+ tracker</a>.
+<p>
+Examples of some features are:
+<ul>
+
+<li>Remember last settings for showPower, showHr, etc., in ride plot</li>
+<li>Add lines to CP plot for seasons, last six (eight?) weeks, etc.</li>
+<li>Show mulitple rides (seasons, etc.) in power histogram</li>
+<li>Annotate ride plot</li>
+<li>Label rides by type, course</li>
+</ul>
+
--- a/doc/web/zones.content
+++ b/doc/web/zones.content
--- a/doc/wishlist.content
+++ b/doc/wishlist.content
@@ -1,27 +0,0 @@
-<big><font face="arial,helvetica,sanserif">
-I wish GoldenCheetah would let me...
-</font></big>
-<p>If you have a new feature that you'd like to see in GoldenCheetah
-please create a new issue on our
-<a href=http://bugs.goldencheetah.org/projects/show/goldencheetah>bug/feature
-tracker</a>. Instructions for doing so are <a href="bug-tracker.html">here</a>.
-<p>
-Examples of some features are:
-<ul>
-<li>Graph ride metrics (daily hours, work, BikeScore) over the long
-    term (weeks, seasons)</li>
-<li>Display the numbers at the bottom of the ride plot, like the 
-    critical power graph does</li>
-<li>Select intervals in the ride plot and display metrics for them
-    at the bottom</li>
-<li>Pop up an "importing rides" thermometer when importing</li>
-<li>Remember last settings for showPower, showHr, etc., in ride plot</li>
-<li>Group rides list into seasons</li>
-<li>Group rides list by type, course</li>
-<li>Add lines to CP plot for seasons, last six (eight?) weeks, etc.</li>
-<li>Create new intervals</li>
-<li>Show mulitple rides (seasons, etc.) in power histogram</li>
-<li>Annotate ride plot</li>
-<li>Label rides by type, course</li>
-</ul>
-
--- a/qtsolutions/common.pri
+++ b/qtsolutions/common.pri
@@ -0,0 +1,6 @@
+infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsoap-uselib
+TEMPLATE += fakelib
+QTSOAP_LIBNAME = $$qtLibraryTarget(QtSolutions_SOAP-2.7)
+TEMPLATE -= fakelib
+QTSOAP_LIBDIR = $$PWD/lib
+unix:qtsoap-uselib:!qtsoap-buildlib:QMAKE_RPATHDIR += $$QTSOAP_LIBDIR
--- a/qtsolutions/segmentcontrol/qtsegmentcontrol.cpp
+++ b/qtsolutions/segmentcontrol/qtsegmentcontrol.cpp
@@ -0,0 +1,676 @@
+#include <QtGui/QIcon>
+#include <QtGui/QMenu>
+#include <QtGui/QPainter>
+#include <QtGui/QStyleOption>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QDebug>
+#include <QtGui/QPixmapCache>
+
+#include "qtsegmentcontrol.h"
+
+#ifdef Q_WS_MAC
+#include <Carbon/Carbon.h>
+
+static ThemeDrawState getDrawState(QStyle::State flags)
+{
+    ThemeDrawState tds = kThemeStateActive;
+    if (flags & QStyle::State_Sunken) {
+        tds = kThemeStatePressed;
+    } else if (flags & QStyle::State_Active) {
+        if (!(flags & QStyle::State_Enabled))
+            tds = kThemeStateUnavailable;
+    } else {
+        if (flags & QStyle::State_Enabled)
+            tds = kThemeStateInactive;
+        else
+            tds = kThemeStateUnavailableInactive;
+    }
+    return tds;
+}
+#endif
+
+
+class QtStyleOptionSegmentControlSegment : public QStyleOption
+{
+public:
+    enum StyleOptionType { Type = 100000  };
+    enum StyleOptionVersion { Version = 1 };
+
+    enum SegmentPosition { Beginning, Middle, End, OnlyOneSegment };
+    enum SelectedPosition { NotAdjacent, NextIsSelected, PreviousIsSelected };
+
+    QString text;
+    QIcon icon;
+    QSize iconSize;
+    SegmentPosition position;
+    SelectedPosition selectedPosition;
+
+    QtStyleOptionSegmentControlSegment()
+       : position(OnlyOneSegment), selectedPosition(NotAdjacent) { }
+    QtStyleOptionSegmentControlSegment(const QtStyleOptionSegmentControlSegment &other)
+        : QStyleOption(Version, Type) { *this = other; }
+
+protected:
+    QtStyleOptionSegmentControlSegment(int version);
+};
+
+
+
+static void drawSegmentControlSegmentSegment(const QStyleOption *option, QPainter *painter, QWidget *widget)
+{
+    // ### Change to qstyleoption_cast!
+    if (const QtStyleOptionSegmentControlSegment *segment
+            = static_cast<const QtStyleOptionSegmentControlSegment *>(option)) {
+#ifdef Q_WS_MAC
+        if (qobject_cast<QMacStyle *>(widget->style())) {
+            CGContextRef cg = qt_mac_cg_context(painter->device());
+            HIThemeSegmentDrawInfo sgi;
+            bool selected = (segment->state & QStyle::State_Selected);
+            sgi.version = 0;
+            // Things look the same regardless of enabled.
+            sgi.state = getDrawState(segment->state | QStyle::State_Enabled);
+            sgi.value = selected ? kThemeButtonOn : kThemeButtonOff;
+            sgi.size = kHIThemeSegmentSizeNormal;
+            sgi.kind = kHIThemeSegmentKindNormal;
+            sgi.adornment = kHIThemeSegmentAdornmentNone;
+            switch (segment->position) {
+            case QtStyleOptionSegmentControlSegment::Beginning:
+                sgi.position = kHIThemeSegmentPositionFirst;
+                if (segment->selectedPositions == QtStyleOptionSegmentControlSegment::NotAdjacent
+                    || selected)
+                    sgi.adornment |= kHIThemeSegmentAdornmentTrailingSeparator;
+                break;
+            case QtStyleOptionSegmentControlSegment::Middle:
+                sgi.position = kHIThemeSegmentPositionMiddle;
+                if (selected && !(segment->selectedPositions & QtStyleOptionSegmentControlSegment::PreviousIsSelected))
+                    sgi.adornment |= kHIThemeSegmentAdornmentLeadingSeparator;
+                if (selected || !(segment->selectedPositions & QtStyleOptionSegmentControlSegment::NextIsSelected)) // Also when we're selected.
+                    sgi.adornment |= kHIThemeSegmentAdornmentTrailingSeparator;
+                break;
+            case QStyleOptionTab::End:
+                sgi.position = kHIThemeSegmentPositionLast;
+                if (selected && !(segment->selectedPositions & QtStyleOptionSegmentControlSegment::PreviousIsSelected))
+                    sgi.adornment |= kHIThemeSegmentAdornmentLeadingSeparator;
+                break;
+            case QStyleOptionTab::OnlyOneTab:
+                sgi.position = kHIThemeSegmentPositionOnly;
+                break;
+            }
+
+            HIRect hirect = CGRectMake(segment->rect.x(), segment->rect.y(),
+                                       segment->rect.width(), segment->rect.height());
+            HIThemeDrawSegment(&hirect, &sgi, cg, kHIThemeOrientationNormal);
+            CFRelease(cg);
+        } else
+#endif
+        {
+            Q_UNUSED(widget);
+            painter->save();
+
+            bool selected = (segment->state & QStyle::State_Selected);
+
+            QPixmap pm;
+
+            QSize buttonSize = widget->rect().size();
+            QString key = QString("qt_segment %0 %1 %2").arg(option->state).arg(buttonSize.width()).arg(buttonSize.height());
+
+            if (!QPixmapCache::find(key, pm)) {
+                pm = QPixmap(buttonSize);
+                pm.fill(Qt::transparent);
+                QPainter pmPainter(&pm);
+                QStyleOptionButton btnOpt;
+                btnOpt.QStyleOption::operator =(*option);
+                btnOpt.state &= ~QStyle::State_HasFocus;
+                btnOpt.rect = QRect(QPoint(0, 0), buttonSize);;
+                btnOpt.state = option->state;
+
+                if (selected)
+                    btnOpt.state |= QStyle::State_Sunken;
+                else
+                    btnOpt.state |= QStyle::State_Raised;
+                widget->style()->drawPrimitive(QStyle::PE_PanelButtonCommand, &btnOpt, &pmPainter, widget);
+                pmPainter.end();
+                QPixmapCache::insert(key, pm);
+            }
+            int margin = widget->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, option, widget);
+            switch (segment->position) {
+            case QtStyleOptionSegmentControlSegment::Beginning:
+                painter->setClipRect(option->rect);
+                painter->drawPixmap(0, 0, pm);
+                painter->setOpacity(0.6);
+                painter->setPen(option->palette.dark().color());
+                painter->drawLine(option->rect.topRight() + QPoint(-1, margin), option->rect.bottomRight() + QPoint(-1, -margin));
+                break;
+            case QtStyleOptionSegmentControlSegment::Middle:
+                painter->setClipRect(option->rect);
+                painter->drawPixmap(0, 0, pm);
+                painter->setPen(option->palette.dark().color());
+                painter->drawLine(option->rect.topRight() + QPoint(-1, margin), option->rect.bottomRight() + QPoint(-1, -margin));
+                break;
+            case QStyleOptionTab::End:
+                painter->setClipRect(option->rect);
+                painter->drawPixmap(0, 0, pm);
+                break;
+            case QStyleOptionTab::OnlyOneTab:
+                painter->setClipRect(option->rect);
+                painter->drawPixmap(0, 0, pm);
+                break;
+            }
+            painter->restore();
+        }
+    }
+}
+
+static QSize segmentSizeFromContents(const QStyleOption *option, const QSize &contentSize)
+{
+    QSize ret = contentSize;
+    if (const QtStyleOptionSegmentControlSegment *segment
+            = static_cast<const QtStyleOptionSegmentControlSegment *>(option)) {
+        ret.rwidth() += 20;
+        ret.rheight() += 10;
+        if (!segment->icon.isNull())
+            ret.rwidth() += 5;
+    }
+    return ret;
+}
+
+static void drawSegmentControlSegmentLabel(const QStyleOption *option, QPainter *painter, QWidget *widget)
+{
+    if (const QtStyleOptionSegmentControlSegment *segment
+            = static_cast<const QtStyleOptionSegmentControlSegment *>(option)) {
+#ifdef Q_WS_MAC
+        if (qobject_cast<QMacStyle *>(widget->style())) {
+            retRect.adjust(+11, +4, -11, -6);
+            switch (segment->position) {
+            default:
+            case QtStyleOptionSegmentControlSegment::Middle:
+                break;
+            case QtStyleOptionSegmentControlSegment::Beginning:
+            case QtStyleOptionSegmentControlSegment::End:
+                retRect.adjust(+1, 0, -1, 0);
+                break;
+            case QtStyleOptionSegmentControlSegment::OnlyOneSegment:
+                retRect.adjust(+2, 0, -2, 0);
+                break;
+            }
+        }
+#endif
+        QStyleOptionButton button;
+        button.QStyleOption::operator=(*option);
+        button.text = segment->text;
+        button.icon = segment->icon;
+        button.iconSize = segment->iconSize;
+        widget->style()->drawControl(QStyle::CE_PushButtonLabel, &button, painter, widget);
+    }
+
+}
+
+static void drawSegmentControlFocusRect(const QStyleOption *option, QPainter *painter, QWidget *widget)
+{
+    QStyleOptionFocusRect focusOpt;
+    focusOpt.QStyleOption::operator =(*option);
+    focusOpt.rect.adjust(2, 2, -2, -2); //use subcontrolrect for this
+    widget->style()->drawPrimitive(QStyle::PE_FrameFocusRect, &focusOpt, painter, widget);
+}
+
+static void drawSegmentControlSegment(const QStyleOption *option,
+                                      QPainter *painter, QWidget *widget)
+{
+    drawSegmentControlSegmentSegment(option, painter, widget);
+    drawSegmentControlSegmentLabel(option, painter, widget);
+    //drawSegmentControlSegmentIcon(option, painter, widget);
+    if (option->state & QStyle::State_HasFocus)
+        drawSegmentControlFocusRect(option, painter, widget);
+}
+
+
+struct SegmentInfo {
+    SegmentInfo() : menu(0), selected(false), enabled(true) {}
+    ~SegmentInfo() { delete menu; }
+    QString text;
+    QString toolTip;
+    QString whatsThis;
+    QIcon icon;
+    QMenu *menu;
+    bool selected;
+    bool enabled;
+    QRect rect;
+};
+
+class QtSegmentControlPrivate {
+public:
+    QtSegmentControlPrivate(QtSegmentControl *myQ)
+        : q(myQ), lastSelected(-1), layoutDirty(true), pressedIndex(-1), wasPressed(-1), focusIndex(-1) {};
+    ~QtSegmentControlPrivate() {};
+
+    void layoutSegments();
+    void postUpdate(int index = -1, bool geoToo = false);
+
+    QtSegmentControl *q;
+    QtSegmentControl::SelectionBehavior selectionBehavior;
+    QSize iconSize;
+    QVector<SegmentInfo> segments;
+    int lastSelected;
+    bool layoutDirty;
+    int pressedIndex;
+    int wasPressed;
+    int focusIndex;
+    inline bool validIndex(int index) { return index >= 0 && index < segments.count(); }
+};
+
+void QtSegmentControlPrivate::layoutSegments()
+{
+    if (!layoutDirty)
+        return;
+    const int segmentCount = segments.count();
+    QRect rect;
+    for (int i = 0; i < segmentCount; ++i) {
+        QSize ssh = q->segmentSizeHint(i);
+        rect.setSize(ssh);
+        segments[i].rect = rect;
+        rect.setLeft(rect.left() + ssh.width());
+    }
+    layoutDirty = false;
+}
+
+void QtSegmentControlPrivate::postUpdate(int /*index*/, bool geoToo)
+{
+    if (geoToo) {
+        layoutDirty = true;
+        q->updateGeometry();
+    }
+    q->update();
+}
+
+QtSegmentControl::QtSegmentControl(QWidget *parent)
+    : QWidget(parent), d(new QtSegmentControlPrivate(this))
+{
+    setFocusPolicy(Qt::TabFocus);
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    setAttribute(Qt::WA_WState_OwnSizePolicy, false);
+}
+
+QtSegmentControl::~QtSegmentControl()
+{
+    delete d;
+}
+
+int QtSegmentControl::count() const
+{
+    return d->segments.count();
+}
+
+void QtSegmentControl::setCount(int newCount)
+{
+    d->segments.resize(newCount);
+
+    // If current index is not valid, make it the first valid index
+    if (!d->validIndex(d->focusIndex)) {
+        for (int i = 0; i < newCount; ++i) {
+            if (d->validIndex(i) && d->segments[i].enabled) {
+                d->focusIndex = i;
+                break;
+            }
+        }
+    }
+}
+
+bool QtSegmentControl::isSegmentSelected(int index) const
+{
+    if (!d->validIndex(index))
+        return false;
+
+    return d->segments.at(index).selected;
+}
+
+int QtSegmentControl::selectedSegment() const
+{
+    return d->lastSelected;
+}
+
+void QtSegmentControl::setSegmentSelected(int index, bool selected)
+{
+    if (!d->validIndex(index))
+        return;
+
+    if (d->segments[index].selected != selected) {
+        d->segments[index].selected = selected;
+        d->lastSelected = index;
+        if (d->selectionBehavior == SelectOne) {
+            const int segmentCount = d->segments.count();
+            for (int i = 0; i < segmentCount; ++i) {
+                SegmentInfo &info = d->segments[i];
+                if (i != index && info.selected) {
+                    info.selected = false;
+                    d->postUpdate(i);
+                }
+            }
+        }
+        d->postUpdate(index);
+        emit segmentSelected(index);
+    }
+}
+
+void QtSegmentControl::setSegmentEnabled(int index, bool enabled)
+{
+    if (!d->validIndex(index))
+        return;
+
+    if (d->segments[index].enabled != enabled) {
+        d->segments[index].enabled = enabled;
+        d->postUpdate(index);
+    }
+}
+
+void QtSegmentControl::setSelectionBehavior(SelectionBehavior behavior)
+{
+    if (d->selectionBehavior == behavior)
+        return;
+    d->selectionBehavior = behavior;
+    if (behavior == SelectOne) {
+        // This call will do the right thing.
+        setSegmentSelected(d->lastSelected, true);
+    } else if (behavior == SelectNone) {
+        d->lastSelected = -1;
+        const int segmentCount = d->segments.count();
+        for (int i = 0; i < segmentCount; ++i) {
+            d->segments[i].selected = false;
+        }
+        d->postUpdate(-1);
+    }
+}
+
+QtSegmentControl::SelectionBehavior QtSegmentControl::selectionBehavior() const
+{
+    return d->selectionBehavior;
+}
+
+void QtSegmentControl::setSegmentText(int index, const QString &text)
+{
+    if (!d->validIndex(index))
+        return;
+
+    if (d->segments[index].text != text) {
+        d->segments[index].text = text;
+        d->postUpdate(index, true);
+    }
+}
+
+bool QtSegmentControl::segmentEnabled(int index) const
+{
+    if (d->validIndex(index))
+        return d->segments[index].enabled;
+    return false;
+}
+
+QString QtSegmentControl::segmentText(int index) const
+{
+    return d->validIndex(index) ? d->segments.at(index).text : QString();
+}
+
+void QtSegmentControl::setSegmentIcon(int index, const QIcon &icon)
+{
+    if (!d->validIndex(index))
+        return;
+
+    d->segments[index].icon = icon;
+    d->postUpdate(index, true);
+}
+
+QIcon QtSegmentControl::segmentIcon(int index) const
+{
+    return d->validIndex(index) ? d->segments.at(index).icon : QIcon();
+}
+
+void QtSegmentControl::setIconSize(const QSize &size)
+{
+    if (d->iconSize == size)
+        return;
+
+    d->iconSize = size;
+    d->postUpdate(-1, true);
+}
+
+QSize QtSegmentControl::iconSize() const
+{
+    return d->iconSize;
+}
+
+void QtSegmentControl::setSegmentMenu(int index, QMenu *menu)
+{
+    if (!d->validIndex(index))
+        return;
+
+    if (menu != d->segments[index].menu) {
+        QMenu *oldMenu = d->segments[index].menu;
+        d->segments[index].menu = menu;
+        delete oldMenu;
+        d->postUpdate(index, true);
+    }
+}
+
+QMenu *QtSegmentControl::segmentMenu(int index) const
+{
+    return d->validIndex(index) ? d->segments.at(index).menu : 0;
+}
+
+void QtSegmentControl::setSegmentToolTip(int segment, const QString &tipText)
+{
+    if (!d->validIndex(segment))
+        return;
+
+    d->segments[segment].toolTip = tipText;
+}
+
+QString QtSegmentControl::segmentToolTip(int segment) const
+{
+    return d->validIndex(segment) ? d->segments.at(segment).toolTip : QString();
+}
+
+void QtSegmentControl::setSegmentWhatsThis(int segment, const QString &whatsThisText)
+{
+    if (!d->validIndex(segment))
+        return;
+
+    d->segments[segment].whatsThis = whatsThisText;
+}
+
+QString QtSegmentControl::segmentWhatsThis(int segment) const
+{
+    return d->validIndex(segment) ? d->segments.at(segment).whatsThis : QString();
+}
+
+QSize QtSegmentControl::segmentSizeHint(int segment) const
+{
+    QSize size;
+    const SegmentInfo &segmentInfo = d->segments[segment];
+    QFontMetrics fm(font());
+    size = fm.size(0, segmentInfo.text);
+    if (!segmentInfo.icon.isNull()) {
+        QSize size2 = segmentInfo.icon.actualSize(iconSize());
+        size.rwidth() += size2.width();
+        size.rheight() = qMax(size.height(), size2.height());
+    }
+    QtStyleOptionSegmentControlSegment opt;
+    opt.initFrom(this);
+    opt.text = segmentInfo.text;
+    opt.icon = segmentInfo.icon;
+    opt.iconSize = d->iconSize;
+    size = segmentSizeFromContents(&opt, size);
+    return size;
+}
+
+QSize QtSegmentControl::sizeHint() const
+{
+    d->layoutSegments();
+    QRect rect;
+    const int segmentCount = d->segments.count();
+    for (int i = 0; i < segmentCount; ++i) {
+        rect = rect.united(segmentRect(i));
+    }
+    return rect.size();
+}
+
+QRect QtSegmentControl::segmentRect(int index) const
+{
+    return d->validIndex(index) ? d->segments[index].rect : QRect();
+}
+
+int QtSegmentControl::segmentAt(const QPoint &pos) const
+{
+    const int segmentCount = d->segments.count();
+    for (int i = 0; i < segmentCount; ++i) {
+        QRect rect = segmentRect(i);
+        if (rect.contains(pos))
+            return i;
+    }
+    return -1;
+}
+
+void QtSegmentControl::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() != Qt::Key_Left && event->key() != Qt::Key_Right
+        && event->key() != Qt::Key_Space) {
+        event->ignore();
+        return;
+    }
+
+    if (event->key() == Qt::Key_Space) {
+        d->pressedIndex = d->focusIndex = d->focusIndex;
+        d->postUpdate(d->wasPressed);
+    } else {
+        int dx = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;
+        for (int index = d->focusIndex + dx; d->validIndex(index); index += dx) {
+            if (d->segments[index].enabled) {
+                d->focusIndex = index;
+                update();
+                break;
+            }
+        }
+    }
+}
+
+void QtSegmentControl::keyReleaseEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Space) {
+        int index = d->pressedIndex;
+        if (d->selectionBehavior != SelectNone) {
+            if (d->selectionBehavior == SelectAll) {
+                setSegmentSelected(index, !d->segments[index].selected);
+            } else {
+                setSegmentSelected(index, true);
+            }
+        } else {
+            emit segmentSelected(index);
+        }
+        d->postUpdate(index);
+        d->pressedIndex = -1;
+    }
+    QWidget::keyReleaseEvent(event);
+}
+
+
+void QtSegmentControl::paintEvent(QPaintEvent *)
+{
+    d->layoutSegments();
+    QPainter p(this);
+    QtStyleOptionSegmentControlSegment segmentInfo;
+    const int segmentCount = d->segments.count();
+    for (int i = 0; i < segmentCount; ++i) {
+        initStyleOption(i, &segmentInfo);
+        drawSegmentControlSegment(&segmentInfo, &p, this);
+    }
+}
+
+void QtSegmentControl::mousePressEvent(QMouseEvent *event)
+{
+    int index = segmentAt(event->pos());
+    if (segmentEnabled(index)) {
+        d->wasPressed = d->focusIndex = d->pressedIndex = segmentAt(event->pos());
+        d->postUpdate(d->pressedIndex);
+    }
+}
+
+void QtSegmentControl::mouseMoveEvent(QMouseEvent *event)
+{
+    int index = segmentAt(event->pos());
+    if (index != d->wasPressed) {
+        d->pressedIndex = -1;
+        d->postUpdate(d->wasPressed);
+    } else if (index == d->wasPressed && d->pressedIndex == -1) {
+        d->pressedIndex = d->wasPressed;
+        d->postUpdate(d->wasPressed);
+    }
+}
+
+void QtSegmentControl::mouseReleaseEvent(QMouseEvent *event)
+{
+    int index = segmentAt(event->pos());
+    // This order of reset is important.
+    d->pressedIndex = -1;
+    if (index == d->wasPressed && d->selectionBehavior != SelectNone) {
+        if (d->selectionBehavior == SelectAll) {
+            setSegmentSelected(index, !d->segments[index].selected);
+        } else {
+            setSegmentSelected(index, true);
+        }
+    } else if (index == d->wasPressed) {
+        emit segmentSelected(index);
+    }
+    d->postUpdate(index);
+    d->wasPressed = -1;
+}
+
+bool QtSegmentControl::event(QEvent *event)
+{
+    return QWidget::event(event);
+}
+
+void QtSegmentControl::initStyleOption(int segment, QStyleOption *option) const
+{
+    if (!option || !d->validIndex(segment))
+        return;
+    option->initFrom(this);
+    if (segment == d->pressedIndex)
+        option->state |= QStyle::State_Sunken;
+
+    // ## Change to qstyleoption_cast
+    if (QtStyleOptionSegmentControlSegment *sgi = static_cast<QtStyleOptionSegmentControlSegment *>(option)) {
+        sgi->iconSize = d->iconSize;
+        const SegmentInfo &segmentInfo = d->segments[segment];
+        if (d->segments.count() == 1) {
+            sgi->position = QtStyleOptionSegmentControlSegment::OnlyOneSegment;
+        } else if (segment == 0) {
+            sgi->position = QtStyleOptionSegmentControlSegment::Beginning;
+        } else if (segment == d->segments.count() - 1) {
+            sgi->position = QtStyleOptionSegmentControlSegment::End;
+        } else {
+            sgi->position = QtStyleOptionSegmentControlSegment::Middle;
+        }
+
+        if (hasFocus() && segment == d->focusIndex)
+            sgi->state |= QStyle::State_HasFocus;
+        else
+            sgi->state &= ~QStyle::State_HasFocus;
+
+        if (segmentInfo.enabled && isEnabled())
+            sgi->state |= QStyle::State_Enabled;
+        else
+            sgi->state &= ~QStyle::State_Enabled;
+
+        if (segmentInfo.selected) {
+            sgi->state |= QStyle::State_Selected;
+        } else {
+            if (d->validIndex(segment - 1) && d->segments[segment - 1].selected) {
+                sgi->selectedPosition = QtStyleOptionSegmentControlSegment::PreviousIsSelected;
+            } else if (d->validIndex(segment + 1) && d->segments[segment + 1].selected) {
+                sgi->selectedPosition = QtStyleOptionSegmentControlSegment::NextIsSelected;
+            } else {
+                sgi->selectedPosition = QtStyleOptionSegmentControlSegment::NotAdjacent;
+            }
+        }
+        sgi->rect = segmentInfo.rect;
+        sgi->text = segmentInfo.text;
+        sgi->icon = segmentInfo.icon;
+    }
+}
--- a/qtsolutions/segmentcontrol/qtsegmentcontrol.h
+++ b/qtsolutions/segmentcontrol/qtsegmentcontrol.h
@@ -0,0 +1,77 @@
+/*
+   A whole bunch of stuff here.
+*/
+
+#include <QtGui/QWidget>
+class QMenu;
+class QStyleOption;
+
+class QtSegmentControlPrivate;
+
+class QtSegmentControl : public QWidget
+{
+    Q_OBJECT
+    Q_ENUMS(SelectionBehavior)
+    Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior)
+    Q_PROPERTY(int selectedSegment READ selectedSegment NOTIFY segmentSelected)
+    Q_PROPERTY(int count READ count WRITE setCount)
+    Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize)
+public:
+    enum SelectionBehavior { SelectOne, SelectAll, SelectNone };
+
+    QtSegmentControl(QWidget *parent = 0);
+    ~QtSegmentControl();
+
+    int count() const;
+    void setCount(int newConut);
+
+    bool isSegmentSelected(int index) const;
+    int selectedSegment() const;
+    void setSegmentSelected(int index, bool selected);
+
+    void setSegmentEnabled(int index, bool enable);
+    bool segmentEnabled(int index) const;
+
+    void setSelectionBehavior(SelectionBehavior behavior);
+    SelectionBehavior selectionBehavior() const;
+
+    void setSegmentText(int index, const QString &text);
+    QString segmentText(int index) const;
+
+    void setSegmentIcon(int index, const QIcon &icon);
+    QIcon segmentIcon(int index) const;
+
+    void setIconSize(const QSize &size);
+    QSize iconSize() const;
+
+    void setSegmentMenu(int segment, QMenu *menu);
+    QMenu *segmentMenu(int segment) const;
+
+    void setSegmentToolTip(int segment, const QString &tipText);
+    QString segmentToolTip(int segment) const;
+
+    void setSegmentWhatsThis(int segment, const QString &whatsThisText);
+    QString segmentWhatsThis(int segment) const;
+
+    virtual QSize segmentSizeHint(int segment) const;
+    QSize sizeHint() const;
+
+    QRect segmentRect(int index) const;
+    int segmentAt(const QPoint &pos) const;
+
+protected:
+    void initStyleOption(int segment, QStyleOption *option) const;
+    void paintEvent(QPaintEvent *pe);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void keyReleaseEvent(QKeyEvent *event);
+    bool event(QEvent *event);
+
+Q_SIGNALS:
+    void segmentSelected(int selected);
+
+private:
+    QtSegmentControlPrivate *d;
+};
--- a/qtsolutions/soap/QtSoapArray
+++ b/qtsolutions/soap/QtSoapArray
@@ -0,0 +1 @@
+#include "qtsoap.h"
--- a/qtsolutions/soap/QtSoapArrayIterator
+++ b/qtsolutions/soap/QtSoapArrayIterator
@@ -0,0 +1 @@
+#include "qtsoap.h"
--- a/qtsolutions/soap/QtSoapHttpTransport
+++ b/qtsolutions/soap/QtSoapHttpTransport
@@ -0,0 +1 @@
+#include "qtsoap.h"
--- a/qtsolutions/soap/QtSoapMessage
+++ b/qtsolutions/soap/QtSoapMessage
@@ -0,0 +1 @@
+#include "qtsoap.h"
--- a/qtsolutions/soap/QtSoapNamespaces
+++ b/qtsolutions/soap/QtSoapNamespaces
@@ -0,0 +1 @@
+#include "qtsoap.h"
--- a/Show More
+++ b/Show More