[QGIS Commit] r14888 - trunk/qgis

[svn_qgis at osgeo.org]

Author: gsherman
Date: 2010-12-10 21:40:48 -0800 (Fri, 10 Dec 2010)
New Revision: 14888

Modified:
   trunk/qgis/README
Log:
Merge branch 'master' of github.com:qgis/qgis

Conflicts:
	README

Modified: trunk/qgis/README
===================================================================
--- trunk/qgis/README	2010-12-11 05:22:47 UTC (rev 14887)
+++ trunk/qgis/README	2010-12-11 05:40:48 UTC (rev 14888)
@@ -3,7 +3,7 @@
 Quantum GIS (QGIS) is an Open Source Geographic Information System. The
 project was born in May of 2002 and was established as a project on
 SourceForge in June of the same year. We've worked hard to make GIS
-software (which is traditionaly expensive commercial software) a viable
+software (which is traditionally expensive commercial software) a viable
 prospect for anyone with basic access to a Personal Computer.  QGIS
 currently runs on most Unix platforms, Windows, and OS X. QGIS is
 developed using the Qt toolkit (http://qt.nokia.com) and C++.  This
@@ -17,7 +17,7 @@
 and vector data formats, with new support easily added using the plugin
 architecture.
 
-QGIS is released under the GNU Public License (GPL) Version 2. Devloping
+QGIS is released under the GNU Public License (GPL) Version 2. Developing
 QGIS under this license means that you can (if you want to) inspect and
 modify the source code and guarantees that you, our happy user will always
 have access to a GIS program that is free of cost and can be freely
@@ -41,7 +41,7 @@
   Other OGR supported formats
 
 NOTE -- Please follow the installation instructions carefully. 
-After untarring the distribution, you can find the HTML version of the 
+After extracting the distribution, you can find the HTML version of the 
 installation document in qgis/doc/index.html. The installation document is 
 also available as PDF in the same directory.
 
@@ -60,4 +60,9 @@
                 folks on the channel are doing other things and it may take a 
                 while for them to notice your question.
 
-
+QGIS is on GitHub at http://github.com/qgis/qgis. If you wish to contribute
+patches you can fork the project, make your changes, commit to your
+repository, and then issue a pull request. The development team can then
+review your contribution and commit it upstream as appropriate. See
+http://help.github.com/forking/ and http://help.github.com/pull-requests/
+for more details.