From 089221ad6342d6a55dfb075cfb3412c862975258 Mon Sep 17 00:00:00 2001
From: Jordan Kiley <jmkiley@users.noreply.github.com>
Date: Mon, 28 Oct 2019 14:30:26 -0700
Subject: [PATCH] Update issue templates (#35)

---
 .github/ISSUE_TEMPLATE/android.md | 33 -------------------------------
 .github/ISSUE_TEMPLATE/other.md   |  7 ++++++-
 platform/ios/CHANGELOG.md         |  2 +-
 3 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/android.md

diff --git a/.github/ISSUE_TEMPLATE/android.md b/.github/ISSUE_TEMPLATE/android.md
deleted file mode 100644
index 4d22a6c565..0000000000
--- a/.github/ISSUE_TEMPLATE/android.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Android
-about: Mapbox Maps SDK for Android
-
----
-<!--
-Hello and thanks for contributing to the Mapbox Maps SDK for Android! To help us diagnose your problem quickly, please:
-
- - Include a minimal demonstration of the bug, including code, logs, and screenshots.
- - Ensure you can reproduce the bug using the latest release.
- - Only post to report a bug or request a feature; direct all other questions to: https://stackoverflow.com/questions/tagged/mapbox
-
-Start with a brief description below this line. -->
-
-### Steps to reproduce
-
- 1.
- 2.
- 3.
-
-### Expected behavior
-
-
-
-### Actual behavior
-
-
-
-### Configuration
-
-**Android versions:** 
-**Device models:** 
-**Mapbox SDK versions:** 
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index 47a736f018..6b43d68bb1 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -1,6 +1,6 @@
 ---
 name: Other
-about: Another platform or a cross-platform issue
+about: CI or other non-platform specific issues
 
 ---
 <!--
@@ -9,6 +9,11 @@ Hello and thanks for contributing to the Mapbox Maps SDK! To help us diagnose yo
  - Include a minimal demonstration of the bug, including code, logs, and screenshots.
  - Ensure you can reproduce the bug using the latest release.
  - Only post to report a bug or request a feature; direct all other questions to: https://stackoverflow.com/questions/tagged/mapbox
+ 
+ For cross-platform requests, such as issues related to rendering cross-platform feature requests, please open an issue in the Mapbox GL Native Repo: https://www.github/com/mapbox-gl-native
+ For issues related to the Mapbox Maps SDK for Android, please see https://www.github/com/mapbox-gl-native-android
+ 
+ Otherwise, use this template to report issues related to anything in this repo not directly related to the iOS or macOS SDKs, such as CI issues.
 -->
 
 **Platform:**
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index d9eda25e40..06eef12ce1 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -17,7 +17,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 * Added `-[MGLMapSnapshotOverlay coordinateForPoint:]` and `-[MGLMapSnapshotOverlay pointForCoordinate:]` to convert between context and map coordinates, mirroring those of `MGLMapSnapshot`. ([#15746](https://github.com/mapbox/mapbox-gl-native/pull/15746))
 * Suppress network requests for expired tiles update, if these tiles are invisible. ([#15741](https://github.com/mapbox/mapbox-gl-native/pull/15741))
 * Fixed an issue that cause the ornaments to ignore `MGLMapView.contentInset` property. ([#15584](https://github.com/mapbox/mapbox-gl-native/pull/15584))
-* Fixed an issue that cause `-[MGLMapView setCamere:withDuration:animationTimingFunction:edgePadding:completionHandler:]` persist the value of `edgePadding`. ([#15584](https://github.com/mapbox/mapbox-gl-native/pull/15584))
+* Fixed an issue that cause `-[MGLMapView setCamera:withDuration:animationTimingFunction:edgePadding:completionHandler:]` persist the value of `edgePadding`. ([#15584](https://github.com/mapbox/mapbox-gl-native/pull/15584))
 * Added `MGLMapView.automaticallyAdjustsContentInset` property that indicates if wether the map view should automatically adjust its content insets. ([#15584](https://github.com/mapbox/mapbox-gl-native/pull/15584))
 * Fixed an issue that caused `MGLScaleBar` to have an incorrect size when resizing or rotating. ([#15703](https://github.com/mapbox/mapbox-gl-native/pull/15703))
 * Fixed crash at launch seen on iOS 9 simulator. ([#15771](https://github.com/mapbox/mapbox-gl-native/pull/15771))