diff --git a/core/lib/Drupal/Core/Entity/Annotation/FieldType.php b/core/lib/Drupal/Core/Entity/Annotation/FieldType.php
index 6934677..d9a1a3f 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/FieldType.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/FieldType.php
@@ -110,9 +110,6 @@ class FieldType extends DataType {
   /**
    * A boolean stating that fields of this type cannot be created through the UI.
    *
-   * If TRUE or the field type is not configurable, fields of this type can only
-   * be created programmatically.
-   *
    * @var boolean
    */
   public $no_ui = FALSE;
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
index 46037f8..95d1526 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
@@ -108,8 +108,9 @@ function testValidation() {
 
     $mail = $this->randomName(EMAIL_MAX_LENGTH - 11) . '@example.com';
     $user->set('mail', $mail);
-    // @todo: There are two separate violations in case of an invalid e-mail.
-    //   Unifiy field item and field property constraints.
+    // @todo: There are two separate violations in case of a too long e-mail.
+    //   Unify field item and field property constraints in
+    //   https://drupal.org/node/2012690.
     $violations = $user->validate();
     $this->assertEqual(count($violations), 2, 'Violations found when email is too long');
     $this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');