# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- /www/drupal8/includes_d_g-1533096-64.patch
+++ /www/drupal8/includes_d_g-1533096-74.patch
@@ -1,5 +1,5 @@
 diff --git a/core/includes/database.inc b/core/includes/database.inc
-index 75f6a96..4fc4165 100644
+index e454f25..bad11b7 100644
 --- a/core/includes/database.inc
 +++ b/core/includes/database.inc
 @@ -1,8 +1,5 @@
@@ -44,7 +44,7 @@
   * Returns a new DatabaseCondition, set to "OR" all conditions together.
   *
   * @return Condition
-+ *   Returns Condition object with the specified "OR" conjunction.
++ *   Returns a Condition object with the specified "OR" conjunction.
   */
  function db_or() {
    return new Condition('OR');
@@ -52,7 +52,7 @@
   * Returns a new DatabaseCondition, set to "AND" all conditions together.
   *
   * @return Condition
-+ *   Returns Condition object with the specified "AND" conjunction.
++ *   Returns a Condition object with the specified "AND" conjunction.
   */
  function db_and() {
    return new Condition('AND');
@@ -60,7 +60,7 @@
   * Returns a new DatabaseCondition, set to "XOR" all conditions together.
   *
   * @return Condition
-+ *   Returns Condition object with the specified "XOR" conjunction.
++ *   Returns a Condition object with the specified "XOR" conjunction.
   */
  function db_xor() {
    return new Condition('XOR');
@@ -70,7 +70,7 @@
   *   The conjunction to use for query conditions (AND, OR or XOR).
 + *
   * @return Condition
-+ *   Returns Condition object with the specified conjunction.
++ *   Returns a Condition object with the specified conjunction.
   */
  function db_condition($conjunction) {
    return new Condition($conjunction);
@@ -79,7 +79,7 @@
  }
  
 +/**
-+ * Creates the keys sql from the given field specification.
++ * Creates the SQL to add table keys.
 + *
 + * @param $spec
 + *   The field specification array, as taken from a schema definition.
@@ -88,7 +88,7 @@
    return Database::getConnection()->schema()->createKeysSql($spec);
  }
 diff --git a/core/includes/entity.api.php b/core/includes/entity.api.php
-index 8b97b74..0528722 100644
+index 8b97b74..75f5b27 100644
 --- a/core/includes/entity.api.php
 +++ b/core/includes/entity.api.php
 @@ -84,7 +84,7 @@
@@ -96,7 +96,7 @@
   *
   * @param string $entity_type
 - *   The type of $entity; e.g. 'node' or 'user'.
-+ *   The type of $entity; e.g., 'node' or 'user'.
++ *   The type of $entity, e.g., 'node' or 'user'.
   * @param string $bundle
   *   The name of the bundle.
   */
@@ -146,7 +146,7 @@
  function hook_entity_form_display_alter(\Drupal\entity\Plugin\Core\Entity\EntityFormDisplay $form_display, array $context) {
    // Hide the 'user_picture' field from the register form.
 diff --git a/core/includes/entity.inc b/core/includes/entity.inc
-index 7822d7a..a0dc2a8 100644
+index 7822d7a..bd58804 100644
 --- a/core/includes/entity.inc
 +++ b/core/includes/entity.inc
 @@ -102,7 +102,14 @@
@@ -169,7 +169,7 @@
   * Gets the entity controller class for an entity type.
   *
   * @return Drupal\Core\Entity\EntityStorageControllerInterface
-+ *   Returns the storage controller for this entity type.
++ *   Returns the storage controller for the given entity type.
   *
   * @deprecated Use \Drupal\Core\Entity\EntityManager::getStorageController().
   */
@@ -326,7 +326,7 @@
           (isset($backtrace[1]['function']) && in_array($backtrace[1]['function'], $blacklist))) {
      array_shift($backtrace);
 diff --git a/core/includes/file.inc b/core/includes/file.inc
-index ec329e1..268b1cd 100644
+index ec329e1..799782a 100644
 --- a/core/includes/file.inc
 +++ b/core/includes/file.inc
 @@ -75,7 +75,8 @@
@@ -441,15 +441,13 @@
   *
   * When PHP's mkdir() creates a directory, the requested mode is affected by the
   * process's umask. This function overrides the umask and sets the mode
-@@ -1515,8 +1519,9 @@
+@@ -1515,8 +1519,7 @@
  }
  
  /**
 - * Helper function. Ensures we don't pass a NULL as a context resource to
 - * mkdir().
-+ * Helper function.
-+ *
-+ * Ensures we don't pass a NULL as a context resource to mkdir().
++ * Helper function to prevent passing NULL as a context resource to mkdir().
   *
   * @see drupal_mkdir()
   */