diff --git a/docs/next/getting-started.html b/docs/next/getting-started.html index b359b5361ff..1493ef0ea43 100644 --- a/docs/next/getting-started.html +++ b/docs/next/getting-started.html @@ -233,7 +233,7 @@ npm start

Xcode Command Line Tools

Java Development Kit

-

React Native requires a recent version of the Java SE Development Kit (JDK). Download and install Oracle JDK 8 or newer if needed. You can also use OpenJDK 8 or newer as an alternative.

+

React Native requires a recent version of the Java SE Development Kit (JDK). Download and install Oracle JDK 8 if needed. You can also use OpenJDK 8 as an alternative.

Android development environment

Setting up your development environment can be somewhat tedious if you're new to Android development. If you're already familiar with Android development, there are a few things you may need to configure. In either case, please make sure to carefully follow the next few steps.

diff --git a/docs/next/getting-started/index.html b/docs/next/getting-started/index.html index b359b5361ff..1493ef0ea43 100644 --- a/docs/next/getting-started/index.html +++ b/docs/next/getting-started/index.html @@ -233,7 +233,7 @@ npm start

Xcode Command Line Tools

Java Development Kit

-

React Native requires a recent version of the Java SE Development Kit (JDK). Download and install Oracle JDK 8 or newer if needed. You can also use OpenJDK 8 or newer as an alternative.

+

React Native requires a recent version of the Java SE Development Kit (JDK). Download and install Oracle JDK 8 if needed. You can also use OpenJDK 8 as an alternative.

Android development environment

Setting up your development environment can be somewhat tedious if you're new to Android development. If you're already familiar with Android development, there are a few things you may need to configure. In either case, please make sure to carefully follow the next few steps.

diff --git a/docs/next/picker-item.html b/docs/next/picker-item.html index 43f6799e0dd..24e454c6b70 100644 --- a/docs/next/picker-item.html +++ b/docs/next/picker-item.html @@ -28,7 +28,7 @@

color

-

The value to be passed to picker's onValueChange callback when this item is selected. Can be a string or an integer.

+

Color of this item's text.

@@ -48,7 +48,7 @@
TypeRequired

value

-

Color of this item's text.

+

The value to be passed to picker's onValueChange callback when this item is selected. Can be a string or an integer.

diff --git a/docs/next/picker-item/index.html b/docs/next/picker-item/index.html index 43f6799e0dd..24e454c6b70 100644 --- a/docs/next/picker-item/index.html +++ b/docs/next/picker-item/index.html @@ -28,7 +28,7 @@
TypeRequiredPlatform

color

-

The value to be passed to picker's onValueChange callback when this item is selected. Can be a string or an integer.

+

Color of this item's text.

@@ -48,7 +48,7 @@
TypeRequired

value

-

Color of this item's text.

+

The value to be passed to picker's onValueChange callback when this item is selected. Can be a string or an integer.

diff --git a/docs/next/upgrading.html b/docs/next/upgrading.html index 70f62c81577..abdd2370580 100644 --- a/docs/next/upgrading.html +++ b/docs/next/upgrading.html @@ -67,6 +67,10 @@

You may specify a React Native version by passing an argument: react-native-git-upgrade X.Y.Z

+

Upon completion, run the following command to find your corresponding git patch file.

+
$ ls $TMPDIR/react-native-git-upgrade
+
+

To apply the git patch, run git apply <path to patch> inside your project folder.

The templates are upgraded in a optimized way. You still may encounter conflicts but only where the Git 3-way merge have failed, depending on the version and how you modified your sources.

4. Resolve the conflicts

Conflicted files include delimiters which make very clear where the changes come from. For example:

diff --git a/docs/next/upgrading/index.html b/docs/next/upgrading/index.html index 70f62c81577..abdd2370580 100644 --- a/docs/next/upgrading/index.html +++ b/docs/next/upgrading/index.html @@ -67,6 +67,10 @@

You may specify a React Native version by passing an argument: react-native-git-upgrade X.Y.Z

+

Upon completion, run the following command to find your corresponding git patch file.

+
$ ls $TMPDIR/react-native-git-upgrade
+
+

To apply the git patch, run git apply <path to patch> inside your project folder.

The templates are upgraded in a optimized way. You still may encounter conflicts but only where the Git 3-way merge have failed, depending on the version and how you modified your sources.

4. Resolve the conflicts

Conflicted files include delimiters which make very clear where the changes come from. For example:

TypeRequiredPlatform