more updates to trademark list
git-svn-id: https://svn.apache.org/repos/asf/flex/site/branches/flexdoc@1676421 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/content/doc/flex/using/flx_about_dataproviders_ab.html b/content/doc/flex/using/flx_about_dataproviders_ab.html
index b5d30f5..6868d7d 100644
--- a/content/doc/flex/using/flx_about_dataproviders_ab.html
+++ b/content/doc/flex/using/flx_about_dataproviders_ab.html
@@ -3955,7 +3955,7 @@
IUID store their UIDs in a uid property, so that is the property that
must be changed after cloning.</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_accessible_ac.html b/content/doc/flex/using/flx_accessible_ac.html
index d95ac16..f8d7b11 100644
--- a/content/doc/flex/using/flx_accessible_ac.html
+++ b/content/doc/flex/using/flx_accessible_ac.html
@@ -3641,7 +3641,7 @@
</div>
- <p>Adobe, Adobe Flash and Adobe Flash Builder are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash, Adobe Flash Builder, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_advdatagrid_ad.html b/content/doc/flex/using/flx_advdatagrid_ad.html
index c4cb05d..729b475 100644
--- a/content/doc/flex/using/flx_advdatagrid_ad.html
+++ b/content/doc/flex/using/flx_advdatagrid_ad.html
@@ -4354,7 +4354,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_anttasks_an.html b/content/doc/flex/using/flx_anttasks_an.html
index 2def95c..9ba112d 100644
--- a/content/doc/flex/using/flx_anttasks_an.html
+++ b/content/doc/flex/using/flx_anttasks_an.html
@@ -1390,7 +1390,7 @@
</div>
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_apollo_components_ap.html b/content/doc/flex/using/flx_apollo_components_ap.html
index 5f7dc8d..d9c0ac9 100644
--- a/content/doc/flex/using/flx_apollo_components_ap.html
+++ b/content/doc/flex/using/flx_apollo_components_ap.html
@@ -3288,7 +3288,7 @@
</div>
- <p>Adobe and Adobe AIR are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_app_container_apc.html b/content/doc/flex/using/flx_app_container_apc.html
index d7cddcd..7c5b068 100644
--- a/content/doc/flex/using/flx_app_container_apc.html
+++ b/content/doc/flex/using/flx_app_container_apc.html
@@ -2448,7 +2448,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_ascomponents_advanced_asa.html b/content/doc/flex/using/flx_ascomponents_advanced_asa.html
index 2e6a4b3..4d6e59d 100644
--- a/content/doc/flex/using/flx_ascomponents_advanced_asa.html
+++ b/content/doc/flex/using/flx_ascomponents_advanced_asa.html
@@ -2711,7 +2711,7 @@
</div>
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_ascomponents_as.html b/content/doc/flex/using/flx_ascomponents_as.html
index 6e5dc7e..924a1f4 100644
--- a/content/doc/flex/using/flx_ascomponents_as.html
+++ b/content/doc/flex/using/flx_ascomponents_as.html
@@ -1407,7 +1407,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html b/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html
index 47bcd3b..8fe68df 100644
--- a/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html
+++ b/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html
@@ -2694,7 +2694,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_asdoc_asd.html b/content/doc/flex/using/flx_asdoc_asd.html
index 62d6f8c..81d652e 100644
--- a/content/doc/flex/using/flx_asdoc_asd.html
+++ b/content/doc/flex/using/flx_asdoc_asd.html
@@ -3692,7 +3692,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_behaviors_be.html b/content/doc/flex/using/flx_behaviors_be.html
index 8af816b..01f9590 100644
--- a/content/doc/flex/using/flx_behaviors_be.html
+++ b/content/doc/flex/using/flx_behaviors_be.html
@@ -2095,7 +2095,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_building_overview_bu.html b/content/doc/flex/using/flx_building_overview_bu.html
index 3b98bfd..4c33365 100644
--- a/content/doc/flex/using/flx_building_overview_bu.html
+++ b/content/doc/flex/using/flx_building_overview_bu.html
@@ -430,7 +430,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_charts_displayingdata_chd.html b/content/doc/flex/using/flx_charts_displayingdata_chd.html
index a3051c0..18604eb 100644
--- a/content/doc/flex/using/flx_charts_displayingdata_chd.html
+++ b/content/doc/flex/using/flx_charts_displayingdata_chd.html
@@ -5570,7 +5570,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_charts_eventsandeffects_che.html b/content/doc/flex/using/flx_charts_eventsandeffects_che.html
index ad92372..1e97618 100644
--- a/content/doc/flex/using/flx_charts_eventsandeffects_che.html
+++ b/content/doc/flex/using/flx_charts_eventsandeffects_che.html
@@ -5424,6 +5424,7 @@
</div>
</div>
+ <p>Adobe, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_charts_intro_chi.html b/content/doc/flex/using/flx_charts_intro_chi.html
index c4b4764..f4d936c 100644
--- a/content/doc/flex/using/flx_charts_intro_chi.html
+++ b/content/doc/flex/using/flx_charts_intro_chi.html
@@ -3414,7 +3414,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_compilers_cpl.html b/content/doc/flex/using/flx_compilers_cpl.html
index 7d7d3d1..4513e2f 100644
--- a/content/doc/flex/using/flx_compilers_cpl.html
+++ b/content/doc/flex/using/flx_compilers_cpl.html
@@ -5703,7 +5703,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash, Adobe Flash Player, and Adobe LiveCycle Data Services ES are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_components_cmp.html b/content/doc/flex/using/flx_components_cmp.html
index 3d2f52d..9a84939 100644
--- a/content/doc/flex/using/flx_components_cmp.html
+++ b/content/doc/flex/using/flx_components_cmp.html
@@ -2096,7 +2096,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_configuring_environment_co.html b/content/doc/flex/using/flx_configuring_environment_co.html
index 1fcfeaf..1b0cd28 100644
--- a/content/doc/flex/using/flx_configuring_environment_co.html
+++ b/content/doc/flex/using/flx_configuring_environment_co.html
@@ -303,7 +303,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_containers_intro_cn.html b/content/doc/flex/using/flx_containers_intro_cn.html
index b162505..c6603f4 100644
--- a/content/doc/flex/using/flx_containers_intro_cn.html
+++ b/content/doc/flex/using/flx_containers_intro_cn.html
@@ -4130,7 +4130,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_controls_ctr.html b/content/doc/flex/using/flx_controls_ctr.html
index 250ef68..c928100 100644
--- a/content/doc/flex/using/flx_controls_ctr.html
+++ b/content/doc/flex/using/flx_controls_ctr.html
@@ -1587,7 +1587,7 @@
<mx:ButtonBar horizontalGap="5">
<mx:dataProvider>
- <fx:String>Flash</fx:String>
+ <fx:String>Flex</fx:String>
<fx:String>Installer</fx:String>
<fx:String>FlexJS</fx:String>
<fx:String>TourDeFlex</fx:String>
@@ -1622,8 +1622,8 @@
<mx:ButtonBar horizontalGap="5">
<mx:dataProvider>
- <fx:Object label="Flash"
- icon="@Embed(source='assets/Flashlogo.gif')"/>
+ <fx:Object label="Flex"
+ icon="@Embed(source='assets/Flexlogo.gif')"/>
<fx:Object label="Installer"
icon="@Embed(source='assets/Dirlogo.gif')"/>
<fx:Object label="FlexJS"
@@ -1702,7 +1702,7 @@
selectedIndex="-1">
<mx:dataProvider>
- <fx:String>Flash</fx:String>
+ <fx:String>Flex</fx:String>
<fx:String>Installer</fx:String>
<fx:String>FlexJS</fx:String>
<fx:String>TourDeFlex</fx:String>
@@ -9114,7 +9114,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Media Live Encoder, Adobe Flash Media Server, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_createcomps_basicas_cca.html b/content/doc/flex/using/flx_createcomps_basicas_cca.html
index df45133..efbbd1a 100644
--- a/content/doc/flex/using/flx_createcomps_basicas_cca.html
+++ b/content/doc/flex/using/flx_createcomps_basicas_cca.html
@@ -665,7 +665,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_createcomps_intro_cci.html b/content/doc/flex/using/flx_createcomps_intro_cci.html
index e5eda4b..752f6f1 100644
--- a/content/doc/flex/using/flx_createcomps_intro_cci.html
+++ b/content/doc/flex/using/flx_createcomps_intro_cci.html
@@ -719,7 +719,7 @@
</div>
- <p>Adobe, Adobe LIveCycle and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe LiveCycle Data Services ES and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_databinding_db.html b/content/doc/flex/using/flx_databinding_db.html
index 1875e07..3ce6eba 100644
--- a/content/doc/flex/using/flx_databinding_db.html
+++ b/content/doc/flex/using/flx_databinding_db.html
@@ -2302,7 +2302,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_datamodels_dm.html b/content/doc/flex/using/flx_datamodels_dm.html
index c56f376..bf55ca9 100644
--- a/content/doc/flex/using/flx_datamodels_dm.html
+++ b/content/doc/flex/using/flx_datamodels_dm.html
@@ -631,7 +631,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_debugging_de.html b/content/doc/flex/using/flx_debugging_de.html
index fed8f71..0ab8b92 100644
--- a/content/doc/flex/using/flx_debugging_de.html
+++ b/content/doc/flex/using/flx_debugging_de.html
@@ -1984,7 +1984,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_deep_linking_dl.html b/content/doc/flex/using/flx_deep_linking_dl.html
index 687d357..bcc04b7 100644
--- a/content/doc/flex/using/flx_deep_linking_dl.html
+++ b/content/doc/flex/using/flx_deep_linking_dl.html
@@ -1214,7 +1214,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_deployingoverview_dp.html b/content/doc/flex/using/flx_deployingoverview_dp.html
index 3a950e3..15a9dcc 100644
--- a/content/doc/flex/using/flx_deployingoverview_dp.html
+++ b/content/doc/flex/using/flx_deployingoverview_dp.html
@@ -1234,7 +1234,7 @@
</div>
- <p>Adobe, Adobe ColdFusion, and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe ColdFusion, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_dpcontrols_dpc.html b/content/doc/flex/using/flx_dpcontrols_dpc.html
index 8aa02ee..729113e 100644
--- a/content/doc/flex/using/flx_dpcontrols_dpc.html
+++ b/content/doc/flex/using/flx_dpcontrols_dpc.html
@@ -955,8 +955,8 @@
private var catalog:ArrayList;
private static var cat:Array = [
- "../assets/Nokia_6820.gif", "../assets/Nokia_3595.gif",
- "../assets/Nokia_3650.gif", "../assets/Nokia_6010.gif"
+ "../assets/Flex_6820.gif", "../assets/Flex_3595.gif",
+ "../assets/Flex_3650.gif", "../assets/Flex_6010.gif"
];
/* Initialize the HorizontalList control by setting its dataProvider
@@ -4541,7 +4541,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_dragdrop_dd.html b/content/doc/flex/using/flx_dragdrop_dd.html
index fd8dbef..ce2f9ad 100644
--- a/content/doc/flex/using/flx_dragdrop_dd.html
+++ b/content/doc/flex/using/flx_dragdrop_dd.html
@@ -3781,7 +3781,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_embed_em.html b/content/doc/flex/using/flx_embed_em.html
index 4b9d3ee..719a032 100644
--- a/content/doc/flex/using/flx_embed_em.html
+++ b/content/doc/flex/using/flx_embed_em.html
@@ -1679,7 +1679,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_events_ev.html b/content/doc/flex/using/flx_events_ev.html
index dff6f6f..91ab953 100644
--- a/content/doc/flex/using/flx_events_ev.html
+++ b/content/doc/flex/using/flx_events_ev.html
@@ -3278,7 +3278,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_fonts_ft.html b/content/doc/flex/using/flx_fonts_ft.html
index ba0f909..d2746aa 100644
--- a/content/doc/flex/using/flx_fonts_ft.html
+++ b/content/doc/flex/using/flx_fonts_ft.html
@@ -3239,7 +3239,7 @@
</div>
- <p>Adobe, Adobe AIR, Adobe Font Engine and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_functest_components2_fc.html b/content/doc/flex/using/flx_functest_components2_fc.html
index 3fc28cf..c783c82 100644
--- a/content/doc/flex/using/flx_functest_components2_fc.html
+++ b/content/doc/flex/using/flx_functest_components2_fc.html
@@ -3167,7 +3167,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_fxg_fx.html b/content/doc/flex/using/flx_fxg_fx.html
index 56f5628..347f4a0 100644
--- a/content/doc/flex/using/flx_fxg_fx.html
+++ b/content/doc/flex/using/flx_fxg_fx.html
@@ -8168,7 +8168,7 @@
</div>
- <p>Adobe, Adobe Photoshop, Adobe Illustrator, Adobe Fireworks and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Photoshop, Adobe Illustrator, Adobe Fireworks, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_groups_containers_gc.html b/content/doc/flex/using/flx_groups_containers_gc.html
index fefa436..4d0d3a7 100644
--- a/content/doc/flex/using/flx_groups_containers_gc.html
+++ b/content/doc/flex/using/flx_groups_containers_gc.html
@@ -4657,7 +4657,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_gumboskinning_gs.html b/content/doc/flex/using/flx_gumboskinning_gs.html
index 58c4c44..281db84 100644
--- a/content/doc/flex/using/flx_gumboskinning_gs.html
+++ b/content/doc/flex/using/flx_gumboskinning_gs.html
@@ -3822,7 +3822,7 @@
<div><a href="flx_compilers_cpl.html#WS2db454920e96a9e51e63e3d11c0bf69084-7fd2_verapache">Using compc, the component compiler</a></div>
</div>
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_halo_effects_hf.html b/content/doc/flex/using/flx_halo_effects_hf.html
index 4ffc406..a5e30db 100644
--- a/content/doc/flex/using/flx_halo_effects_hf.html
+++ b/content/doc/flex/using/flx_halo_effects_hf.html
@@ -1743,7 +1743,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_intro_int.html b/content/doc/flex/using/flx_intro_int.html
index 6354d3a..27622e8 100644
--- a/content/doc/flex/using/flx_intro_int.html
+++ b/content/doc/flex/using/flx_intro_int.html
@@ -182,6 +182,7 @@
</div>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_l10n_ln.html b/content/doc/flex/using/flx_l10n_ln.html
index 63e0e72..cd04a6a 100644
--- a/content/doc/flex/using/flx_l10n_ln.html
+++ b/content/doc/flex/using/flx_l10n_ln.html
@@ -897,7 +897,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_layouts_lo.html b/content/doc/flex/using/flx_layouts_lo.html
index 73eaa13..6e710e8 100644
--- a/content/doc/flex/using/flx_layouts_lo.html
+++ b/content/doc/flex/using/flx_layouts_lo.html
@@ -4510,7 +4510,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash Platform, and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_loading_applications_la.html b/content/doc/flex/using/flx_loading_applications_la.html
index ca1e7e9..c900f80 100644
--- a/content/doc/flex/using/flx_loading_applications_la.html
+++ b/content/doc/flex/using/flx_loading_applications_la.html
@@ -3809,8 +3809,8 @@
As a result, ensure that the classes you add to a bootstrap loader
are not likely to change.</p>
- <p>When you use RPC classes with a proxy server (such as Blaze DS
-or LCDS), you must externalize the RPC classes in a bootstrap loader
+ <p>When you use RPC classes with a proxy server (such as BlazeDS
+or LiveCycle Data Services ES), you must externalize the RPC classes in a bootstrap loader
for multi-versioned applications. The bootstrap loader should contain
only the RPC classes. You typically do not add your custom value
object classes to the bootstrap loader to get or put data on the
@@ -3956,6 +3956,7 @@
</div>
</div>
+ <p>Adobe, Adobe BlazeDS, Adobe Flash Player, and Adobe LiveCycle Data Services ES are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_logging_lg.html b/content/doc/flex/using/flx_logging_lg.html
index c7f0920..e1d7ea4 100644
--- a/content/doc/flex/using/flx_logging_lg.html
+++ b/content/doc/flex/using/flx_logging_lg.html
@@ -1679,7 +1679,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_menucontrols_mc.html b/content/doc/flex/using/flx_menucontrols_mc.html
index 84ae4ee..50a50b9 100644
--- a/content/doc/flex/using/flx_menucontrols_mc.html
+++ b/content/doc/flex/using/flx_menucontrols_mc.html
@@ -2202,7 +2202,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_metadata_me.html b/content/doc/flex/using/flx_metadata_me.html
index 591c2ef..e5a2c06 100644
--- a/content/doc/flex/using/flx_metadata_me.html
+++ b/content/doc/flex/using/flx_metadata_me.html
@@ -2619,7 +2619,7 @@
</div>
- <p>Adobe, Adobe Flash and Adobe Flash Builder are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash, Adobe Flash Builder and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_mirroring_mr.html b/content/doc/flex/using/flx_mirroring_mr.html
index cf2114b..084be58 100644
--- a/content/doc/flex/using/flx_mirroring_mr.html
+++ b/content/doc/flex/using/flx_mirroring_mr.html
@@ -2624,6 +2624,7 @@
</div>
+ <p>Adobe, Adobe Flash, and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_modular_md.html b/content/doc/flex/using/flx_modular_md.html
index 23d3435..1eec2b7 100644
--- a/content/doc/flex/using/flx_modular_md.html
+++ b/content/doc/flex/using/flx_modular_md.html
@@ -2744,7 +2744,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_mxmlSyntax_sy.html b/content/doc/flex/using/flx_mxmlSyntax_sy.html
index a12ece2..1bfcc1e 100644
--- a/content/doc/flex/using/flx_mxmlSyntax_sy.html
+++ b/content/doc/flex/using/flx_mxmlSyntax_sy.html
@@ -1231,7 +1231,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_mxml_mx.html b/content/doc/flex/using/flx_mxml_mx.html
index 55825dd..f90d5e1 100644
--- a/content/doc/flex/using/flx_mxml_mx.html
+++ b/content/doc/flex/using/flx_mxml_mx.html
@@ -1569,7 +1569,7 @@
</div>
- <p>Adobe, Adobe AIR, Adobe ColdFusion, and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe ColdFusion, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_navigators_na.html b/content/doc/flex/using/flx_navigators_na.html
index b7e3b98..ab5cdb5 100644
--- a/content/doc/flex/using/flx_navigators_na.html
+++ b/content/doc/flex/using/flx_navigators_na.html
@@ -1486,7 +1486,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_passingarguments_pa.html b/content/doc/flex/using/flx_passingarguments_pa.html
index bbca05f..2c28afa 100644
--- a/content/doc/flex/using/flx_passingarguments_pa.html
+++ b/content/doc/flex/using/flx_passingarguments_pa.html
@@ -2034,7 +2034,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash, Adobe Flash Platform, and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_performance_pe.html b/content/doc/flex/using/flx_performance_pe.html
index a8fe4f5..8293528 100644
--- a/content/doc/flex/using/flx_performance_pe.html
+++ b/content/doc/flex/using/flx_performance_pe.html
@@ -3525,7 +3525,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_printing_pr.html b/content/doc/flex/using/flx_printing_pr.html
index 920afd5..16a75bb 100644
--- a/content/doc/flex/using/flx_printing_pr.html
+++ b/content/doc/flex/using/flx_printing_pr.html
@@ -1702,7 +1702,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_resourcebundles_rb.html b/content/doc/flex/using/flx_resourcebundles_rb.html
index b335a38..0019e82 100644
--- a/content/doc/flex/using/flx_resourcebundles_rb.html
+++ b/content/doc/flex/using/flx_resourcebundles_rb.html
@@ -2407,7 +2407,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_rsl_rsl.html b/content/doc/flex/using/flx_rsl_rsl.html
index df21375..a29e01e 100644
--- a/content/doc/flex/using/flx_rsl_rsl.html
+++ b/content/doc/flex/using/flx_rsl_rsl.html
@@ -2580,7 +2580,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_security2_se.html b/content/doc/flex/using/flx_security2_se.html
index a8a6404..59b8f37 100644
--- a/content/doc/flex/using/flx_security2_se.html
+++ b/content/doc/flex/using/flx_security2_se.html
@@ -2923,7 +2923,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_size_position_sp.html b/content/doc/flex/using/flx_size_position_sp.html
index d5fdfbd..665add2 100644
--- a/content/doc/flex/using/flx_size_position_sp.html
+++ b/content/doc/flex/using/flx_size_position_sp.html
@@ -3668,7 +3668,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_skinning_sk.html b/content/doc/flex/using/flx_skinning_sk.html
index 9e2f92c..6924541 100644
--- a/content/doc/flex/using/flx_skinning_sk.html
+++ b/content/doc/flex/using/flx_skinning_sk.html
@@ -3723,7 +3723,7 @@
</div>
- <p>Adobe, Adobe Illustrator, Adobe Photoshop, and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Illustrator, Adobe Photoshop, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_spark_dpcontrols_sdp.html b/content/doc/flex/using/flx_spark_dpcontrols_sdp.html
index b956d30..9aa575c 100644
--- a/content/doc/flex/using/flx_spark_dpcontrols_sdp.html
+++ b/content/doc/flex/using/flx_spark_dpcontrols_sdp.html
@@ -3362,7 +3362,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_spark_effects_sf.html b/content/doc/flex/using/flx_spark_effects_sf.html
index a11a43b..830a6f0 100644
--- a/content/doc/flex/using/flx_spark_effects_sf.html
+++ b/content/doc/flex/using/flx_spark_effects_sf.html
@@ -1958,7 +1958,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_sparktextcontrols_stc.html b/content/doc/flex/using/flx_sparktextcontrols_stc.html
index e6eac39..56dcdab 100644
--- a/content/doc/flex/using/flx_sparktextcontrols_stc.html
+++ b/content/doc/flex/using/flx_sparktextcontrols_stc.html
@@ -5925,7 +5925,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_styles_st.html b/content/doc/flex/using/flx_styles_st.html
index da00b6a..a2c13f9 100644
--- a/content/doc/flex/using/flx_styles_st.html
+++ b/content/doc/flex/using/flx_styles_st.html
@@ -6300,7 +6300,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash, Adobe Flash Platform and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_textcontrols_tc.html b/content/doc/flex/using/flx_textcontrols_tc.html
index 109cb62..50db266 100644
--- a/content/doc/flex/using/flx_textcontrols_tc.html
+++ b/content/doc/flex/using/flx_textcontrols_tc.html
@@ -2953,7 +2953,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_tooltips_tt.html b/content/doc/flex/using/flx_tooltips_tt.html
index 3c11551..f44e575 100644
--- a/content/doc/flex/using/flx_tooltips_tt.html
+++ b/content/doc/flex/using/flx_tooltips_tt.html
@@ -1973,7 +1973,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Platform are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_using_states_us.html b/content/doc/flex/using/flx_using_states_us.html
index b9daf95..eda7f75 100644
--- a/content/doc/flex/using/flx_using_states_us.html
+++ b/content/doc/flex/using/flx_using_states_us.html
@@ -1516,28 +1516,28 @@
</s:layout>
<mx:ArrayCollection>
<fx:Object
- name="Nokia 3595"
+ name="Flex 3595"
data="1"
price="129.99"
- image="assets/Nokia_3595.gif"
+ image="assets/Flex_3595.gif"
description="Kids love it."/>
<fx:Object
- name= "Nokia 3650"
+ name= "Flex 3650"
data="1"
price="99.99"
- image="assets/Nokia_3650.gif"
+ image="assets/Flex_3650.gif"
description="Impress your friends."/>
<fx:Object
- name="Nokia 6010"
+ name="Flex 6010"
data="1"
price="49.99"
- image="assets/Nokia_6010.gif"
+ image="assets/Flex_6010.gif"
description="Good for everyone."/>
<fx:Object
- name="Nokia 6360"
+ name="Flex 6360"
data="1"
price="19.99"
- image="assets/Nokia_6360.gif"
+ image="assets/Flex_6360.gif"
description="Great deal!"/>
</mx:ArrayCollection>
</s:DataGroup>
diff --git a/content/doc/flex/using/flx_usingas_ua.html b/content/doc/flex/using/flx_usingas_ua.html
index a42f77a..3f62680 100644
--- a/content/doc/flex/using/flx_usingas_ua.html
+++ b/content/doc/flex/using/flx_usingas_ua.html
@@ -1892,7 +1892,7 @@
</div>
- <p>Adobe, Adobe AIR and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe AIR, Adobe Flash Platform, Adobe Flash Player and Adobe Flash Professional are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_versioning_ve.html b/content/doc/flex/using/flx_versioning_ve.html
index 6c77b35..f3b8a56 100644
--- a/content/doc/flex/using/flx_versioning_ve.html
+++ b/content/doc/flex/using/flx_versioning_ve.html
@@ -278,7 +278,7 @@
</div>
- <p>Adobe and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
diff --git a/content/doc/flex/using/flx_wrapper_wr.html b/content/doc/flex/using/flx_wrapper_wr.html
index 8319eeb..2e2b51a 100644
--- a/content/doc/flex/using/flx_wrapper_wr.html
+++ b/content/doc/flex/using/flx_wrapper_wr.html
@@ -2642,7 +2642,7 @@
</div>
- <p>Adobe, Adobe ColdFusion, and Adobe Flash are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
+ <p>Adobe, Adobe ColdFusion, Adobe Flash and Adobe Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries and are used by permission from Adobe. No other license to the Adobe trademarks are granted.</p>
</div>
