flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1676421 - /flex/site/branches/flexdoc/content/doc/flex/using/
Date Tue, 28 Apr 2015 07:18:55 GMT
Author: aharui
Date: Tue Apr 28 07:18:53 2015
New Revision: 1676421

URL: http://svn.apache.org/r1676421
Log:
more updates to trademark list

Modified:
    flex/site/branches/flexdoc/content/doc/flex/using/flx_about_dataproviders_ab.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_accessible_ac.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_advdatagrid_ad.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_anttasks_an.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_apollo_components_ap.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_app_container_apc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_advanced_asa.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_as.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_asdoc_asd.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_behaviors_be.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_building_overview_bu.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_displayingdata_chd.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_eventsandeffects_che.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_intro_chi.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_compilers_cpl.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_components_cmp.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_configuring_environment_co.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_containers_intro_cn.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_controls_ctr.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_basicas_cca.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_intro_cci.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_databinding_db.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_datamodels_dm.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_debugging_de.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_deep_linking_dl.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_deployingoverview_dp.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_dpcontrols_dpc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_dragdrop_dd.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_embed_em.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_events_ev.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_fonts_ft.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_functest_components2_fc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_fxg_fx.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_groups_containers_gc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_gumboskinning_gs.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_halo_effects_hf.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_intro_int.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_l10n_ln.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_layouts_lo.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_loading_applications_la.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_logging_lg.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_menucontrols_mc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_metadata_me.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_mirroring_mr.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_modular_md.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_mxmlSyntax_sy.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_mxml_mx.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_navigators_na.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_passingarguments_pa.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_performance_pe.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_printing_pr.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_resourcebundles_rb.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_rsl_rsl.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_security2_se.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_size_position_sp.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_skinning_sk.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_dpcontrols_sdp.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_effects_sf.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_sparktextcontrols_stc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_styles_st.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_textcontrols_tc.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_tooltips_tt.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_using_states_us.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_usingas_ua.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_versioning_ve.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_wrapper_wr.html

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_about_dataproviders_ab.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_about_dataproviders_ab.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_about_dataproviders_ab.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_about_dataproviders_ab.html Tue Apr 28 07:18:53 2015
@@ -3955,7 +3955,7 @@ only for dynamic Objects. Instances of d
 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>
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_accessible_ac.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_accessible_ac.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_accessible_ac.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_accessible_ac.html Tue Apr 28 07:18:53 2015
@@ -3641,7 +3641,7 @@ by users of screen readers.</p>
 
       </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>
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_advdatagrid_ad.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_advdatagrid_ad.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_advdatagrid_ad.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_advdatagrid_ad.html Tue Apr 28 07:18:53 2015
@@ -4354,7 +4354,7 @@ and next pages.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_anttasks_an.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_anttasks_an.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_anttasks_an.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_anttasks_an.html Tue Apr 28 07:18:53 2015
@@ -1390,7 +1390,7 @@ the manifest file location for all names
          </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>
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_apollo_components_ap.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_apollo_components_ap.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_apollo_components_ap.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_apollo_components_ap.html Tue Apr 28 07:18:53 2015
@@ -3288,7 +3288,7 @@ your custom skin classes from it. </p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_app_container_apc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_app_container_apc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_app_container_apc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_app_container_apc.html Tue Apr 28 07:18:53 2015
@@ -2448,7 +2448,7 @@ bar. This class must implement the IPrel
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_advanced_asa.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_advanced_asa.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_advanced_asa.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_advanced_asa.html Tue Apr 28 07:18:53 2015
@@ -2711,7 +2711,7 @@ that there are no naming conflicts.</p>
          </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>
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_as.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_as.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_as.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_as.html Tue Apr 28 07:18:53 2015
@@ -1407,7 +1407,7 @@ styles from a defaults.css file</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_ascomponents_spark_advanced_sas.html Tue Apr 28 07:18:53 2015
@@ -2694,7 +2694,7 @@ to set the placement of the RichEditable
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_asdoc_asd.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_asdoc_asd.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_asdoc_asd.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_asdoc_asd.html Tue Apr 28 07:18:53 2015
@@ -3692,7 +3692,7 @@ mxmlc and compc.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_behaviors_be.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_behaviors_be.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_behaviors_be.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_behaviors_be.html Tue Apr 28 07:18:53 2015
@@ -2095,7 +2095,7 @@ bitmap caching will have a beneficial ef
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_building_overview_bu.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_building_overview_bu.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_building_overview_bu.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_building_overview_bu.html Tue Apr 28 07:18:53 2015
@@ -430,7 +430,7 @@ assets</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_displayingdata_chd.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_displayingdata_chd.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_displayingdata_chd.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_displayingdata_chd.html Tue Apr 28 07:18:53 2015
@@ -5570,7 +5570,7 @@ while Spark containers use the <samp cla
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_eventsandeffects_che.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_eventsandeffects_che.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_eventsandeffects_che.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_eventsandeffects_che.html Tue Apr 28 07:18:53 2015
@@ -5424,6 +5424,7 @@ as the following example illustrates:</p
          </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>
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_intro_chi.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_intro_chi.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_intro_chi.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_charts_intro_chi.html Tue Apr 28 07:18:53 2015
@@ -3414,7 +3414,7 @@ option to 4.0.0, Flex applies the MXChar
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_compilers_cpl.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_compilers_cpl.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_compilers_cpl.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_compilers_cpl.html Tue Apr 28 07:18:53 2015
@@ -5703,7 +5703,7 @@ targets that you created in a previous s
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_components_cmp.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_components_cmp.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_components_cmp.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_components_cmp.html Tue Apr 28 07:18:53 2015
@@ -2096,7 +2096,7 @@ Flex components</a>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_configuring_environment_co.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_configuring_environment_co.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_configuring_environment_co.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_configuring_environment_co.html Tue Apr 28 07:18:53 2015
@@ -303,7 +303,7 @@ For more information on auto-update, see
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_containers_intro_cn.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_containers_intro_cn.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_containers_intro_cn.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_containers_intro_cn.html Tue Apr 28 07:18:53 2015
@@ -4130,7 +4130,7 @@ the correct coordinate frame of referenc
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_controls_ctr.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_controls_ctr.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_controls_ctr.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_controls_ctr.html Tue Apr 28 07:18:53 2015
@@ -1587,7 +1587,7 @@ as the following example shows:</p>
  
     &lt;mx:ButtonBar horizontalGap="5"&gt; 
         &lt;mx:dataProvider&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
             &lt;fx:String&gt;Installer&lt;/fx:String&gt; 
             &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
             &lt;fx:String&gt;TourDeFlex&lt;/fx:String&gt; 
@@ -1622,8 +1622,8 @@ and icon for each button:</p>
  
     &lt;mx:ButtonBar horizontalGap="5"&gt; 
         &lt;mx:dataProvider&gt; 
-            &lt;fx:Object label="Flash" 
-                icon="@Embed(source='assets/Flashlogo.gif')"/&gt; 
+            &lt;fx:Object label="Flex" 
+                icon="@Embed(source='assets/Flexlogo.gif')"/&gt; 
             &lt;fx:Object label="Installer" 
                 icon="@Embed(source='assets/Dirlogo.gif')"/&gt; 
             &lt;fx:Object label="FlexJS" 
@@ -1702,7 +1702,7 @@ an event listener, named <samp class="co
             selectedIndex="-1"&gt; 
             
         &lt;mx:dataProvider&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
             &lt;fx:String&gt;Installer&lt;/fx:String&gt; 
             &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
             &lt;fx:String&gt;TourDeFlex&lt;/fx:String&gt; 
@@ -9114,7 +9114,7 @@ with Button controls:<pre class="codeblo
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_basicas_cca.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_basicas_cca.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_basicas_cca.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_basicas_cca.html Tue Apr 28 07:18:53 2015
@@ -665,7 +665,7 @@ ActionScript</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_intro_cci.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_intro_cci.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_intro_cci.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_createcomps_intro_cci.html Tue Apr 28 07:18:53 2015
@@ -719,7 +719,7 @@ Shared Libraries</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_databinding_db.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_databinding_db.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_databinding_db.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_databinding_db.html Tue Apr 28 07:18:53 2015
@@ -2302,7 +2302,7 @@ there. </p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_datamodels_dm.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_datamodels_dm.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_datamodels_dm.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_datamodels_dm.html Tue Apr 28 07:18:53 2015
@@ -631,7 +631,7 @@ model with binding destinations in curly
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_debugging_de.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_debugging_de.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_debugging_de.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_debugging_de.html Tue Apr 28 07:18:53 2015
@@ -1984,7 +1984,7 @@ from fdb, use the <samp class="codeph">e
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_deep_linking_dl.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_deep_linking_dl.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_deep_linking_dl.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_deep_linking_dl.html Tue Apr 28 07:18:53 2015
@@ -1214,7 +1214,7 @@ to get information about the URL that wa
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_deployingoverview_dp.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_deployingoverview_dp.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_deployingoverview_dp.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_deployingoverview_dp.html Tue Apr 28 07:18:53 2015
@@ -1234,7 +1234,7 @@ cross-domain policy files</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_dpcontrols_dpc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_dpcontrols_dpc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_dpcontrols_dpc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_dpcontrols_dpc.html Tue Apr 28 07:18:53 2015
@@ -955,8 +955,8 @@ example shows:</p>
  
             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 @@ is <samp class="codeph">true</samp>, all
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_dragdrop_dd.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_dragdrop_dd.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_dragdrop_dd.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_dragdrop_dd.html Tue Apr 28 07:18:53 2015
@@ -3781,7 +3781,7 @@ handler removes the Image control from i
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_embed_em.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_embed_em.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_embed_em.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_embed_em.html Tue Apr 28 07:18:53 2015
@@ -1679,7 +1679,7 @@ code to create a supported object type.<
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_events_ev.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_events_ev.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_events_ev.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_events_ev.html Tue Apr 28 07:18:53 2015
@@ -3278,7 +3278,7 @@ the user holds down the Shift key while
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_fonts_ft.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_fonts_ft.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_fonts_ft.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_fonts_ft.html Tue Apr 28 07:18:53 2015
@@ -3239,7 +3239,7 @@ transcode the font.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_functest_components2_fc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_functest_components2_fc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_functest_components2_fc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_functest_components2_fc.html Tue Apr 28 07:18:53 2015
@@ -3167,7 +3167,7 @@ of automation events.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_fxg_fx.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_fxg_fx.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_fxg_fx.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_fxg_fx.html Tue Apr 28 07:18:53 2015
@@ -8168,7 +8168,7 @@ see the <a href="http://opensource.adobe
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_groups_containers_gc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_groups_containers_gc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_groups_containers_gc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_groups_containers_gc.html Tue Apr 28 07:18:53 2015
@@ -4657,7 +4657,7 @@ a custom Spark item renderer</a>. </p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_gumboskinning_gs.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_gumboskinning_gs.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_gumboskinning_gs.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_gumboskinning_gs.html Tue Apr 28 07:18:53 2015
@@ -3822,7 +3822,7 @@ as the following example shows:<pre clas
 <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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_halo_effects_hf.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_halo_effects_hf.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_halo_effects_hf.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_halo_effects_hf.html Tue Apr 28 07:18:53 2015
@@ -1743,7 +1743,7 @@ starts.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_intro_int.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_intro_int.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_intro_int.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_intro_int.html Tue Apr 28 07:18:53 2015
@@ -182,6 +182,7 @@ from Flex 3 to Flex 4, see the <em>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_l10n_ln.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_l10n_ln.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_l10n_ln.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_l10n_ln.html Tue Apr 28 07:18:53 2015
@@ -897,7 +897,7 @@ Bundles</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_layouts_lo.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_layouts_lo.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_layouts_lo.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_layouts_lo.html Tue Apr 28 07:18:53 2015
@@ -4510,7 +4510,7 @@ application when the pop-up window is re
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_loading_applications_la.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_loading_applications_la.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_loading_applications_la.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_loading_applications_la.html Tue Apr 28 07:18:53 2015
@@ -3809,8 +3809,8 @@ of the compiler that the main applicatio
 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 @@ for a bootstrap loader that defines the
          </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>
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_logging_lg.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_logging_lg.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_logging_lg.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_logging_lg.html Tue Apr 28 07:18:53 2015
@@ -1679,7 +1679,7 @@ SWF was loaded.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_menucontrols_mc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_menucontrols_mc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_menucontrols_mc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_menucontrols_mc.html Tue Apr 28 07:18:53 2015
@@ -2202,7 +2202,7 @@ control user interaction</a>. </p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_metadata_me.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_metadata_me.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_metadata_me.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_metadata_me.html Tue Apr 28 07:18:53 2015
@@ -2619,7 +2619,7 @@ tag has the following syntax: </p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_mirroring_mr.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_mirroring_mr.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_mirroring_mr.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_mirroring_mr.html Tue Apr 28 07:18:53 2015
@@ -2624,6 +2624,7 @@ arrow key will navigate toward the end w
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_modular_md.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_modular_md.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_modular_md.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_modular_md.html Tue Apr 28 07:18:53 2015
@@ -2744,7 +2744,7 @@ ActionScript-based modules</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_mxmlSyntax_sy.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_mxmlSyntax_sy.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_mxmlSyntax_sy.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_mxmlSyntax_sy.html Tue Apr 28 07:18:53 2015
@@ -1231,7 +1231,7 @@ an <samp class="codeph">id</samp> proper
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_mxml_mx.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_mxml_mx.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_mxml_mx.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_mxml_mx.html Tue Apr 28 07:18:53 2015
@@ -1569,7 +1569,7 @@ simple visual components in ActionScript
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_navigators_na.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_navigators_na.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_navigators_na.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_navigators_na.html Tue Apr 28 07:18:53 2015
@@ -1486,7 +1486,7 @@ Flash Platform</a>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_passingarguments_pa.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_passingarguments_pa.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_passingarguments_pa.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_passingarguments_pa.html Tue Apr 28 07:18:53 2015
@@ -2034,7 +2034,7 @@ Flash Platform</a>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_performance_pe.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_performance_pe.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_performance_pe.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_performance_pe.html Tue Apr 28 07:18:53 2015
@@ -3525,7 +3525,7 @@ a shadow renderer:</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_printing_pr.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_printing_pr.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_printing_pr.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_printing_pr.html Tue Apr 28 07:18:53 2015
@@ -1702,7 +1702,7 @@ currently displays.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_resourcebundles_rb.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_resourcebundles_rb.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_resourcebundles_rb.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_resourcebundles_rb.html Tue Apr 28 07:18:53 2015
@@ -2407,7 +2407,7 @@ style sheets at run time</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_rsl_rsl.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_rsl_rsl.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_rsl_rsl.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_rsl_rsl.html Tue Apr 28 07:18:53 2015
@@ -2580,7 +2580,7 @@ location that the application expects.</
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_security2_se.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_security2_se.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_security2_se.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_security2_se.html Tue Apr 28 07:18:53 2015
@@ -2923,7 +2923,7 @@ Resource Center</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_size_position_sp.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_size_position_sp.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_size_position_sp.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_size_position_sp.html Tue Apr 28 07:18:53 2015
@@ -3668,7 +3668,7 @@ to row1 and maxAscent:5.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_skinning_sk.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_skinning_sk.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_skinning_sk.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_skinning_sk.html Tue Apr 28 07:18:53 2015
@@ -3723,7 +3723,7 @@ value of that property. </p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_dpcontrols_sdp.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_dpcontrols_sdp.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_dpcontrols_sdp.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_dpcontrols_sdp.html Tue Apr 28 07:18:53 2015
@@ -3362,7 +3362,7 @@ in your CSS, as the following example sh
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_effects_sf.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_effects_sf.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_effects_sf.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_spark_effects_sf.html Tue Apr 28 07:18:53 2015
@@ -1958,7 +1958,7 @@ specifies a rapid acceleration for the m
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_sparktextcontrols_stc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_sparktextcontrols_stc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_sparktextcontrols_stc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_sparktextcontrols_stc.html Tue Apr 28 07:18:53 2015
@@ -5925,7 +5925,7 @@ in.<pre class="codeblock">&lt;?xml versi
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_styles_st.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_styles_st.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_styles_st.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_styles_st.html Tue Apr 28 07:18:53 2015
@@ -6300,7 +6300,7 @@ as the following example shows:</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_textcontrols_tc.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_textcontrols_tc.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_textcontrols_tc.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_textcontrols_tc.html Tue Apr 28 07:18:53 2015
@@ -2953,7 +2953,7 @@ only generates a CloseEvent event, so it
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_tooltips_tt.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_tooltips_tt.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_tooltips_tt.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_tooltips_tt.html Tue Apr 28 07:18:53 2015
@@ -1973,7 +1973,7 @@ compilers</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_using_states_us.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_using_states_us.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_using_states_us.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_using_states_us.html Tue Apr 28 07:18:53 2015
@@ -1516,28 +1516,28 @@ in the parent application.</p>
         &lt;/s:layout&gt; 
         &lt;mx:ArrayCollection&gt; 
             &lt;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."/&gt; 
             &lt;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."/&gt; 
             &lt;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."/&gt; 
             &lt;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!"/&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:DataGroup&gt; 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_usingas_ua.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_usingas_ua.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_usingas_ua.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_usingas_ua.html Tue Apr 28 07:18:53 2015
@@ -1892,7 +1892,7 @@ to show the properties of the Button con
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_versioning_ve.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_versioning_ve.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_versioning_ve.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_versioning_ve.html Tue Apr 28 07:18:53 2015
@@ -278,7 +278,7 @@ Technology Center</a>.</p>
 
       </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>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_wrapper_wr.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_wrapper_wr.html?rev=1676421&r1=1676420&r2=1676421&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_wrapper_wr.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_wrapper_wr.html Tue Apr 28 07:18:53 2015
@@ -2642,7 +2642,7 @@ The following properties have no effect
 
       </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>
 
 



Mime
View raw message