[ios-sdk] Previous commit broke Scrumptious; Scrumptious needs to req…

…uest basic permissions.

Summary:
Because "email" is no longer added by default to all permission sets on iOS 6, Scrumptious needs to explicitly request
it since it provides explicit a permission set.

Fixed wording issue in header docs.

Test Plan:
- Ran Scrumptious on iOS 6

Revert Plan:

Reviewers: jacl

Reviewed By: jacl

CC: msdkexp@

Differential Revision: https://phabricator.fb.com/D581447

samples/Scrumptious/scrumptious/SCAppDelegate.m

@@ -116,7 +116,7 @@ - (void)sessionStateChanged:(FBSession *)session
 }
 
 - (BOOL)openSessionWithAllowLoginUI:(BOOL)allowLoginUI {
-    NSArray *permissions = [NSArray arrayWithObjects:@"user_photos", nil];
+    NSArray *permissions = [NSArray arrayWithObjects:@"email", @"user_photos", nil];
     return [FBSession openActiveSessionWithReadPermissions:permissions
                                               allowLoginUI:allowLoginUI
                                          completionHandler:^(FBSession *session, FBSessionState state, NSError *error) {

src/FBSession.h

@@ -195,7 +195,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  default values for parameters to <initWithAppID:permissions:urlSchemeSuffix:tokenCacheStrategy:>.
  
  @param permissions  An array of strings representing the permissions to request during the
- authentication flow. A value of nil will indicates basic permissions. The default is nil.
+ authentication flow. A value of nil indicates basic permissions. The default is nil.
  
  @discussion
  It is required that any single permission request request (including initial log in) represent read-only permissions
@@ -212,7 +212,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  defaults when ommitted.
  
  @param permissions  An array of strings representing the permissions to request during the
- authentication flow. A value of nil will indicates basic permissions. The default is nil.
+ authentication flow. A value of nil indicates basic permissions. The default is nil.
  @param appID  The Facebook App ID for the session. If nil is passed in the default App ID will be obtained from a call to <[FBSession defaultAppID]>. The default is nil.
  @param urlSchemeSuffix  The URL Scheme Suffix to be used in scenarious where multiple iOS apps use one Facebook App ID. A value of nil indicates that this information should be pulled from the plist. The default is nil.
  @param tokenCachingStrategy Specifies a key name to use for cached token information in NSUserDefaults, nil
@@ -235,7 +235,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  defaults when ommitted.
  
  @param readPermissions  An array of strings representing the permissions to request during the
- authentication flow. A value of nil will indicates basic permissions. The default is nil.
+ authentication flow. A value of nil indicates basic permissions. The default is nil.
  @param defaultAudience  Most applications use FBSessionDefaultAudienceNone here, only specifying an audience when using reauthorize to request publish permissions.
  @param appID  The Facebook App ID for the session. If nil is passed in the default App ID will be obtained from a call to <[FBSession defaultAppID]>. The default is nil.
  @param urlSchemeSuffix  The URL Scheme Suffix to be used in scenarious where multiple iOS apps use one Facebook App ID. A value of nil indicates that this information should be pulled from the plist. The default is nil.
@@ -342,7 +342,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  Reauthorizes the session, with additional permissions.
  
  @param permissions An array of strings representing the permissions to request during the
- authentication flow. A value of nil will indicates basic permissions. The default is nil.
+ authentication flow. A value of nil indicates basic permissions. The default is nil.
  @param behavior Controls whether to allow, force, or prohibit Facebook Login. The default
  is to allow Facebook Login and fall back to Inline Facebook Login if needed.
  @param handler A block to call with session state changes. The default is nil.
@@ -361,7 +361,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  Reauthorizes the session, with additional permissions.
  
  @param readPermissions An array of strings representing the permissions to request during the
- authentication flow. A value of nil will indicates basic permissions.
+ authentication flow. A value of nil indicates basic permissions.
  
  @param handler A block to call with session state changes. The default is nil.
  */
@@ -429,7 +429,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  used by the application. This session becomes the active session, whether open succeeds or fails.
  
  @param permissions     An array of strings representing the permissions to request during the
- authentication flow. A value of nil will indicates basic permissions. A nil value specifies 
+ authentication flow. A value of nil indicates basic permissions. A nil value specifies 
  default permissions.
   
  @param allowLoginUI    Sometimes it is useful to attempt to open a session, but only if
@@ -469,7 +469,7 @@ typedef void (^FBSessionReauthorizeResultHandler)(FBSession *session,
  used by the application. This session becomes the active session, whether open succeeds or fails.
  
  @param readPermissions     An array of strings representing the read permissions to request during the
- authentication flow. A value of nil will indicates basic permissions. It is not allowed to pass publish
+ authentication flow. A value of nil indicates basic permissions. It is not allowed to pass publish
  permissions to this method.
  
  @param allowLoginUI    Sometimes it is useful to attempt to open a session, but only if