From c4b64b3be3dc3748b7267a0f7a9ee86656b0a1a0 Mon Sep 17 00:00:00 2001
From: Advay Mengle <advayDev1@users.noreply.github.com>
Date: Sat, 24 Oct 2015 20:23:08 -0700
Subject: [PATCH 1/5] FAQ for 0.5.0-alpha

---
 FAQ.md | 127 +++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 88 insertions(+), 39 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 2cfe176b..316b3eab 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,6 +1,10 @@
 # FAQ
 (for contributors, see [CONTRIBUTING.md](CONTRIBUTING.md))
 
+This FAQ only illustrates the most common ways to customize the J2ObjC Gradle Plugin.  See
+[J2objcConfig.groovy](https://github.com/j2objc-contrib/j2objc-gradle/blob/master/src/main/groovy/com/github/j2objccontrib/j2objcgradle/J2objcConfig.groovy)
+for comprehensive documentation of all options.
+
 __Table of Contents__
 <!--
 To update the TOC,
@@ -18,27 +22,28 @@ Paste the results below, replacing existing contents.
 - [How do I develop with Xcode?](#how-do-i-develop-with-xcode)
 - [How can I speed up my build?](#how-can-i-speed-up-my-build)
 - [What libraries are linked by default?](#what-libraries-are-linked-by-default)
+- [How do I setup dependencies with J2ObjC?](#how-do-i-setup-dependencies-with-j2objc)
 - [What should I add to .gitignore?](#what-should-i-add-to-gitignore)
 - [What is the recommended folder structure for my app?](#what-is-the-recommended-folder-structure-for-my-app)
 - [What tasks does the plugin add to my project?](#what-tasks-does-the-plugin-add-to-my-project)
-- [What version of Gradle do I need?](#what-version-of-gradle-do-i-need)
-- [How do I solve the Eclipse error message Obtaining Gradle model...?](#how-do-i-solve-the-eclipse-error-message-obtaining-gradle-model)
-- [How do I properly pass multiple arguments to J2ObjC?](#how-do-i-properly-pass-multiple-arguments-to-j2objc)
+- [How do I customize translation with J2ObjC?](#how-do-i-customize-translation-with-j2objc)
+- [How do I customize compilation and linkage?](#how-do-i-customize-compilation-and-linkage)
 - [Why is my clean build failing?](#why-is-my-clean-build-failing)
 - [How do I include Java files from additional source directories?](#how-do-i-include-java-files-from-additional-source-directories)
 - [How do I develop with Swift?](#how-do-i-develop-with-swift)
 - [How do I solve 'File not found' import error in Xcode?](#how-do-i-solve-file-not-found-import-error-in-xcode)
 - [How do I work with Package Prefixes?](#how-do-i-work-with-package-prefixes)
-- [How do I enable ARC for my Objective-C classes?](#how-do-i-enable-arc-for-my-objective-c-classes)
+- [How do I enable ARC for my translated Objective-C classes?](#how-do-i-enable-arc-for-my-translated-objective-c-classes)
 - [How do I call finalConfigure()?](#how-do-i-call-finalconfigure)
-- [Why is my Android build so much slower after adding j2objc?](#why-is-my-android-build-so-much-slower-after-adding-j2objc)
+- [Why is my Android build so much slower after adding J2ObjC?](#why-is-my-android-build-so-much-slower-after-adding-j2objc)
 - [Error: implicit declaration of function 'JreRelease' is invalid in C99 [-Werror,-Wimplicit-function-declaration] JreRelease(this$0_)](#error-implicit-declaration-of-function-jrerelease-is-invalid-in-c99--werror-wimplicit-function-declaration-jrereleasethis0_)
 - [How do I disable a plugin task?](#how-do-i-disable-a-plugin-task)
-- [How do I setup dependencies with J2ObjC?](#how-do-i-setup-dependencies-with-j2objc)
 - [Cycle Finder Basic Setup](#cycle-finder-basic-setup)
 - [Cycle Finder Advanced Setup](#cycle-finder-advanced-setup)
 - [How do I develop on Windows or Linux?](#how-do-i-develop-on-windows-or-linux)
 - [How do I fix missing required architecture linker warning?](#how-do-i-fix-missing-required-architecture-linker-warning)
+- [How do I solve the Eclipse error message Obtaining Gradle model...?](#how-do-i-solve-the-eclipse-error-message-obtaining-gradle-model)
+
 
 ### Start here for debugging (aka it's not working; aka don't panic)
 
@@ -74,11 +79,18 @@ Now try building again.
 
 ### How do I develop with Xcode?
 
-When using the `j2objcTask`, open the `.xcworkspace` file in Xcode. If the `.xcodeproj` file
+The J2ObjC Gradle Plugin configures your Xcode project with [CocoaPods](https://cocoapods.org/).
+To take advantage of this, specify an `xcodeProjectDir` in your `j2objcConfig` per the Quick Start Guide.
+
+After using the `j2objcTask`, open the `.xcworkspace` file in Xcode. If the `.xcodeproj` file
 is opened in Xcode then CocoaPods will fail. This will appear as an Xcode build time error:
 
     library not found for -lPods-IOS-APP-j2objc-shared
 
+If you don't use CocoaPods, do not specify the `xcodeProjectDir` option;
+you'll have to manually add the static libraries and translated header directories
+to your Xcode project, and the `j2objcTask` will not do anything.
+
 Also see the FAQ note on [developing with Swift](#how-do-i-develop-with-swift).
 
 
@@ -117,11 +129,30 @@ The standard libraries are:
     org.mockito:mockito-core (test only)
     org.hamcrest:hamcrest-core (test only)
 
+Note that this only covers the Objective-C libraries; if you want to use these
+libraries in your Java code, you must still include the standard dependency directives like:
+
+```gradle
+// shared/build.gradle
+dependencies {
+    compile 'com.google.guava:guava:18.0'
+    testCompile 'junit:junit:4.11'
+}
+```
+
+
+### How do I setup dependencies with J2ObjC?
+
+The plugin can handle many types of dependencies: multiple Java projects, external libraries and
+unit-tests (with source), existing Objective-C code, etc.
+
+See [dependencies.md](dependencies.md).
+
 
 ### What should I add to .gitignore?
 
 The .gitignore file should follow existing conventions for Android Studio and Xcode.
-Once that's configured, check it contains the following:
+Once that's configured, check that it contains the following:
 
     # Includes j2objc.home setting (Android Studio should have added this)
     local.properties
@@ -166,34 +197,25 @@ shown before folders, so it is not in strict alphabetical order.
 
 ### What tasks does the plugin add to my project?
 
-These are the main tasks for the plugin:
+The main tasks for the plugin are:
 
-    j2objcCycleFinder - Find memory cycles that can cause leaks, see FAQ for more details
     j2objcTranslate   - Translates Java source to Objective-C
-    j2objcAssemble    - Outputs packed libraries, source & resources to build/j2objcOutputs
+    j2objcAssemble    - Outputs built libraries, source & resources to 'build/j2objcOutputs'
     j2objcTest        - Runs all JUnit tests in the translated code
-    j2objcBuild       - Runs j2objcAssemble and j2objcTest, doesn't run j2objcXcode
-    j2objcXcode       - Xcode updated with libraries, headers & resources (uses CocoaPods)
-
-Running the `build` task from the Gradle Java plugin will automatically run the j2objcBuild command
-and all the previous tasks (which it depends on). Only the `j2objcXcode` task needs to be manually
-run. Note that you can use the Gradle shorthand of `$ gradlew jA` to do the `j2objcAssemble` task.
-The other shorthand expressions are `jCF, jTr, jA, jTe, jB and jX`.
-
-
-### What version of Gradle do I need?
-
-You need at least [Gradle version 2.4](https://discuss.gradle.org/t/gradle-2-4-released/9471),
-due to support for native compilation features.
+    j2objcXcode       - Updates Xcode project with translated libraries, headers & resources (uses CocoaPods)
+    j2objcBuild       - Runs j2objcTranslate, j2objcAssemble, j2objcTest, and j2objcXcode
 
+Running the `build` task from the Gradle Java plugin will automatically run the `j2objcBuild` task
+and all the previous tasks (which it depends on).  The `j2objcXcode` task will disable itself
+automatically if no xcode
 
-### How do I solve the Eclipse error message ``Obtaining Gradle model...``?
+Note that you can use the Gradle shorthand of `$ gradlew jA` to do the `j2objcAssemble` task.
 
-You have to first create the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html).
-Go to your project folder and do ``gradle wrapper``. Refresh your Eclipse project.
 
+### How do I customize translation with J2ObjC?
 
-### How do I properly pass multiple arguments to J2ObjC?
+Inside your `j2objcConfig` section, you can pass any of the [options J2ObjC takes](http://j2objc.org/docs/j2objc.html)
+with `translateArgs`.
 
 Make sure your arguments are separate strings, not a single space-concatenated string.
 
@@ -212,10 +234,24 @@ j2objcConfig {
 ```
 
 
+### How do I customize compilation and linkage?
+
+Many well-known compiler or linker args can be customized using an existing
+`J2objcConfig` option.  The plugin already sets up a standard build for you,
+so only configure these options if the defaults fail to work.
+
+As a last resort, inside your `j2objcConfig` section, you can pass any of the
+standard Clang compiler or linker args as `extraObjcCompilerArgs` and `extraLinkerArgs`,
+respectively.
+
+Make sure your arguments are separate strings, not a single space-concatenated strings
+(see `translateArgs` example above).
+
+
 ### Why is my clean build failing?
 
 This is a [known issue](https://github.com/j2objc-contrib/j2objc-gradle/issues/306)
-if you don't have any tests. If you are doing `./gradlew clean build`, try instead
+if you don't have any JUnit tests. If you are doing `./gradlew clean build`, try instead
 `./gradlew clean && ./gradlew build`.
 
 When you don't have any test source files, the plugin creates a placeholder to force the
@@ -261,6 +297,7 @@ you'd like to access from Swift code. Also see the FAQ item on [file not found](
 #import "MyClassTwo.h"
 ```
 
+
 ### How do I solve 'File not found' import error in Xcode?
 
 This is typically caused by a limitation of Xcode that expects all the source to be in a
@@ -274,6 +311,10 @@ j2objcConfig {
 }
 ```
 
+If you'd like to preserve your folder hierarchy, you can alternatively change your 
+[USER_HEADER_SEARCH_PATHS](https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/XcodeBuildSettingRef/1-Build_Setting_Reference/build_setting_ref.html#//apple_ref/doc/uid/TP40003931-CH3-SW21)
+setting in your Xcode projects to include `shared/build/j2objcOutputs/src/main/objc`.
+
 Example error:
 
 ```
@@ -313,9 +354,13 @@ This will map packages such as com.example.dirandcom.example.dir.subdir both to
 com.example.dir.*: Ceds
 ````
 
-### How do I enable ARC for my Objective-C classes?
+### How do I enable ARC for my translated Objective-C classes?
+
+__Note__: The use of ARC for the translated code is not recommended and is not required
+in order to use ARC for the hand-written Objective-C iOS app that links to the translated code.
 
-Add the following to your configuration block. [See](https://developer.apple.com/library/mac/releasenotes/ObjectiveC/RN-TransitioningToARC/Introduction/Introduction.html#//apple_ref/doc/uid/TP40011226-CH1-SW15).
+Add the following to your configuration block. See 
+[here](https://developer.apple.com/library/mac/releasenotes/ObjectiveC/RN-TransitioningToARC/Introduction/Introduction.html#//apple_ref/doc/uid/TP40011226-CH1-SW15).
 
 ```gradle
 j2objcConfig {
@@ -338,8 +383,11 @@ j2objcConfig {
 }
 ```
 
+In addition, put your `j2objcConfig` at the very end of your build.gradle.  This allows
+`finalConfigure()` to correctly access other project settings, like dependencies.
+
 
-### Why is my Android build so much slower after adding j2objc?
+### Why is my Android build so much slower after adding J2ObjC?
 
 Depending on your Android Studio 'run configuration', you may be building more of your Gradle
 project than is neccessary.  For example if your run configuration includes a general 'Make'
@@ -354,7 +402,7 @@ make sure you are running `./gradlew :android:assembleDebug` and not for example
 
 ### Error: implicit declaration of function 'JreRelease' is invalid in C99 [-Werror,-Wimplicit-function-declaration] JreRelease(this$0_)
 
-See: [How do I enable ARC for my Objective-C classes?](#how-do-i-enable-arc-for-my-objective-c-classes?)
+See: [How do I enable ARC for my translated Objective-C classes?](#how-do-i-enable-arc-for-my-translated-objective-c-classes?)
 
 
 ### How do I disable a plugin task?
@@ -374,11 +422,6 @@ j2objcConfig {
 ```
 
 
-### How do I setup dependencies with J2ObjC?
-
-See [dependencies.md](dependencies.md).
-
-
 ### Cycle Finder Basic Setup
 
 This task is disabled by default as it requires greater sophistication to use. It runs the
@@ -435,7 +478,7 @@ For more details:
 
 ### How do I develop on Windows or Linux?
 
-Windows and Linux support is limited to the j2objcCycleFinder and j2objcTranslate tasks.
+Windows and Linux support is limited to the `j2objcCycleFinder` and `j2objcTranslate` tasks.
 Mac OS X is required for the j2objcAssemble, j2objcTest and j2objcXcode tasks
 (see [task descriptions](README.md#tasks)) This matches the
 [J2ObjC Requirements](http://j2objc.org/#requirements).
@@ -469,3 +512,9 @@ j2objcConfig {
     supportedArchs += ['ios_i386']
 }
 ```
+
+
+### How do I solve the Eclipse error message ``Obtaining Gradle model...``?
+
+You have to first create the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html).
+Go to your project folder and do ``gradle wrapper``. Refresh your Eclipse project.

From fcc118d59e95e43288a8a7ab92568b5db22db429 Mon Sep 17 00:00:00 2001
From: Advay Mengle <advayDev1@users.noreply.github.com>
Date: Sat, 24 Oct 2015 20:27:19 -0700
Subject: [PATCH 2/5] typo [skip ci]

---
 FAQ.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 316b3eab..a0aa40c6 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -82,14 +82,14 @@ Now try building again.
 The J2ObjC Gradle Plugin configures your Xcode project with [CocoaPods](https://cocoapods.org/).
 To take advantage of this, specify an `xcodeProjectDir` in your `j2objcConfig` per the Quick Start Guide.
 
-After using the `j2objcTask`, open the `.xcworkspace` file in Xcode. If the `.xcodeproj` file
+After running `j2objcXcode`, open the `.xcworkspace` file in Xcode. If the `.xcodeproj` file
 is opened in Xcode then CocoaPods will fail. This will appear as an Xcode build time error:
 
     library not found for -lPods-IOS-APP-j2objc-shared
 
 If you don't use CocoaPods, do not specify the `xcodeProjectDir` option;
 you'll have to manually add the static libraries and translated header directories
-to your Xcode project, and the `j2objcTask` will not do anything.
+to your Xcode project, and `j2objcXcode` will not do anything.
 
 Also see the FAQ note on [developing with Swift](#how-do-i-develop-with-swift).
 

From 7c455185162bb08c56eb1fd6e6c361cbbba66834 Mon Sep 17 00:00:00 2001
From: Advay Mengle <advayDev1@users.noreply.github.com>
Date: Sat, 24 Oct 2015 20:41:35 -0700
Subject: [PATCH 3/5] v0.5 in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27939155..5d07e670 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Configure `shared/build.gradle` in your Java only project:
 // File: shared/build.gradle
 plugins {
     id 'java'
-    id 'com.github.j2objccontrib.j2objcgradle' version '0.4.3-alpha'
+    id 'com.github.j2objccontrib.j2objcgradle' version '0.5.0-alpha'
 }
 
 // Plugin settings:

From 7f752b32e3dced4ee0ef739d01f5a6afaa221e81 Mon Sep 17 00:00:00 2001
From: Advay Mengle <advayDev1@users.noreply.github.com>
Date: Sat, 24 Oct 2015 20:52:39 -0700
Subject: [PATCH 4/5] Update FAQ.md

---
 FAQ.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index a0aa40c6..c5c5b648 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -19,7 +19,7 @@ and execute:
 Paste the results below, replacing existing contents.
 -->
 - [Start here for debugging (aka it's not working; aka don't panic)](#start-here-for-debugging-aka-its-not-working-aka-dont-panic)
-- [How do I develop with Xcode?](#how-do-i-develop-with-xcode)
+- [How do I develop with tasde?](#how-do-i-develop-with-tasde)
 - [How can I speed up my build?](#how-can-i-speed-up-my-build)
 - [What libraries are linked by default?](#what-libraries-are-linked-by-default)
 - [How do I setup dependencies with J2ObjC?](#how-do-i-setup-dependencies-with-j2objc)
@@ -31,7 +31,7 @@ Paste the results below, replacing existing contents.
 - [Why is my clean build failing?](#why-is-my-clean-build-failing)
 - [How do I include Java files from additional source directories?](#how-do-i-include-java-files-from-additional-source-directories)
 - [How do I develop with Swift?](#how-do-i-develop-with-swift)
-- [How do I solve 'File not found' import error in Xcode?](#how-do-i-solve-file-not-found-import-error-in-xcode)
+- [How do I solve 'File not found' import error in tasde?](#how-do-i-solve-file-not-found-import-error-in-tasde)
 - [How do I work with Package Prefixes?](#how-do-i-work-with-package-prefixes)
 - [How do I enable ARC for my translated Objective-C classes?](#how-do-i-enable-arc-for-my-translated-objective-c-classes)
 - [How do I call finalConfigure()?](#how-do-i-call-finalconfigure)
@@ -49,7 +49,7 @@ Paste the results below, replacing existing contents.
 
 Some common misconfigurations can cause numerous Gradle errors.
 
-1. First make sure you have a supported version of j2objc and Xcode
+1. First make sure you have a supported version of j2objc and tasde
 (see [README.md](README.md) for our current supported versions) installed locally,
 and that your J2OBJC_HOME property is set correctly to the distribution directory
 of j2objc.  This _is not_ the source repository root for j2objc.  The distribution
@@ -207,7 +207,7 @@ The main tasks for the plugin are:
 
 Running the `build` task from the Gradle Java plugin will automatically run the `j2objcBuild` task
 and all the previous tasks (which it depends on).  The `j2objcXcode` task will disable itself
-automatically if no xcode
+automatically if no `xcodeProjectDir` is specified.
 
 Note that you can use the Gradle shorthand of `$ gradlew jA` to do the `j2objcAssemble` task.
 
@@ -311,9 +311,9 @@ j2objcConfig {
 }
 ```
 
-If you'd like to preserve your folder hierarchy, you can alternatively change your 
+If you'd like to preserve your folder hierarchy, you can instead change your 
 [USER_HEADER_SEARCH_PATHS](https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/XcodeBuildSettingRef/1-Build_Setting_Reference/build_setting_ref.html#//apple_ref/doc/uid/TP40003931-CH3-SW21)
-setting in your Xcode projects to include `shared/build/j2objcOutputs/src/main/objc`.
+setting in your Xcode projects to include the `shared/build/j2objcOutputs/src/main/objc` folder.
 
 Example error:
 
@@ -352,7 +352,7 @@ This will map packages such as com.example.dirandcom.example.dir.subdir both to
 
 ```
 com.example.dir.*: Ceds
-````
+```
 
 ### How do I enable ARC for my translated Objective-C classes?
 
@@ -413,12 +413,13 @@ disable the `j2objcTest` task, do the following:
 
 ```gradle
 // File: shared/build.gradle
-j2objcTest {
-    enabled = false
-}
 j2objcConfig {
     ...
 }
+
+j2objcTest {
+    enabled = false
+}
 ```
 
 
@@ -479,7 +480,7 @@ For more details:
 ### How do I develop on Windows or Linux?
 
 Windows and Linux support is limited to the `j2objcCycleFinder` and `j2objcTranslate` tasks.
-Mac OS X is required for the j2objcAssemble, j2objcTest and j2objcXcode tasks
+Mac OS X is required for the j2objcAssemble, j2objcTest and j2objctasde tasks
 (see [task descriptions](README.md#tasks)) This matches the
 [J2ObjC Requirements](http://j2objc.org/#requirements).
 

From 4ef448bd081a86f9e72c0226c1f37c5abf9b9d03 Mon Sep 17 00:00:00 2001
From: Advay Mengle <advayDev1@users.noreply.github.com>
Date: Sat, 24 Oct 2015 23:14:19 -0700
Subject: [PATCH 5/5] FAQ feedback

---
 FAQ.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index c5c5b648..43f4fa37 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -19,7 +19,7 @@ and execute:
 Paste the results below, replacing existing contents.
 -->
 - [Start here for debugging (aka it's not working; aka don't panic)](#start-here-for-debugging-aka-its-not-working-aka-dont-panic)
-- [How do I develop with tasde?](#how-do-i-develop-with-tasde)
+- [How do I develop with Xcode?](#how-do-i-develop-with-xcode)
 - [How can I speed up my build?](#how-can-i-speed-up-my-build)
 - [What libraries are linked by default?](#what-libraries-are-linked-by-default)
 - [How do I setup dependencies with J2ObjC?](#how-do-i-setup-dependencies-with-j2objc)
@@ -31,7 +31,7 @@ Paste the results below, replacing existing contents.
 - [Why is my clean build failing?](#why-is-my-clean-build-failing)
 - [How do I include Java files from additional source directories?](#how-do-i-include-java-files-from-additional-source-directories)
 - [How do I develop with Swift?](#how-do-i-develop-with-swift)
-- [How do I solve 'File not found' import error in tasde?](#how-do-i-solve-file-not-found-import-error-in-tasde)
+- [How do I solve 'File not found' import error in Xcode?](#how-do-i-solve-file-not-found-import-error-in-xcode)
 - [How do I work with Package Prefixes?](#how-do-i-work-with-package-prefixes)
 - [How do I enable ARC for my translated Objective-C classes?](#how-do-i-enable-arc-for-my-translated-objective-c-classes)
 - [How do I call finalConfigure()?](#how-do-i-call-finalconfigure)
@@ -49,7 +49,7 @@ Paste the results below, replacing existing contents.
 
 Some common misconfigurations can cause numerous Gradle errors.
 
-1. First make sure you have a supported version of j2objc and tasde
+1. First make sure you have a supported version of j2objc and Xcode
 (see [README.md](README.md) for our current supported versions) installed locally,
 and that your J2OBJC_HOME property is set correctly to the distribution directory
 of j2objc.  This _is not_ the source repository root for j2objc.  The distribution
@@ -80,7 +80,8 @@ Now try building again.
 ### How do I develop with Xcode?
 
 The J2ObjC Gradle Plugin configures your Xcode project with [CocoaPods](https://cocoapods.org/).
-To take advantage of this, specify an `xcodeProjectDir` in your `j2objcConfig` per the Quick Start Guide.
+To take advantage of this, specify the directory that contains `PROJECT.xcodeproj` as
+the `xcodeProjectDir` in your `j2objcConfig` per the [Quick Start Guide](README.md#quick-start-guide).
 
 After running `j2objcXcode`, open the `.xcworkspace` file in Xcode. If the `.xcodeproj` file
 is opened in Xcode then CocoaPods will fail. This will appear as an Xcode build time error:
@@ -344,14 +345,14 @@ j2objcConfig {
 // File: resources/prefixes.properties
 // Storing at this location allows Class.forName(javaName) to work for mapped class.
 com.example.dir: Ced
-com.example.dir.subdir: Ceds
+com.example.dir.subdir: Ced
 ```
 
-As of J2ObjC verion 0.9.8 you can also use wildcards in your prefixes file. 
-This will map packages such as com.example.dirandcom.example.dir.subdir both to Ceds.
+You can also use wildcards in your prefixes file. 
+This will map packages such as com.example.dir and com.example.dir.subdir both to Ced.
 
 ```
-com.example.dir.*: Ceds
+com.example.dir.*: Ced
 ```
 
 ### How do I enable ARC for my translated Objective-C classes?
@@ -480,7 +481,7 @@ For more details:
 ### How do I develop on Windows or Linux?
 
 Windows and Linux support is limited to the `j2objcCycleFinder` and `j2objcTranslate` tasks.
-Mac OS X is required for the j2objcAssemble, j2objcTest and j2objctasde tasks
+Mac OS X is required for the j2objcAssemble, j2objcTest and j2objcXcode tasks
 (see [task descriptions](README.md#tasks)) This matches the
 [J2ObjC Requirements](http://j2objc.org/#requirements).