#679894 by Bojhan: Fix remaining instances of Input format => Text format.

3 files changed, 5 insertions, 5 deletions

diff --git a/modules/field_ui/field_ui.api.php b/modules/field_ui/field_ui.api.php
index 9442d94eb..1582da43a 100644
--- a/modules/field_ui/field_ui.api.php
+++ b/modules/field_ui/field_ui.api.php
@@ -66,7 +66,7 @@ function hook_field_instance_settings_form($field, $instance) {
     '#default_value' => $settings['text_processing'],
     '#options' => array(
       t('Plain text'),
-      t('Filtered text (user selects input format)'),
+      t('Filtered text (user selects text format)'),
     ),
   );
   if ($field['type'] == 'text_with_summary') {
diff --git a/modules/php/php.module b/modules/php/php.module
index 05a828a3c..d5a082f42 100644
--- a/modules/php/php.module
+++ b/modules/php/php.module
@@ -14,7 +14,7 @@ function php_help($path, $arg) {
     case 'admin/help#php':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The PHP filter module adds a PHP filter to your site, for use with <a href="@filter">text input formats</a>. This filter adds the ability to execute PHP code in any text field that uses a text format (such as the body of a node or the text of a comment). <a href="@php-net">PHP</a> is a general-purpose scripting language widely-used for web development, and is the language with which Drupal has been developed. For more information, see the online handbook entry for the <a href="@php">PHP filter module</a>.', array('@filter' => url('admin/help/filter'), '@php-net' => 'http://www.php.net', '@php' => 'http://drupal.org/handbook/modules/php/')) . '</p>';
+      $output .= '<p>' . t('The PHP filter module adds a PHP filter to your site, for use with <a href="@filter">text formats</a>. This filter adds the ability to execute PHP code in any text field that uses a text format (such as the body of a node or the text of a comment). <a href="@php-net">PHP</a> is a general-purpose scripting language widely-used for web development, and is the language with which Drupal has been developed. For more information, see the online handbook entry for the <a href="@php">PHP filter module</a>.', array('@filter' => url('admin/help/filter'), '@php-net' => 'http://www.php.net', '@php' => 'http://drupal.org/handbook/modules/php/')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling execution of PHP in text fields') . '</dt>';
diff --git a/modules/system/system.install b/modules/system/system.install
index b9a3ae2ef..c7ef22fd3 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1568,7 +1568,7 @@ function system_update_6051() {
 
   if (!db_column_exists('users', 'signature_format')) {
 
-    // Set future input formats to FILTER_FORMAT_DEFAULT to ensure a safe default
+    // Set future text formats to FILTER_FORMAT_DEFAULT to ensure a safe default
     // when incompatible modules insert into the users table. An actual format
     // will be assigned when users save their signature.
 
@@ -1582,7 +1582,7 @@ function system_update_6051() {
 
     db_add_field($ret, 'users', 'signature_format', $schema);
 
-    // Set the format of existing signatures to the current default input format.
+    // Set the format of existing signatures to the current default text format.
     if ($current_default_filter = variable_get('filter_default_format', 0)) {
       db_update('users')
         ->fields(array(
@@ -1591,7 +1591,7 @@ function system_update_6051() {
         ->execute();
     }
 
-    drupal_set_message("User signatures no longer inherit comment input formats. Each user's signature now has its own associated format that can be selected on the user's account page. Existing signatures have been set to your site's default input format.");
+    drupal_set_message("User signatures no longer inherit comment text formats. Each user's signature now has its own associated format that can be selected on the user's account page. Existing signatures have been set to your site's default text format.");
   }
 
   return $ret;