Skip to content

Commit c13fa29

Browse files
author
gsherman
committed
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
1 parent c5c8d13 commit c13fa29

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

README

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ README for QGIS
33
Quantum GIS (QGIS) is an Open Source Geographic Information System. The
44
project was born in May of 2002 and was established as a project on
55
SourceForge in June of the same year. We've worked hard to make GIS
6-
software (which is traditionaly expensive commercial software) a viable
6+
software (which is traditionally expensive commercial software) a viable
77
prospect for anyone with basic access to a Personal Computer. QGIS
88
currently runs on most Unix platforms, Windows, and OS X. QGIS is
99
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
1717
and vector data formats, with new support easily added using the plugin
1818
architecture.
1919

20-
QGIS is released under the GNU Public License (GPL) Version 2. Devloping
20+
QGIS is released under the GNU Public License (GPL) Version 2. Developing
2121
QGIS under this license means that you can (if you want to) inspect and
2222
modify the source code and guarantees that you, our happy user will always
2323
have access to a GIS program that is free of cost and can be freely
@@ -41,7 +41,7 @@ Supported vector formats include:
4141
Other OGR supported formats
4242

4343
NOTE -- Please follow the installation instructions carefully.
44-
After untarring the distribution, you can find the HTML version of the
44+
After extracting the distribution, you can find the HTML version of the
4545
installation document in qgis/doc/index.html. The installation document is
4646
also available as PDF in the same directory.
4747

@@ -60,4 +60,9 @@ SUPPORT - You can get support in the following ways:
6060
folks on the channel are doing other things and it may take a
6161
while for them to notice your question.
6262

63-
63+
QGIS is on GitHub at http://github.com/qgis/qgis. If you wish to contribute
64+
patches you can fork the project, make your changes, commit to your
65+
repository, and then issue a pull request. The development team can then
66+
review your contribution and commit it upstream as appropriate. See
67+
http://help.github.com/forking/ and http://help.github.com/pull-requests/
68+
for more details.

0 commit comments

Comments
 (0)