[QGIS Commit] r13973 - docs/trunk/english_us/user_guide

[svn_qgis at osgeo.org]

Author: jrm
Date: 2010-07-27 20:20:13 +0000 (Tue, 27 Jul 2010)
New Revision: 13973

Modified:
   docs/trunk/english_us/user_guide/grass_integration.tex
   docs/trunk/english_us/user_guide/qgis_style.sty
   docs/trunk/english_us/user_guide/user_guide.tex
Log:
change format to A4, correct float's overflow in grass chapter

Modified: docs/trunk/english_us/user_guide/grass_integration.tex
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration.tex	2010-07-27 12:41:20 UTC (rev 13972)
+++ docs/trunk/english_us/user_guide/grass_integration.tex	2010-07-27 20:20:13 UTC (rev 13973)
@@ -552,7 +552,7 @@
    \subfloat[Module Manual] {\label{subfig:grass_module_manual}\includegraphics[clip=true, width=0.3\textwidth]{grass_module_manual}}
 \caption{GRASS Toolbox Module Dialogs \nixcaption}\label{fig:grass_module_dialog}
 \end{figure}
-
+\FloatBarrier
 \minisec{Options}
 
 The \tab{Options} tab provides a simplified module dialog where you can 

Modified: docs/trunk/english_us/user_guide/qgis_style.sty
===================================================================
--- docs/trunk/english_us/user_guide/qgis_style.sty	2010-07-27 12:41:20 UTC (rev 13972)
+++ docs/trunk/english_us/user_guide/qgis_style.sty	2010-07-27 20:20:13 UTC (rev 13973)
@@ -63,7 +63,7 @@
 {./sponsors/}
 }
 
-% set the type of images to use without ahving to change it in the text, it's written by order of priority
+% set the type of images to use without having to change it in the text, it's written by order of priority (latex will use a .jpg only if there is no .png)
 \DeclareGraphicsExtensions{.png,.jpg,.pdf}
 
 %deals with the float flood

Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex	2010-07-27 12:41:20 UTC (rev 13972)
+++ docs/trunk/english_us/user_guide/user_guide.tex	2010-07-27 20:20:13 UTC (rev 13973)
@@ -7,10 +7,13 @@
 % \documentclass[10pt,DIV=8]{scrbook}
 % 
 % settings for the geometry package and Crown Quarto (18,89 x 24,58 cm)
+%\documentclass[10pt]{scrbook}%
+%\usepackage[paperwidth=18.89cm,paperheight=24.58cm,twoside,bindingoffset=9mm,outer=2.2cm,inner=1cm,top=2.6cm,bottom=4.5cm]{geometry}
+
+% settings for the geometry package and A4 (21 x 29,7 cm)
 \documentclass[10pt]{scrbook}%
+\usepackage[paperwidth=21.0cm,paperheight=29.7cm,twoside,bindingoffset=9mm,outer=2.2cm,inner=1cm,top=2.6cm,bottom=2.5cm]{geometry}
 
-\usepackage[paperwidth=18.89cm,paperheight=24.58cm,twoside,bindingoffset=9mm,outer=2.2cm,inner=1cm,top=2.6cm,bottom=4.5cm]{geometry}
-
 % load the style file
 \usepackage{qgis_style}