From 2b309a426a3ba7156711af931099ba1bf1675195 Mon Sep 17 00:00:00 2001
From: Christopher Dro <hello@blick-labs.com>
Date: Sat, 23 Jan 2016 11:00:39 -0800
Subject: [PATCH] Updates to Text & IntentAndroid

Summary: Closes https://github.com/facebook/react-native/pull/5496

Reviewed By: svcscm

Differential Revision: D2858772

Pulled By: androidtrunkagent

fb-gh-sync-id: 5edf52af256efe6bb7ae1f8bcc2622d7e6a1298c
---
 .../Intent/IntentAndroid.android.js           | 23 +++++++++++++++++--
 Libraries/Text/Text.js                        |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Libraries/Components/Intent/IntentAndroid.android.js b/Libraries/Components/Intent/IntentAndroid.android.js
index 9dad6327b..cebe69948 100644
--- a/Libraries/Components/Intent/IntentAndroid.android.js
+++ b/Libraries/Components/Intent/IntentAndroid.android.js
@@ -33,8 +33,27 @@ var invariant = require('invariant');
  * }
  * ```
  *
- * NOTE: For instructions on how to add support for deep linking,
- * refer [Enabling Deep Links for App Content - Add Intent Filters for Your Deep Links](http://developer.android.com/training/app-indexing/deep-linking.html#adding-filters).
+ * Example to add support for deep linking inside your React Native app.
+ * More Info: [Enabling Deep Links for App Content - Add Intent Filters for Your Deep Links](http://developer.android.com/training/app-indexing/deep-linking.html#adding-filters).
+ *
+ * Edit in `android/app/src/main/AndroidManifest.xml`
+ *
+ * ```
+ *  <intent-filter>
+ *    <action android:name="android.intent.action.VIEW" />
+ *    <category android:name="android.intent.category.DEFAULT" />
+ *    <category android:name="android.intent.category.BROWSABLE" />
+ *
+ *    <!-- Accepts URIs that begin with "http://www.facebook.com/react -->
+ *    <data android:scheme="http"
+ *       android:host="www.facebook.com"
+ *       android:pathPrefix="/react" />
+ *    <!-- note that the leading "/" is required for pathPrefix-->
+ *
+ *    <!-- Accepts URIs that begin with "facebook://react -->
+ *    <!-- <data android:scheme="facebook" android:host="react" /> -->
+ *  </intent-filter>
+ * ```
  *
  * #### Opening external links
  *
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index e86f69fc1..eeb88c2dd 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -99,6 +99,7 @@ const Text = React.createClass({
     testID: React.PropTypes.string,
     /**
      * Specifies should fonts scale to respect Text Size accessibility setting on iOS.
+     * @platform ios
      */
     allowFontScaling: React.PropTypes.bool,
   },