[QGIS Commit] r15833 - in docs/trunk/english_us/user_guide: . appendices

svn_qgis at osgeo.org svn_qgis at osgeo.org
Wed Apr 27 13:47:34 EDT 2011


Author: dassau
Date: 2011-04-27 10:47:34 -0700 (Wed, 27 Apr 2011)
New Revision: 15833

Removed:
   docs/trunk/english_us/user_guide/appendices/grass_toolbox_modules.tex
   docs/trunk/english_us/user_guide/appendices/supported_data_formats.tex
Modified:
   docs/trunk/english_us/user_guide/grass_integration.tex
   docs/trunk/english_us/user_guide/user_guide.tex
   docs/trunk/english_us/user_guide/working_with_raster.tex
   docs/trunk/english_us/user_guide/working_with_vector.tex
Log:
added supported data formats and grass toolbox modules into related sections

Deleted: docs/trunk/english_us/user_guide/appendices/grass_toolbox_modules.tex
===================================================================
--- docs/trunk/english_us/user_guide/appendices/grass_toolbox_modules.tex	2011-04-27 14:33:11 UTC (rev 15832)
+++ docs/trunk/english_us/user_guide/appendices/grass_toolbox_modules.tex	2011-04-27 17:47:34 UTC (rev 15833)
@@ -1,776 +0,0 @@
-\chapter{GRASS Toolbox modules}\label{appdx_grass_toolbox_modules}
-
-% when the revision of a section has been finalized, 
-% comment out the following line:
-% \updatedisclaimer
-
-The GRASS Shell inside the GRASS Toolbox provides access to almost all (more 
-than 330) GRASS modules through a command line interface. To offer a more user
-friendly working environment, about 200 of the available GRASS modules and 
-functionalities are also provided by graphical dialogs within the GRASS plugin Toolbox.
-
-\section{GRASS Toolbox modules}\index{GRASS!toolbox!modules}
-
-A complete list of available GRASS modules from within QGIS is found in the GRASS wiki: 
-\url{http://grass.osgeo.org/wiki/GRASS-QGIS_relevant_module_list} 
-
-%This Section lists all graphical dialogs in the GRASS Toolbox to import and
-%export data into a currently selected GRASS location and mapset.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{2.5cm}|p{11.5cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Raster and Image data import modules in the GRASS
-%  Toolbox}} \\ 
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.in.arc & Convert an ESRI ARC/INFO ascii raster file (GRID) into a
-%  (binary) raster map layer\\
-%  \hline r.in.ascii & Convert an ASCII raster text file into a (binary)
-%  raster map layer \\
-%  \hline r.in.aster & Georeferencing, rectification, and import of
-%  Terra-ASTER imagery and relative DEM's using gdalwarp \\
-%  \hline r.in.bin & Import binary raster \\
-%  \hline r.in.gdal &  Import GDAL supported raster file into a GRASS binary
-%  raster map layer \\
-%  \hline g.proj.wkt & Create new location from .prj (WKT) file \\
-%  \hline r.in.gdal.loc &  Import GDAL supported raster file into a GRASS
-%  binary raster map layer and create a fitted location \\
-%  \hline r.in.gdal.qgis & Import loaded raster into a GRASS binary raster map
-%  layer \\
-%  \hline r.in.gdal.qgis.loc &  Import loaded raster file into a GRASS binary
-%  raster map layer and create a fitted location \\
-%  \hline r.in.gridatb & Imports GRIDATB.FOR map file (TOPMODEL) into GRASS
-%  raster map \\
-%  \hline r.in.mat  & Import a binary MAT-File(v4) to a GRASS raster  \\
-%  \hline r.in.poly  &  Create raster maps from ascii polygon/line data files
-%  in the current directory \\
-%  \hline r.in.srtm  & Import SRTM HGT files into GRASS \\
-%  \hline i.in.spotvgt & Import of SPOT VGT NDVI file into a raster map \\
-%  \hline r.in.wms & Download and import data from WMS server \\
-%  \hline r.external & Link GDAL supported raster to binary raster \\
-%  \hline r.external.qgis & Link GDAL supported raster to binary raster map layer \\
-%  \hline r.external & Link all GDAL supported rasters in a directory to binary rasters  \\
-%  \hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Raster and Image data import modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[htb]
-%\centering
-% \begin{tabular}{|p{2.5cm}|p{11.5cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Vector data import modules in the GRASS
-%Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.in.db & Import vector points from database containing coordinates \\
-%  \hline v.in.dxf & Import DXF vector layer \\
-%  \hline v.in.e00 & Import ESRI E00 file in a vector map \\
-%  \hline v.in.garmin & Import vector from gps using gpstrans \\
-%  \hline v.in.gpsbabel & Import vector from gps using gpsbabel \\
-%  \hline v.in.geonames & Import geonames.org country files \\
-%  \hline v.in.gns & Import USNGS Geonet Names Server (GNS) country file  \\
-%  \hline v.in.mapgen & Import MapGen or MatLab vectors in GRASS \\
-%  \hline v.in.ogr & Import OGR/PostGIS vector layers \\
-%  \hline v.in.ogr.qgis & Import loaded vector layers into GRASS binary
-%  vector map \\
-%  \hline v.in.ogr.loc & Import OGR/PostGIS vector layers and create a fitted
-%  location \\
-%  \hline v.in.ogr.qgis.loc & Import loaded vector layers into GRASS binary
-%  vector map and create a fitted location \\
-%  \hline v.in.ogr.all & Import all the OGR/PostGIS vector layers in a given
-%  data source \\
-%  \hline v.in.ogr.all.loc & Import all the OGR/PostGIS vector layers in a
-%  given data source and create a fitted location \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Vector data import modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{2.5cm}|p{11.5cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Database import modules in the GRASS
-%Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline db.in.ogr & Import attribute tables in various formats \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Database import modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Raster and Image data export modules in
-%the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.out.gdal & Export raster to various formats (GDAL library) \\
-%  \hline r.out.gdal.gtiff & Export raster layer to Geo TIFF \\
-%  \hline r.out.ascii & Export raster to ASCII text file \\
-%  \hline r.out.arc & Converts a raster map layer into an ESRI ARCGRID file \\
-%  \hline r.out.xyz & Export raster to text file as x,y,z values based on cell centers \\
-%  \hline r.gridatb & Exports GRASS raster map to GRIDATB.FOR map file
-%  (TOPMODEL) \\
-%  \hline r.out.mat & Exports a GRASS raster to a binary MAT-File \\
-%  \hline r.out.bin & Exports a GRASS raster to a binary array \\
-%  \hline r.out.mpeg & Export raster series to MPEG movie \\
-%  \hline r.out.png & Export GRASS raster as non-georeferenced PNG image
-%  format \\
-%  \hline r.out.ppm & Converts a GRASS raster map to a PPM image file at the
-%  pixel resolution of the CURRENTLY DEFINED REGION \\
-%  \hline r.out.ppm3 & Converts 3 GRASS raster layers (R,G,B) to a PPM image
-%  file at the pixel resolution of the CURRENTLY DEFINED REGION \\
-%  \hline r.out.pov & Converts a raster map layer into a height-field file for
-%  POVRAY\\
-%  \hline r.out.tiff & Exports a GRASS raster map to a 8/24bit TIFF image file
-%  at the pixel resolution of the currently defined region\\
-%  \hline r.out.vrml &  Export a raster map to the Virtual Reality Modeling
-%  Language (VRML)\\
-%  \hline r.out.vtk & Export raster layer to VTK-ASCII \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Raster and Image data export modules}
-%\end{table}}
-%
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Vector data export modules in the GRASS
-%Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.out.ogr & Export vector layer to various formats (OGR library) \\
-%  \hline v.out.ogr.gml & Export vector layer to GML \\
-%  \hline v.out.ogr.pg & Export vector layer to PostGIS database table \\
-%  \hline v.out.ogr.mapinfo & Mapinfo export of vector layer \\
-%  \hline v.out.ascii & Convert a GRASS binary vector map to a GRASS ASCII
-%  vector map  \\
-%  \hline v.out.dxf & converts a GRASS vector map to DXF  \\
-%  \hline v.out.pov & Export vector layer to POV-Ray \\
-%  \hline v.out.svg & Export vector layer to SVG \\
-%  \hline v.out.vtk & Export vector layer to VTK-ASCII \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Vector data export modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Vector table export modules in the
-%GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline db.out.ogr & Export attribute table to various formats  \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Vector data table}
-%\end{table}}
-%
-%
-%\section{GRASS Toolbox data type conversion modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to convert
-%raster to vector or vector to raster data in a currently selected GRASS location 
-%and mapset.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Data type conversion modules in the GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.to.vect.point & Convert a raster to vector points \\
-%  \hline r.to.vect.line & Convert a raster to vector lines \\
-%  \hline r.to.vect.area & Convert a raster to vector areas \\
-%  \hline v.to.rast.constant & Convert a vector to raster using constant \\
-%  \hline v.to.rast.attr & Convert a vector to raster using attribute values \\
-%\hline
-%\end{tabular}
-% \caption{GRASS Toolbox: Data type conversion modules}
-%\end{table}}
-%
-%
-%\section{GRASS Toolbox region and projection configuration modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to manage and
-%change the current mapset region and to configure your projection.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Region and projection configuration
-%  modules in the GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline g.region.save & Save the current region as a named region \\
-%  \hline g.region.zoom & Shrink the current region until it meets non-NULL
-%   data from a given raster map \\
-%  \hline g.region.multiple.raster & Set the region to match multiple raster
-%  maps \\
-%  \hline g.region.multiple.vector & Set the region to match multiple vector
-%  maps \\
-%  \hline g.proj.print & Print projection information of the current location\\
-%  \hline g.proj.geo & Print projection information from a georeferenced file
-%  (raster, vector or image)\\
-%  \hline g.proj.ascii.new & Print projection information from a
-%  georeferenced ASCII file containing a WKT projection description\\
-%  \hline g.proj.proj & Print projection information from a PROJ.4 projection
-%  description file\\
-%  \hline g.proj.ascii.new & Print projection information from a georeferenced
-%  ASCII file containing a WKT projection description and create a new
-%  location based on it\\
-%  \hline g.proj.geo.new & Print projection information from a georeferenced
-%  file (raster, vector or image) and create a new location based on it\\
-%  \hline g.proj.proj.new & Print projection information from a PROJ.4
-%  projection description file and create a new location based on it \\
-%  \hline m.cogo & A simple utility for converting bearing and distance
-%  measurements to coordinates and vice versa. It assumes a cartesian
-%  coordinate system \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Region and projection configuration modules}
-%\end{table}}
-%
-%
-%\section{GRASS Toolbox raster data modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to work with
-%and analyse raster data in a currently selected GRASS location and mapset.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Develop raster map modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.compress & Compresses and decompresses raster maps \\
-%  \hline r.region.region & Sets the boundary definitions to current or
-%  default region \\
-%  \hline r.region.raster & Sets the boundary definitions from existent raster
-%  map\\
-%  \hline r.region.vector & Sets the boundary definitions from existent vector map \\
-%  \hline r.region.edge & Sets the boundary definitions by edge (n-s-e-w) \\
-%  \hline r.region.alignTo & Sets region to align to a raster map\\
-%  \hline r.null.val & Transform cells with value in null cells\\
-%  \hline r.null.to & Transform null cells in value cells\\
-%  \hline r.quant & This routine produces the quantization file for a
-%  floating-point map \\
-%  \hline r.resamp.stats & Resamples raster map layers using aggregation \\
-%  \hline r.resamp.interp & Resamples raster map layers using interpolation \\
-%  \hline r.resample & GRASS raster map layer data resampling capability.
-%  Before you must set new resolution\\
-%  \hline r.resamp.rst & Reinterpolates and computes topographic analysis
-%  using regularized spline with tension and smoothing \\
-%  \hline r.support & Allows creation and/or modification of raster map layer
-%  support files\\
-%  \hline r.support.stats & Update raster map statistics \\
-%  \hline r.proj & Re-project a raster map from one location to the current
-%  location \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Develop raster map modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Raster color management modules in the
-%  GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.colors.table & Set raster color table from setted tables \\
-%  \hline r.colors.rules & Set raster color table from setted rules \\
-%  \hline r.colors.rast & Set raster color table from existing raster \\
-%  \hline r.colors.stddev & Set color rules based on standard deviation frommap's mean value \\
-%  \hline r.blend & Blend color components for two raster maps by given ratio \\
-%  \hline r.composite & Blend red, green, raster layers to obtain one color
-%  raster \\
-%  \hline r.his & Generates red, green and blue raster map layers combining
-%  hue, intensity, and saturation (his) values from user-specified input
-%  raster map layers \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Raster color management modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Spatial raster analysis modules in the
-%  GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.buffer & Raster buffer \\
-%  \hline r.mask & Create a MASK for limiting raster operation \\
-%  \hline r.mapcalc & Raster map calculator \\
-%  \hline r.mapcalculator & Simple map algebra \\
-%  \hline r.neighbors & Raster neighbors analyses \\
-%  \hline v.neighbors & Count of neighbouring points \\
-%  \hline r.cross & Create a cross product of the category value from multiple
-%  raster map layers \\
-%  \hline r.series & Makes each output cell a function of the values assigned
-%  to the corresponding cells in the output raster map layers\\
-%  \hline r.patch & Create a new raster map by combining other raster maps \\
-%  \hline r.statistics & Category or object oriented statistics \\
-%  \hline r.sunmask.position & Calculate shadow maps from exact sun position \\
-%  \hline r.sunmask.date.time & Calculate shadow maps from sun position determined by date/time\\
-%  \hline r.cost & Outputs a raster map layer showing the cumulative cost of
-%  moving between different geographic locations on an input raster map layer
-%  whose cell category values represent cost\\
-%  \hline r.drain & Traces a flow through an elevation model on a raster map
-%  layer \\
-%  \hline r.shaded.relief & Create shaded map \\
-%  \hline r.slope.aspect.slope & Generate slope map from DEM (digital
-%  elevation model) \\
-%  \hline r.slope.aspect.aspect & Generate aspect map from DEM (digital
-%  elevation model) \\
-%  \hline r.param.scale & Extracts terrain parameters from a DEM \\
-%  \hline r.texture & Generate images with textural features from a raster map
-%  (first serie of indices)\\
-%  \hline r.texture.bis & Generate images with textural features from a raster
-%  map (second serie of indices)\\
-%  \hline r.los & Line-of-sigth raster analysis \\
-%  \hline r.grow.distance & Create raster of distance to features in input layer \\
-%  \hline r.clump & Recategorizes into unique categories contiguous cells \\
-%  \hline r.grow & Generates a raster map layer with contiguous areas grown by
-%  one cell\\
-%  \hline r.thin & Thin no-zero cells that denote line features \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Spatial raster analysis modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Hydrologic modelling modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.watershed & Watershed Analysis \\
-%  \hline r.carve & Takes vector stream data, transforms it to raster, and
-%  subtracts depth from the output DEM \\
-%  \hline r.fill.dir & Filters and generates a depressionless elevation map
-%  and a flow direction map from a given elevation layer \\
-%  \hline r.lake.xy & Fills lake from seed point at given level \\
-%  \hline r.lake.seed & Fills lake from seed at given level \\
-%  \hline r.topidx & Creates topographic index [ln(a/tan(beta))] map from elevation map \\
-%  \hline r.basins.fill & Generates a raster map layer showing watershed
-%  subbasins \\
-%  \hline r.water.outlet & Watershed basin creation program \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Hydrologic modelling modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Raster category and label modules in the GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.reclass.area.greater & Reclasses a raster map greater than user
-%  specified area size (in hectares) \\
-%  \hline r.reclass.area.lesser & Reclasses a raster map less than user
-%  specified area size (in hectares) \\
-%  \hline r.reclass & Reclass a raster using a reclassification rules file \\
-%  \hline r.recode & Recode raster maps\\
-%  \hline r.rescale & Rescales the range of category values in a raster map
-%  layer \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Change raster category values and labels modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Surface management modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.circle & Create a map containing concentric circles \\
-%  \hline r.random & Creates a random vector point map contained in a raster \\
-%  \hline r.random.cells & Generates random cell values with spatial
-%  dependence \\
-%  \hline v.kernel & Gaussian kernel density \\
-%  \hline r.contour & Produces a contours vector map with specified step from
-%  a raster map\\
-%  \hline r.contour2 & Produces a contours vector map of specified contours
-%  from a raster map \\
-%  \hline r.surf.fractal & Creates a fractal surface of a given fractal
-%  dimension\\
-%  \hline r.surf.gauss & GRASS module to produce a raster map layer of
-%  gaussian deviates whose mean and standard deviation can be expressed by the
-%  user \\
-%  \hline r.surf.random & Produces a raster map layer of uniform random
-%  deviates whose range can be expressed by the user \\
-%  \hline r.plane & Create a raster plane \\
-%  \hline r.bilinear & Bilinear interpolation utility for raster map layers \\
-%  \hline v.surf.bispline & Bicubic or bilinear spline interpolation with
-%  Tykhonov regularization\\
-%  \hline r.surf.idw & Surface interpolation utility for raster map layers\\
-%  \hline r.surf.idw2 & Surface generation program\\
-%  \hline r.surf.contour & Surface generation program from rasterized contours \\
-%  \hline v.surf.idw & Interpolate attribute values (IDW) \\
-%  \hline v.surf.rst & Interpolate attribute values (RST) \\
-%  \hline r.fillnulls & Fills no-data areas in raster maps using v.surf.rst
-%  splines interpolation \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Surface management modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Reports and statistic analysis modules in the GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline r.category & Prints category values and labels associated with
-%  user-specified raster map layers \\
-%  \hline r.sum & Sums up the raster cell values \\
-%  \hline r.report & Reports statistics for raster map layers \\
-%  \hline r.average & Finds the average of values in a cover map within areas
-%  assigned the same category value in a user-specified base map \\
-%  \hline r.median & Finds the median of values in a cover map within areas
-%  assigned the same category value in a user-specified base map \\
-%  \hline r.mode & Finds the mode of values in a cover map within areas
-%  assigned the same category value in a user-specified base map.reproject
-%  raster image \\
-%  \hline r.volume & Calculates the volume of data clumps, and produces a
-%  GRASS vector points map containing the calculated centroids of these clumps \\
-%  \hline r.surf.area & Surface area estimation for rasters \\
-%  \hline r.univar & Calculates univariate statistics from the non-null cells
-%  of a raster map \\
-%  \hline r.covar & Outputs a covariance/correlation matrix for user-specified
-%  raster map layer(s)\\
-%  \hline r.regression.line & Calculates linear regression from two raster
-%  maps: y = a + b * x \\
-%  \hline r.coin & Tabulates the mutual occurrence (coincidence) of categories
-%  for two raster map layers\\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Reports and statistic analysis modules}
-%\end{table}}
-%
-%\clearpage
-%
-%\section{GRASS Toolbox vector data modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to work with
-%and analyse vector data in a currently selected GRASS location and mapset.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{3cm}|p{11cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Develop vector map modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.build.all & Rebuild topology of all vectors in the mapset \\
-%  \hline v.clean.break & Break lines at each intersection of vector map \\
-%  \hline v.clean.snap & Cleaning topology: snap lines to vertex in threshold \\
-%  \hline v.clean.rmdangles & Cleaning topology: remove dangles \\
-%  \hline v.clean.chdangles & Cleaning topology: change the type of boundary
-%  dangle to line \\
-%  \hline v.clean.rmbridge & Remove bridges connecting area and island or 2
-%  islands \\
-%  \hline v.clean.chbridge & Change the type of bridges connecting area and
-%  island or 2 islands \\
-%  \hline v.clean.rmdupl & Remove duplicate lines (pay attention to
-%  categories!) \\
-%  \hline v.clean.rmdac & Remove duplicate area centroids \\
-%  \hline v.clean.bpol & Break polygons. Boundaries are broken on each
-%  point shared between 2 and more polygons where angles of segments are
-%  different \\
-%  \hline v.clean.prune & Remove vertices in threshold from lines and
-%  boundaries \\
-%  \hline v.clean.rmarea & Remove small areas (removes longest boundary with
-%  adjacent area) \\
-%  \hline v.clean.rmline & Remove all lines or boundaries of zero length \\
-%  \hline v.clean.rmsa & Remove small angles between lines at nodes \\
-%  \hline v.type.lb & Convert lines to boundaries \\
-%  \hline v.type.bl & Convert boundaries to lines \\
-%  \hline v.type.pc & Convert points to centroids \\
-%  \hline v.type.cp & Convert centroids to points \\
-%  \hline v.centroids & Add missing centroids to closed boundaries  \\
-%  \hline v.build.polylines & Build polylines from lines \\
-%  \hline v.segment & Creates points/segments from input vector lines and
-%  positions \\
-%  \hline v.to.points & Create points along input lines \\
-%  \hline v.parallel & Create parallel line to input lines \\
-%  \hline v.dissolve & Dissolves boundaries between adjacent areas \\
-%  \hline v.drape & Convert 2D vector to 3D vector by sampling of elevation
-%  raster\\
-%  \hline v.transform & Performs an affine transformation on a vector map \\
-%  \hline v.proj & Allows projection conversion of vector files \\
-%  \hline v.support & Updates vector map metadata \\
-%  \hline generalize & Vector based generalization \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Develop vector map modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Database connection modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.db.connect & Connect a vector to database \\
-%  \hline v.db.sconnect & Disconnect a vector from database \\
-%  \hline v.db.what.connect & Set/Show database connection for a vector \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Database connection modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Spatial vector and network analysis modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.extract.where & Select features by attributes \\
-%  \hline v.extract.list & Extract selected features \\
-%  \hline v.select.overlap & Select features overlapped by features in another
-%  map\\
-%  \hline v.buffer & Vector buffer \\
-%  \hline v.distance & Find the nearest element in vector 'to' for elements in
-%  vector 'from'. \\
-%  \hline v.net & Network maintenance \\
-%  \hline v.net.nodes & Create nodes on network \\
-%  \hline v.net.alloc & Allocate network\\
-%  \hline v.net.iso & Cut network by cost isolines \\
-%  \hline v.net.salesman & Connect nodes by shortest route (traveling
-%  salesman) \\
-%  \hline v.net.steiner & Connect selected nodes by shortest tree (Steiner
-%  tree) \\
-%  \hline v.patch & Create a new vector map by combining other vector maps \\
-%  \hline v.overlay.or & Vector union \\
-%  \hline v.overlay.and & Vector intersection \\
-%  \hline v.overlay.not & Vector subtraction \\
-%  \hline v.overlay.xor & Vector non-intersection \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Spatial vector and network analysis modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Change vector field modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.category.add & Add elements to layer (ALL elements of the selected
-%  layer type!)\\
-%  \hline v.category.del & Delete category values \\
-%  \hline v.category.sum & Add a value to the current category values \\
-%  \hline v.reclass.file & Reclass category values using a rules file \\
-%  \hline v.reclass.attr & Reclass category values using a column attribute
-%  (integer positive) \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Change vector field modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Working with vector points modules in the GRASS Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.in.region & Create new vector area map with current region extent \\
-%  \hline v.mkgrid.region & Create grid in current region \\
-%  \hline v.in.db & Import vector points from a database table containing
-%  coordinates \\
-%  \hline v.random & Randomly generate a 2D/3D GRASS vector point map \\
-%  \hline v.perturb & Random location of perturbation of vector points \\ 
-%  \hline v.kcv & Randomly partition points into test/train sets \\
-%  \hline v.outlier & Remove outliers from vector point data \\
-%  \hline v.hull & Create a convex hull \\
-%  \hline v.delaunay.line & Delaunay triangulation (lines) \\
-%  \hline v.delaunay.area & Delaunay triangulation (areas) \\
-%  \hline v.voronoi.line & Voronoi diagram (lines) \\
-%  \hline v.voronoi.area & Voronoi diagram (areas) \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Working with vector points modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Vector update by other maps modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.rast.stats & Calculates univariate statistics from a GRASS raster
-%  map based on vector objects\\
-%  \hline v.what.vect & Uploads map for which to edit attribute table \\
-%  \hline v.what.rast & Uploads raster values at positions of vector points to
-%  the table \\
-%  \hline v.sample & Sample a raster file at site locations \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Vector update by other maps modules}
-%\end{table}}
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Vector report and statistic modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline v.to.db & Put geometry variables in database \\
-%  \hline v.report & Reports geometry statistics for vectors \\
-%  \hline v.univar & Calculates univariate statistics on selected table column
-%  for a GRASS vector map \\
-%  \hline v.normal & Tests for normality for points\\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Vector report and statistic modules}
-%\end{table}}
-%
-%\section{GRASS Toolbox imagery data modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to work with
-%and analyse imagery data in a currently selected GRASS location and mapset.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Imagery analysis modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline i.image.mosaic & Mosaic up to 4 images \\
-%  \hline i.rgb.his & Red Green Blue (RGB) to Hue Intensity Saturation (HIS)
-%  raster map color transformation function \\
-%  \hline i.his.rgb & Hue Intensity Saturation (HIS) to Red Green Blue (RGB)
-%  raster map color transform function \\
-%  \hline i.landsat.rgb & Auto-balancing of colors for LANDSAT images \\
-%  \hline i.fusion.brovey & Brovey transform to merge multispectral and
-%  high-res pancromatic channels \\
-%  \hline i.zc & Zero-crossing edge detection raster function for image
-%  processing \\
-%  \hline r.mfilter &  Raster file matrix filter\\
-%  \hline i.tasscap4 & Tasseled Cap (Kauth Thomas) transformation for
-%  LANDSAT-TM 4 data \\
-%  \hline i.tasscap5 & Tasseled Cap (Kauth Thomas) transformation for
-%  LANDSAT-TM 5 data \\
-%  \hline i.tasscap7 & Tasseled Cap (Kauth Thomas) transformation for
-%  LANDSAT-TM 7 data \\
-%  \hline i.fft & Fast fourier transform (FFT) for image processing \\
-%  \hline i.ifft & Inverse fast fourier transform for image processing \\
-%  \hline r.describe & Prints terse list of category values found in a raster
-%  map layer \\
-%  \hline r.bitpattern & Compares bit patterns with a raster map \\
-%  \hline r.kappa & Calculate error matrix and kappa parameter for accuracy
-%  assessment of classification result \\
-%  \hline i.oif & Calculates optimal index factor table for landsat tm bands \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Imagery analysis modules}
-%\end{table}}
-%
-%\clearpage
-%
-%\section{GRASS Toolbox database modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to manage, 
-%connect and work with internal and external databases. Working with spatial 
-%external databases is enabled via OGR and not covered by these modules.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Database management and analysis modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline db.connect & Sets general DB connection mapset \\
-%  \hline db.connect.schema & Sets general DB connection mapset with a schema \\
-%  \hline db.connect-login.pg & Set Postgresql DB connection \\
-%  \hline v.db.reconnect.all & Reconnect vector to a new database \\
-%  \hline db.login & Set user/password for driver/database \\
-%  \hline v.db.addtable & Create and add a new table to a vector \\
-%  \hline v.db.droptable & Remove existing attribute table of a vector \\
-%  \hline v.db.addcol & Adds one or more columns to the attribute table
-%  connected to a given vector map \\
-%  \hline v.db.dropcol & Drops a column from the attribute table connected to
-%  a given vector map\\
-%  \hline v.db.renamecol & Renames a column in a attribute table connected to
-%  a given vector map\\
-%  \hline v.db.update\_const & Allows to assign a new constant value to a
-%  column \\
-%  \hline v.db.update\_query & Allows to assign a new constant value to a
-%  column only if the result of a query is TRUE \\
-%  \hline v.db.update\_op & Allows to assign a new value, result of operation
-%  on column(s), to a column in the attribute table connected to a given map\\
-%  \hline v.db.update\_op\_query & Allows to assign a new value to a column,
-%  result of operation on column(s), only if the result of a query is TRUE \\
-%  \hline db.execute & Execute any SQL statement \\
-%  \hline db.select & Prints results of selection from database based on SQL \\
-%  \hline v.db.select & Prints vector map attributes \\
-%  \hline v.db.select.where & Prints vector map attributes with SQL \\
-%  \hline v.db.join & Allows to join a table to a vector map table \\
-%  \hline v.db.univar & Calculates univariate statistics on selected table
-%  column for a GRASS vector map \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Database modules}
-%\end{table}}
-%
-%\clearpage
-%
-%\section{GRASS Toolbox 3D modules}
-%
-%This Section lists all graphical dialogs in the GRASS Toolbox to work with 3D 
-%data. GRASS provides more modules, but they are currently only available using 
-%the GRASS Shell.
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{3D visualization and analysis modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline nviz & Open 3D-View in nviz\\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: 3D Visualization}
-%\end{table}}
-%
-%\section{GRASS Toolbox help modules}
-%
-%The GRASS GIS Reference Manual offers a complete overview of the available 
-%GRASS modules, not limited to the modules and their often reduced functionalities 
-%implemented in the GRASS Toolbox. 
-%
-%{\renewcommand{\arraystretch}{0.7}
-%\begin{table}[H]
-%\centering
-% \begin{tabular}{|p{4cm}|p{10cm}|}
-%  \hline \multicolumn{2}{|c|}{\textbf{Reference Manual modules in the GRASS
-%  Toolbox}} \\
-%  \hline \textbf{Module name} & \textbf{Purpose} \\
-%  \hline g.manual & Display the HTML manual pages of GRASS \\
-%\hline
-%\end{tabular}
-%\caption{GRASS Toolbox: Reference Manual}
-%\end{table}}
-%

Deleted: docs/trunk/english_us/user_guide/appendices/supported_data_formats.tex
===================================================================
--- docs/trunk/english_us/user_guide/appendices/supported_data_formats.tex	2011-04-27 14:33:11 UTC (rev 15832)
+++ docs/trunk/english_us/user_guide/appendices/supported_data_formats.tex	2011-04-27 17:47:34 UTC (rev 15833)
@@ -1,121 +0,0 @@
-%  !TeX  root  =  user_guide.tex 
-\chapter{Supported Data Formats}\label{appdx_data_formats}
-
-% when the revision of a section has been finalized, 
-% comment out the following line:
-% \updatedisclaimer
-
-QGIS uses the GDAL/OGR library to read and write vector and raster data
-formats. Note that not all of the format listed below may work in QGIS for
-various reasons. For example, some require external commercial libraries or
-the GDAL installation of your OS was not build to support the format you want
-to use. Only those formats that have been well tested will appear in the list
-of file types when loading a vector or raster into QGIS. Other untested
-formats can be loaded by selecting *.*. 
-
-\section{OGR Vector Formats}\label{appdx_ogr}
-\index{OGR!supported formats}
-
-At the date of this document, the following formats are supported by the OGR
-library \cite{OGRweb}. A complete is also available at
-\url{http://www.gdal.org/ogr/ogr_formats.html}.
-
-\begin{itemize}
-\item Arc/Info Binary Coverage
-\item Comma Separated Value (.csv) 
-\item DODS/OPeNDAP
-\item ESRI Personal GeoDatabase
-\item ESRI ArcSDE
-\item ESRI Shapefile
-\item FMEObjects Gateway
-\item GeoJSON
-\item Geoconcept Export
-\item GeoRSS
-\item GML
-\item GMT
-\item GPX
-\item GRASS Vector \footnote{GRASS support is supplied by the QGIS
-GRASS data provider plugin}
-\item Informix DataBlade
-\item INTERLIS
-\item IHO S-57 (ENC)
-\item Mapinfo File
-\item Microstation DGN
-\item OGDI Vectors
-\item ODBC
-\item Oracle Spatial
-\item PostgreSQL\footnote{QGIS implements its own PostgreSQL functions. OGR
-should be built without PostgreSQL support}
-\item SDTS
-\item SQLite
-\item UK .NTF
-\item U.S. Census TIGER/Line
-\item VRT - Virtual Datasource
-\item X-Plane/Flighgear aeronautical data
-\end{itemize}
-
-\section{GDAL Raster Formats}\label{appdx_gdal}
-\index{raster layers!supported formats}
-\index{GDAL!supported formats}
-
-At the date of this document, the following formats are supported by the GDAL
-library \cite{GDALweb}. A complete is also available at
-\url{http://www.gdal.org/formats_list.html}.
- 
-\begin{itemize}
-\item Arc/Info ASCII Grid
-\item ADRG/ARC Digitilized Raster Graphics 
-\item Arc/Info Binary Grid (.adf)
-\item Magellan BLX Topo (.blx, .xlb)
-\item Microsoft Windows Device Independent Bitmap (.bmp)
-\item BSB Nautical Chart Format (.kap)
-\item VTP Binary Terrain Format (.bt)
-\item CEOS (Spot for instance)
-\item First Generation USGS DOQ (.doq)
-\item New Labelled USGS DOQ (.doq)
-\item Military Elevation Data (.dt0, .dt1)
-\item ERMapper Compressed Wavelets (.ecw)
-\item ESRI .hdr Labelled
-\item ENVI .hdr Labelled Raster
-\item Envisat Image Product (.n1)
-\item EOSAT FAST Format
-\item FITS (.fits)
-\item Graphics Interchange Format (.gif)
-\item GMT compatible netCDF
-\item GRASS Rasters \footnote{GRASS support is supplied by the QGIS GRASS data provider plugin} 
-\item Golden Software Binary Grid
-\item TIFF / BigTIFF / GeoTIFF (.tif)
-\item Hierarchical Data Format Release 4 (HDF4)
-\item Hierarchical Data Format Release 5 (HDF5)
-\item ILWIS Raster Map (.mpr,.mpl)
-\item Intergraph Raster
-\item Erdas Imagine (.img)
-\item Atlantis MFF2e
-\item Japanese DEM (.mem)
-\item JPEG JFIF (.jpg)
-\item JPEG2000 (.jp2, .j2k)
-\item NOAA Polar Orbiter Level 1b Data Set (AVHRR)
-\item Erdas 7.x .LAN and .GIS
-\item In Memory Raster
-\item Vexcel MFF
-\item Vexcel MFF2
-\item Atlantis MFF
-\item Multi-resolution Seamless Image Database  MrSID
-\item NITF
-\item NetCDF
-\item OGDI Bridge
-\item Oracle Spatial Georaster
-\item OGC Web Coverage Server
-\item OGC Web Map Server
-\item PCI .aux Labelled
-\item PCI Geomatics Database File
-\item PCRaster 
-\item Portable Network Graphics (.png)
-\item Netpbm (.ppm,.pgm)
-\item USGS SDTS DEM (*CATD.DDF)
-\item SAR CEOS
-\item USGS ASCII DEM (.dem)
-\item X11 Pixmap (.xpm)
-
-\end{itemize}
-\clearpage

Modified: docs/trunk/english_us/user_guide/grass_integration.tex
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration.tex	2011-04-27 14:33:11 UTC (rev 15832)
+++ docs/trunk/english_us/user_guide/grass_integration.tex	2011-04-27 17:47:34 UTC (rev 15833)
@@ -54,14 +54,14 @@
 GRASS \filename{LOCATION} with 3 vector layers and 1 raster elevation map.
 
 \begin{enumerate}
-  \item Create a new folder \filename{grassdata}, download the QGIS alaska
+ \item Create a new folder \filename{grassdata}, download the QGIS alaska
   dataset \filename{qgis\_sample\_data.zip} from
   \url{http://download.osgeo.org/qgis/data/} and unzip the file into
   \filename{grassdata}.
   \item Start QGIS.
   \item If not already done in a previous QGIS session, load the GRASS plugin
   clicking on \mainmenuopt{Plugins} \arrow \mainmenuopt{Manage Plugins} and
-  selecting \dropmenuopt{GRASS}. The GRASS toolbar appears on the toolbar menu.
+  saelecting \dropmenuopt{GRASS}. The GRASS toolbar appears on the toolbar menu.
   \item In the GRASS toolbar, click the \toolbtntwo{grass_open_mapset}{Open
   mapset} icon to bring up the \filename{MAPSET} wizard.
   \item For \filename{Gisdbase} browse and select or enter the path to the
@@ -186,7 +186,7 @@
 You can also use the already existing vector and raster data in the sample
 GRASS \filename{LOCATION alaska} included in the QGIS alaska dataset
 \ref{label_sampledata} and move on to Section \ref{label_vectmodel}.
-
+a
 \subsection{Adding a new MAPSET}\label{sec:add_mapset}
 
 A user has only write access to a GRASS \filename{MAPSET} he created. This
@@ -514,6 +514,16 @@
 because new raster or vector layers created during analysis need to be written
 to the currently selected \filename{LOCATION} and \filename{MAPSET}.
 
+The GRASS Shell inside the GRASS Toolbox provides access to almost all (more
+than 330) GRASS modules through a command line interface. To offer a more user
+friendly working environment, about 200 of the available GRASS modules and
+functionalities are also provided by graphical dialogs within the GRASS plugin Toolbox.
+
+\subsection{List of graphical GRASS Toolbox modules}\index{GRASS!toolbox!grapical modules}
+
+A complete list of available GRASS modules provided by graphical dialogs from 
+within QGIS is found in the GRASS wiki: \url{http://grass.osgeo.org/wiki/GRASS-QGIS_relevant_module_list}
+
 \subsection{Working with GRASS modules}\label{grass_modules}\index{GRASS!toolbox}
 
 \begin{figure}[ht]

Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex	2011-04-27 14:33:11 UTC (rev 15832)
+++ docs/trunk/english_us/user_guide/user_guide.tex	2011-04-27 17:47:34 UTC (rev 15833)
@@ -63,11 +63,6 @@
 %end of plugin docs
 \input{help_and_support}
 \begin{appendix}
-\input{appendices/supported_data_formats}
-\input{appendices/grass_toolbox_modules}
-%install guide is a special case because we are extracting it
-%out of the INSTALL.t2t document of in the QGIS sources
-%when we tag a new document release
 \input{appendices/gpl}
 \input{appendices/qgis_qt_gpl_exception}
 \input{appendices/fdl_1.3}

Modified: docs/trunk/english_us/user_guide/working_with_raster.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_raster.tex	2011-04-27 14:33:11 UTC (rev 15832)
+++ docs/trunk/english_us/user_guide/working_with_raster.tex	2011-04-27 17:47:34 UTC (rev 15833)
@@ -8,28 +8,25 @@
 %\updatedisclaimer
 
 This Section describes how to visualize and set raster layer properties.
-QGIS supports a number of different raster formats. Currently tested formats
-include:\index{raster layers!data formats}
+\qg uses the GDAL library to read and write raster data formats
+\footnote{GRASS raster support is supplied by a native QGIS data provider 
+plugin.}, including Arc/Info Binary Grid\index{Arc/Info Binary Grid}, 
+Arc/Info ASCII Grid\index{Arc/Info ASCII Grid},GeoTIFF\index{GeoTIFF},
+Erdas Imagine\index{Erdas Img.} and many more. 
 
-\begin{itemize}[label=--]
-\item Arc/Info Binary Grid
-\item Arc/Info ASCII Grid
-\item GRASS Raster
-\item GeoTIFF
-\item JPEG
-\item Spatial Data Transfer Standard Grids (with some limitations)
-\item USGS ASCII DEM
-\item Erdas Imagine
-\end{itemize}
+At the date of this document, more than 100 raster formats are supported 
+by the GDAL library \cite{GDALweb}. A complete list is available at 
+\url{http://www.gdal.org/formats_list.html}.
 
-Because the raster implementation in QGIS is based on the GDAL library, other
-raster formats implemented in GDAL are also likely to work - if in doubt try
-to open a sample and see if it is supported. You find more details about GDAL
-supported formats in Appendix \ref{appdx_gdal}
-\index{raster layers!GDAL implementation} or at
-\url{http://www.gdal.org/formats_list.html}. If you want to load GRASS raster
-data, please refer to Section~\ref{sec:load_grassdata}.
+\textbf{Note}: Not all of the listed formats may work in QGIS for various 
+reasons. For example, some require external commercial libraries or 
+the GDAL installation of your OS was not build to support the format you want
+to use. Only those formats that have been well tested will appear in the list
+of file types when loading a raster into QGIS. Other untested formats can 
+be loaded by selecting *.*.
 
+Working with GRASS raster data is described in Section \ref{sec:grass}.
+
 \section{What is raster data?}\label{label_whatsraster}
 \index{raster layers!definition}
 

Modified: docs/trunk/english_us/user_guide/working_with_vector.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_vector.tex	2011-04-27 14:33:11 UTC (rev 15832)
+++ docs/trunk/english_us/user_guide/working_with_vector.tex	2011-04-27 17:47:34 UTC (rev 15833)
@@ -7,26 +7,31 @@
 % comment out the following line:
 %\updatedisclaimer
 
-\qg supports vector data in a number of formats, including those
-supported by the OGR library data provider plugin, such as ESRI shapefiles,
-\index{shapefiles}\index{ESRI!shapefiles}\index{SHP files}
-MapInfo MIF (interchange format)\index{MIF files}\index{MapInfo!MIF files}
-and MapInfo TAB (native format).\index{TAB files}\index{MapInfo!TAB files}
-You find a list of OGR supported vector formats in Appendix~\ref{appdx_ogr}.
+\qg uses the OGR library to read and write vector data formats
+\footnote{GRASS vector and PostgreSQL support is supplied by native 
+QGIS data provider plugins.}, including ESRI shapefiles,\index{shapefiles}
+\index{ESRI!shapefiles}\index{SHP files}, MapInfo MIF (interchange 
+format)\index{MIF files}\index{MapInfo!MIF files}, MapInfo TAB 
+(native format)\index{TAB files}\index{MapInfo!TAB files} and many more. 
+At the date of this document, more than 55 vector formats are supported 
+by the OGR library \cite{OGRweb}. The complete list available at 
+\url{http://www.gdal.org/ogr/ogr_formats.html}.
 
-\qg also supports PostGIS\index{PostGIS}\index{PostgreSQL!PostGIS} layers
-in a PostgreSQL database using the PostgreSQL data provider plugin.
-Support for additional data types (eg. delimited text) is provided by
-additional data provider plugins.\index{delimited text}
+\textbf{Note}: Not all of the listed formats may work in QGIS for various 
+reasons. For example, some require external commercial libraries or 
+the GDAL/OGR installation of your OS was not build to support the format you want
+to use. Only those formats that have been well tested will appear in the list
+of file types when loading a vector into QGIS. Other untested formats can 
+be loaded by selecting *.*.
 
+Working with GRASS vector data is described in Section \ref{sec:grass}.
+
 This section describes how to work with several common formats:
 ESRI shapefiles, PostGIS layers and SpatialLite layers. Many of the
 features available in \qg work the same, regardless of the vector data source.
 This is by design and includes the identify, select, labeling and attributes
 functions.
 
-Working with GRASS vector data is described in Section \ref{sec:grass}.
-
 \section{ESRI Shapefiles}
 \index{vector layers!ESRI shapefiles}
 \index{shapefiles}



More information about the QGIS-commit mailing list