sync with remote master

WimaDok/main.aux

@@ -58,6 +58,7 @@
 \newlabel{sec:circularSurvey}{{3.2.10}{10}}
 \@writefile{lof}{\contentsline {figure}{\numberline {15}{\ignorespaces The circular survey item editor. Can be found at the right edge of the screen.}}{11}}
 \newlabel{fig:circularSurveyItemEditor}{{15}{11}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.2.11}How to synchronize the Data with Flight View}{11}}
 \@writefile{toc}{\contentsline {subsection}{\numberline {3.3}ArduPilot Simulator}{12}}
 \global\@namedef{scr@dte@section@lastmaxnumwidth}{10.84047pt}
 \global\@namedef{scr@dte@subsection@lastmaxnumwidth}{18.37163pt}

WimaDok/main.tex

@@ -55,7 +55,7 @@ The \textbf{plan view} is used to create flight plans and is part of standard \q
 
 The \textbf{flight view} comes in necessary as soon as you want a vehicle to get in action. Once the vehicle established a connection (serial, TCP, UDP, \etc), \qgc starts to communicate automatically with it, in most cases. If not, check the settings menu of \qgc. A connected vehicle will appear as a red arrow on the map, showing the vehicles position and orientation. On the top indicator strip (fig. \ref{fig:flightViewTopIndicatorStrip}), telemetry data will be published. At the left edge a tool strip (fig. \ref{fig:flightViewToolStrip}) will be activated, which can be used to command the vehicle.
 
-The \textbf{\wima view} is used to generate flight paths from minimal user input. The user can define a Measurement Area, a Service Area (for take off, land, supply tasks, etc.) and a Corridor, which connects the other two areas. Furhter the \wima view and flight view will be described. 
+The \textbf{\wima view} is used to generate flight paths from minimal user input. The user can define a Measurement Area, a Service Area (for take off, land, supply tasks, etc.) and a Corridor, which connects the other two areas. Further the \wima view and flight view will be described. 
 
 \begin{figure}
 	\includegraphics[width=0.2\textwidth]{pics/flightViewToolStrip}
@@ -77,7 +77,7 @@ The \textbf{\wima view} is used to generate flight paths from minimal user input
 \end{figure}
 
 
-\subsection{\wima View}
+\subsection{\wima Plan View}
 By clicking the wave symbol (see fig. \ref{fig:QGCMainButtonExplain}; magenta square) the WiMA view appears. After entering, at the left screen edge, the WiMA tool strip will appear (depicted in fig. \ref{fig:WimaToolstrip}). 
 \subsubsection{WiMA Tool Strip}
 \label{sec:wimaToolStrip}
@@ -143,7 +143,7 @@ A minimal configuration of areas consists of measurement and service area. In th
 \begin{figure}
 \includegraphics[width=0.8\textwidth]{pics/validAreas}
 \centering
-\caption{A valid configuration of Measurement, Service Area and Corridor.}
+\caption{A valid configuration of measurement, service area and corridor.}
 \label{fig:validConfig}
 \end{figure} 
 
@@ -153,13 +153,13 @@ Pressing the \verb|File| button (see fig. \ref{fig:wimaViewSaveLoad}) of \wima t
 \begin{figure}
 	\includegraphics[width=0.3\textwidth]{pics/wimaViewSaveLoad}
 	\centering
-	\caption{\wima tool strip save/load dialog.}
+	\caption{\wima tool strip save/load dialogue.}
 	\label{fig:wimaViewSaveLoad}
 \end{figure}
 
 \subsubsection{Clearing \wima Missions}
 \label{sec:clearingWima}
-Press the \verb|File| button (see fig. \ref{fig:wimaViewSaveLoad}) of \wima tool strip (see \ref{sec:wimaToolStrip}) to open the dialog window. Pressing the \verb|New| button deletes all contents within the WiMA Main Window. 
+Press the \verb|File| button (see fig. \ref{fig:wimaViewSaveLoad}) of \wima tool strip (see \ref{sec:wimaToolStrip}) to open the dialogue window. Pressing the \verb|New| button deletes all contents within the WiMA Main Window. 
 
 \subsubsection{Uploading, Downloading and Clearing vehicle Missions}
 \label{sec:uploadDownloadVehicle}
@@ -215,15 +215,17 @@ To reduce calculation effort, the maximum number of way-points can be set using
 \subsubsection{How to synchronize the Data with Flight View}
 
 
+\subsection{\wima Flight View}
+
 
 \newpage
 \subsection{ArduPilot Simulator}
 For tasks like debugging, program verification or flight plan testing a simulated vehicle can be very useful. It can save time, money and prevent you from excessive sunburns, if you forgot that you are actually outside, starring on your screen, exposed to the hot summer sun.
 
-For this task the ArduPilot simulator can be used. It simulates a vehicle runnig the ArduPilot flight stack (firmware) on your local machine. Data is beeing published by the simulator via UDP and should ideally connect to \qgc without any further tweaks.
+For this task the ArduPilot simulator can be used. It simulates a vehicle running the ArduPilot flight stack (firmware) on your local machine. Data is being published by the simulator via UDP and should ideally connect to \qgc without any further tweaks.
 
 The simulator is part of the ArduPilot project, which can be downloaded from Github: \url{https://github.com/ArduPilot/ardupilot}.
-It is recommanded to fork the repository. After cloning the repository, the submodules must be initialized and updated. Execute the following code to do this.
+It is recommended to fork the repository. After cloning the repository, the sub-modules must be initialized and updated. Execute the following code to do this.
 \begin{shaded*}
 	\begin{verbatim}
 		git clone https://github.com/ArduPilot/ardupilot

WimaDok/main.toc

@@ -17,4 +17,5 @@
 \contentsline {subsubsection}{\numberline {3.2.8}Navigating the Map}{9}
 \contentsline {subsubsection}{\numberline {3.2.9}How to display the generated flight plan}{10}
 \contentsline {subsubsection}{\numberline {3.2.10}Circular Survey}{10}
+\contentsline {subsubsection}{\numberline {3.2.11}How to synchronize the Data with Flight View}{11}
 \contentsline {subsection}{\numberline {3.3}ArduPilot Simulator}{12}