Merge pull request #1 from rudilinfiniti/master.

Small install procedure updates for linux from Rudi Thiede
qgis · May 4, 2011 · 0e17f4e · 0e17f4e
2 parents fb01318 + 758fa49
commit 0e17f4e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/INSTALL b/INSTALL
@@ -2,8 +2,8 @@ Quantum GIS (QGIS)
 Building QGIS from source - step by step
 
 
-Last update: 20110426
-Last change: 20110404
+Last update: 20110504
+Last change: 20110502
 
 
   1. Introduction
@@ -140,7 +140,7 @@ The packages qgis depends on to build are available in the "universe" component
 of Ubuntu. This is not activated by default, so you need to activate it:
 
 1. Edit your /etc/apt/sources.list file.  
-2. Uncomment the all the lines starting with "deb"
+2. Uncomment all the lines starting with "deb"
 
 Also you will need to be running (K)Ubuntu 'edgy' or higher in order for 
 all dependencies to be met.
@@ -150,6 +150,7 @@ Now update your local sources database:
   sudo apt-get update 
 
 
+
   3.3. Install build dependencies
   ===============================
 
@@ -166,9 +167,9 @@ Now update your local sources database:
 /!\ A Special Note: If you are following this set of instructions on
 a system where you already have Qt3 development tools installed, there will
 be a conflict between Qt3 tools and Qt4 tools. For example, qmake will
-point to the Qt3 version not the Qt4. Ubuntu Qt4 and Qt3 packages are
-designed to live alongside each other. This means that for example if you
-have them both installed you will have three qmake exe's:
+point to the Qt3 version, not the Qt4. Ubuntu Qt4 and Qt3 packages are
+designed to live alongside each other. This means that, for example, if you
+have them both installed, you will have three qmake exe's:
 
   /usr/bin/qmake -> /etc/alternatives/qmake 
   /usr/bin/qmake-qt3
@@ -227,7 +228,7 @@ This directory path will be assumed for all instructions that follow.
   ===================================
 
 There are two ways the source can be checked out. Use the anonymous method
-if you do not have edit privaleges for the QGIS source repository, or use
+if you do not have edit privileges for the QGIS source repository, or use
   the developer checkout if you have permissions to commit source code
   changes.
 

diff --git a/doc/linux.t2t b/doc/linux.t2t
@@ -28,8 +28,8 @@ easiest option to compile and install QGIS.
 The packages qgis depends on to build are available in the "universe" component
 of Ubuntu. This is not activated by default, so you need to activate it:
 
-1. Edit your /etc/apt/sources.list file.  
-2. Uncomment the all the lines starting with "deb"
++ Edit your /etc/apt/sources.list file.  
++ Uncomment all the lines starting with "deb"
 
 Also you will need to be running (K)Ubuntu 'edgy' or higher in order for 
 all dependencies to be met.
@@ -56,9 +56,9 @@ sudo apt-get update
 /!\ **A Special Note:** If you are following this set of instructions on
 a system where you already have Qt3 development tools installed, there will
 be a conflict between Qt3 tools and Qt4 tools. For example, qmake will
-point to the Qt3 version not the Qt4. Ubuntu Qt4 and Qt3 packages are
-designed to live alongside each other. This means that for example if you
-have them both installed you will have three qmake exe's:
+point to the Qt3 version, not the Qt4. Ubuntu Qt4 and Qt3 packages are
+designed to live alongside each other. This means that, for example, if you
+have them both installed, you will have three qmake exe's:
 
 ``` 
 /usr/bin/qmake -> /etc/alternatives/qmake 
@@ -121,7 +121,7 @@ This directory path will be assumed for all instructions that follow.
 == Check out the QGIS Source Code ==
 
 There are two ways the source can be checked out. Use the anonymous method
-if you do not have edit privaleges for the QGIS source repository, or use
+if you do not have edit privileges for the QGIS source repository, or use
   the developer checkout if you have permissions to commit source code
   changes.