From d503fbdf08594c148f01d3687ffdd7c3e428f877 Mon Sep 17 00:00:00 2001
From: Florent Rougon <f.rougon@free.fr>
Date: Sun, 27 Mar 2016 10:43:42 +0200
Subject: [PATCH 1/2] Document that --metar automatically implies
 --disable-real-weather-fetch

Following FlightGear commit 0cfa4ced9cd5e2ec26e753ddd5f61da7558221a6,
mention in the output of 'fgfs --help --verbose' that the --metar option
automatically implies --disable-real-weather-fetch.
---
 Translations/en/options.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Translations/en/options.xml b/Translations/en/options.xml
index 55d561a96..83a457c40 100644
--- a/Translations/en/options.xml
+++ b/Translations/en/options.xml
@@ -33,7 +33,7 @@
 	<enable-random-buildings-desc>Include random buildings objects</enable-random-buildings-desc>
 	<disable-real-weather-fetch-desc>Disable METAR based real weather fetching</disable-real-weather-fetch-desc>
 	<enable-real-weather-fetch-desc>Enable METAR based real weather fetching (this requires an open internet connection)</enable-real-weather-fetch-desc>
-	<metar-desc>Pass a METAR to set up static weather</metar-desc>
+	<metar-desc>Pass a METAR string to set up static weather (this implies --disable-real-weather-fetch)</metar-desc>
 	<random-objects-desc>(buildings, etc.)</random-objects-desc>
 	<disable-ai-models-desc>Deprecated option (disable internal AI subsystem)</disable-ai-models-desc>
 	<enable-ai-models-desc>Enable AI subsystem (required for multi-player, AI traffic and many other animations)</enable-ai-models-desc>

From 5f4d2d509f8a6949d7e7f79c9876d050ebf92d76 Mon Sep 17 00:00:00 2001
From: Florent Rougon <f.rougon@free.fr>
Date: Sun, 27 Mar 2016 10:59:21 +0200
Subject: [PATCH 2/2] Document the --download-dir 'fgfs' option for 'fgfs
 --help --verbose'

For reference, see FlightGear commits
aa20e0acd82ffaccb829d941b9c7c5cab627124e and
5baca8598f484874235a037fc5db5eb0f9bdfa4a, as well as the discussion at
<https://sourceforge.net/p/flightgear/mailman/flightgear-devel/thread/87egb1wipj.fsf%40frougon.crabdance.com/#msg34959541>.
---
 Translations/en/options.xml | 1 +
 options.xml                 | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/Translations/en/options.xml b/Translations/en/options.xml
index 83a457c40..575ea6545 100644
--- a/Translations/en/options.xml
+++ b/Translations/en/options.xml
@@ -16,6 +16,7 @@
 	<fg-scenery-desc n="0">Specify the scenery path(s);</fg-scenery-desc>
 	<fg-scenery-desc n="1">Defaults to $FG_ROOT/Scenery</fg-scenery-desc>
 	<fg-aircraft-desc>Specify additional aircraft directory path(s) (alternatively, you can use --aircraft-dir to target a specific aircraft in a given directory)</fg-aircraft-desc>
+        <download-dir-desc>Base directory to use for aircraft and scenery downloads (the TerraSync scenery directory may be specifically set with --terrasync-dir)</download-dir-desc>
 	<language-desc>Select the language for this session</language-desc>
 	<disable-splash-screen-desc>Disable splash screen</disable-splash-screen-desc>
 	<enable-splash-screen-desc>Enable splash screen</enable-splash-screen-desc>
diff --git a/options.xml b/options.xml
index 3f21954fb..d255bf59c 100644
--- a/options.xml
+++ b/options.xml
@@ -85,6 +85,13 @@
     <brief/>
    </option>
 
+   <option>
+    <name>download-dir</name>
+    <arg>path</arg>
+    <description>download-dir-desc</description>
+    <brief/>
+   </option>
+
    <option>
     <name>language</name>
     <arg>code</arg>