Merge branch 'master' of github.com:qgis/qgis

Conflicts:
	README

git-svn-id: http://svn.osgeo.org/qgis/trunk@14888 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2010-12-11 05:40:48 +00:00
parent c5c8d13637
commit c13fa29fc7

13
README
View File

@ -3,7 +3,7 @@ README for QGIS
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 @@ daily GIS data viewing and editing needs. QGIS supports a number of raster
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 @@ Supported vector formats include:
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 @@ SUPPORT - You can get support in the following ways:
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.