[QGIS Commit] r14040 - in docs/trunk/english_us/user_guide: . plugins_decorations_images plugins_ftools_images

[svn_qgis at osgeo.org]

Author: dassau
Date: 2010-08-10 10:09:53 +0000 (Tue, 10 Aug 2010)
New Revision: 14040

Added:
   docs/trunk/english_us/user_guide/plugins_ftools_images/merge_shapes.png
Modified:
   docs/trunk/english_us/user_guide/plugins_decorations_images/scale_bar_dialog.png
   docs/trunk/english_us/user_guide/plugins_ftools.tex
   docs/trunk/english_us/user_guide/qgis_style.sty
   docs/trunk/english_us/user_guide/user_guide.tex
   docs/trunk/english_us/user_guide/working_with_ogc.tex
   docs/trunk/english_us/user_guide/working_with_vector.tex
Log:
more updates

Modified: docs/trunk/english_us/user_guide/plugins_decorations_images/scale_bar_dialog.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_ftools.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_ftools.tex	2010-08-10 09:28:41 UTC (rev 14039)
+++ docs/trunk/english_us/user_guide/plugins_ftools.tex	2010-08-10 10:09:53 UTC (rev 14040)
@@ -158,6 +158,9 @@
 table of another layer and exported as a shapefile \\
  \hline \includegraphics[width=0.7cm]{split_layer} & Split vector layer & 
 Split input layer into multiple separate layers based on input field. \\
+ \hline \includegraphics[width=0.7cm]{merge_shapes} & Merge shapefiles &
+Merge several shapefiles within a folder into a new shapefile based on the 
+layer type (point, line, area) \\
  \hline
 \end{tabular}
 \caption{fTools Data management tools}\label{tab:fTool_data_management}

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/merge_shapes.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/merge_shapes.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/qgis_style.sty
===================================================================
--- docs/trunk/english_us/user_guide/qgis_style.sty	2010-08-10 09:28:41 UTC (rev 14039)
+++ docs/trunk/english_us/user_guide/qgis_style.sty	2010-08-10 10:09:53 UTC (rev 14040)
@@ -130,7 +130,7 @@
 \def\OLD{1.4.0\xspace}
 \def\VERYOLD{1.0\xspace}
 
-%%% Shortcuts
+%%% Shortcuts (don't use it within \url strings)
 \newcommand{\qg}{QGIS\xspace}
 \newcommand{\QG}{Quantum GIS\xspace}
 \newcommand{\pg}{PostGIS\xspace}

Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex	2010-08-10 09:28:41 UTC (rev 14039)
+++ docs/trunk/english_us/user_guide/user_guide.tex	2010-08-10 10:09:53 UTC (rev 14040)
@@ -56,7 +56,6 @@
 \input{plugins_quick_print}
 \input{other_core_plugins}
 \input{external_plugins}
-\input{plugins_ftools}
 \input{plugins_table_manager}
 \input{plugins_raster_algebra}
 \input{plugins_gdaltools}

Modified: docs/trunk/english_us/user_guide/working_with_ogc.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_ogc.tex	2010-08-10 09:28:41 UTC (rev 14039)
+++ docs/trunk/english_us/user_guide/working_with_ogc.tex	2010-08-10 10:09:53 UTC (rev 14040)
@@ -260,9 +260,9 @@
 \index{WMS!search}
 \index{OGC!search}
 
-Within QGIS 1.1.X you can search for WMS-servers. 
-Figure \ref{fig:searchtab} shows the newly created \tab{search}-tab with
-the \dialog{Add Layer(s) from a Server}-dialog.
+Within QGIS you can search for WMS-servers. Figure \ref{fig:searchtab} shows 
+the newly created \tab{search}-tab with the \dialog{Add Layer(s) from a 
+Server}-dialog.
 
 \begin{figure}[ht]
   \centering

Modified: docs/trunk/english_us/user_guide/working_with_vector.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_vector.tex	2010-08-10 09:28:41 UTC (rev 14039)
+++ docs/trunk/english_us/user_guide/working_with_vector.tex	2010-08-10 10:09:53 UTC (rev 14040)
@@ -463,7 +463,7 @@
 
 A workaround is to transform the longitude values using PostGIS and the
 \textbf{ST\textunderscore Shift\textunderscore Longitude}
-\footnote{\url{http://postgis.refractions.net/documentation/manual-1.4/ST_Shift_Longitude.html}}
+\footnote{\url{http://postgis.refractions.net/documentation/manual-1.4/ST\_Shift\_Longitude.html}}
 function. This function reads every point/vertex in every component of every
 feature in a geometry, and if the longitude coordinate is < \degrees{0} adds
 \degrees{360} to it. The result would be a \degrees{0} - \degrees{360} version of
@@ -1142,7 +1142,7 @@
 \filename{lakes} layer. First we need to determine the URL needed to perform a search on a
 keyword. This is easily done by just going to Google and doing a simple
 search, then grabbing the URL from the address bar in your browser. From this
-little effort we see that the format is: \url{http://google.com/search?q=\qg},
+little effort we see that the format is: \url{http://google.com/search?q=qgis},
 where \usertext{\qg} is the search term. Armed with this information, we can
 proceed: