Small tweaks to existing prs not waiting for 7..5

docs/add-ons/file.md

@@ -126,7 +126,7 @@ You can hard code the file entries tag to show specific files. You may also spec
 
     folder_id="34"
 
-If you want to display only the files that are in certain folder within Upload Directory, specify folder ID using this parameter.
+If you want to display only the files that are in certain folder within an Upload Directory, specify the folder ID using this parameter.
 
 ### `limit=`
 
@@ -227,7 +227,7 @@ The URL to the file.
 
 ### `{folder_id}`
 
-If the file is in a subfolder, will return ID of the folder. If the file is in root or upload directory, will return 0.
+The ID of the folder the file is in. If the file is in the top level folder of the upload directory, it will return 0.
 
 ### `{height}`
 

docs/comment/entries.md

@@ -22,7 +22,7 @@ Here is a basic example showing how you might use the comment tag:
       <p>By {name} on {comment_date format="%Y %m %d"}</p>
     {/exp:comment:entries}
 
-NOTE: **Important:** The Comment Entries tag should **not** be nested inside of a standard {exp:channel:entries} tag. If you do, the outer tag will parse and resolve many of these variables and conditionals before the Comment Entries tag has the chance to do so.
+NOTE: **Important:** The Comment Entries tag should **not** be nested inside of a standard {exp:channel:entries} tag. If you do, the outer tag will replace many of these variables and conditionals before the Comment Entries tag has the chance to do so.
 
 ## Parameters
 
@@ -485,7 +485,7 @@ TRUE / FALSE, This variable will be used in a conditional to allow [comment edit
 
     {if is_ignored} content {/if}
 
-This conditionals allows you to show (or hide) specific content if the comment was made by a member on the logged-in user's ignore list. A simplified example of how this might be used is:
+This conditional allows you to show (or hide) specific content if the comment was made by a member on the logged-in user's ignore list. A simplified example of how this might be used is:
 
     {exp:comment:entries}
       {if is_ignored}You are ignoring {author}.{/if}

docs/comment/form.md

@@ -229,7 +229,7 @@ A request for an edit will return a response array. In the case of an error, an
 
 By using the [{if editable}](/comment/entries.html#if-editable) conditional in the Comment Entries tag, you can output a link, instructions or a form if the viewing member has permission to edit the comment, and by using the {if can_moderate_comment} you can display whatever is appropriate if the viewing member has permission to moderate (close) the comment.
 
-For default regular members, in order to edit a comment, they must be logged in, the author of the comment, and the editing time limit must not have expired. If a member has a role with permission to edit the comments of any entry, that member will have edit permissions regardless of the editing time limit.
+For members without administrative access, in order to edit a comment they must be logged in, the author of the comment, and the editing time limit must not have expired. If a member has a role with permission to edit the comments of any entry, that member will have edit permissions regardless of the editing time limit.
 
 Comment moderators may close the comment. The edit time limit does not apply to moderators. 
 

docs/fieldtypes/file.md

@@ -134,7 +134,7 @@ If you have defined any [image manipulations](control-panel/file-manager/upload-
 
 ### `{folder_id}`
 
-If the file is in a subfolder, will return ID of the folder. If the file is in root or upload directory, will return 0.
+The ID of the folder the file is in. If the file is in the top level folder of the upload directory, it will return 0.
 
 ### `{height}`
 

docs/templates/globals/single-variables.md

@@ -33,7 +33,7 @@ This variable will be substituted for the global character set (UTF-8). It is ty
 
 ### `{cp_session_id}`
 
-The active session id for the control panel. This is the value needed in the "S=" portion of the control panel URL. Only made available for logged-in members who have access to the Control Panel. Used to build a URL from the front-end to, for instance, an add-on in the control panel. 
+The active session id for the control panel. This is the value needed in the "S=" portion of the control panel URL. Only made available for logged-in members who have access to the Control Panel. Used to build a URL from the front-end to, for instance, an add-on in the control panel. If sessions are not required for control panel login, this variable returns 0.
 
     {if logged_in_primary_role_id == 1}
       &bull; <a href="{cp_url}?/cp/addons/settings/my_addon{if cp_session_id}&S={cp_session_id}{/if}">CP Link</a>