flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1676360 - /flex/site/branches/flexdoc/content/doc/flex/using/
Date Mon, 27 Apr 2015 19:02:00 GMT
Author: aharui
Date: Mon Apr 27 19:01:59 2015
New Revision: 1676360

URL: http://svn.apache.org/r1676360
Log:
clean up trademark list.  remove some other trademarks when not needed

Modified:
    flex/site/branches/flexdoc/content/doc/flex/using/flx_cellrenderer_cr.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_controls_ctr.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_deployingoverview_dp.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_fonts_ft.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_fxg_fx.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_mxml_mx.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_olapdatagrid_ol.html
    flex/site/branches/flexdoc/content/doc/flex/using/flx_printing_pr.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_wrapper_wr.html

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_cellrenderer_cr.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_cellrenderer_cr.html?rev=1676360&r1=1676359&r2=1676360&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_cellrenderer_cr.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_cellrenderer_cr.html Mon Apr 27 19:01:59 2015
@@ -2904,40 +2904,40 @@ control:</p>
             <pre class="codeblock">&lt;?xml version="1.0"?&gt; 
 &lt;catalog&gt; 
     &lt;product id="1"&gt; 
-        &lt;name&gt;Nokia Model 3595&lt;/name&gt; 
+        &lt;name&gt;Flex Model 3595&lt;/name&gt; 
         &lt;price&gt;129.99&lt;/price&gt; 
-        &lt;image&gt;../assets/products/Nokia_3595.gif&lt;/image&gt; 
-        &lt;thumbnail&gt;../assets/products/Nokia_3595_sm.gif&lt;/thumbnail&gt; 
+        &lt;image&gt;../assets/products/Flex_3595.gif&lt;/image&gt; 
+        &lt;thumbnail&gt;../assets/products/Flex_3595_sm.gif&lt;/thumbnail&gt; 
     &lt;/product&gt; 
     &lt;product id="2"&gt; 
-        &lt;name&gt;Nokia Model 3650&lt;/name&gt; 
+        &lt;name&gt;Flex Model 3650&lt;/name&gt; 
         &lt;price&gt;99.99&lt;/price&gt; 
-        &lt;image&gt;../assets/products/Nokia_3650.gif&lt;/image&gt; 
-        &lt;thumbnail&gt;../assets/products/Nokia_3650_sm.gif&lt;/thumbnail&gt; 
+        &lt;image&gt;../assets/products/Flex_3650.gif&lt;/image&gt; 
+        &lt;thumbnail&gt;../assets/products/Flex_3650_sm.gif&lt;/thumbnail&gt; 
     &lt;/product&gt; 
     &lt;product id="3"&gt; 
-        &lt;name&gt;Nokia Model 6010&lt;/name&gt; 
+        &lt;name&gt;Flex Model 6010&lt;/name&gt; 
         &lt;price&gt;49.99&lt;/price&gt; 
-        &lt;image&gt;../assets/products/Nokia_6010.gif&lt;/image&gt; 
-        &lt;thumbnail&gt;../assets/products/Nokia_6010_sm.gif&lt;/thumbnail&gt; 
+        &lt;image&gt;../assets/products/Flex_6010.gif&lt;/image&gt; 
+        &lt;thumbnail&gt;../assets/products/Flex_6010_sm.gif&lt;/thumbnail&gt; 
     &lt;/product&gt; 
     &lt;product id="4"&gt; 
-        &lt;name&gt;Nokia Model 6360&lt;/name&gt; 
+        &lt;name&gt;Flex Model 6360&lt;/name&gt; 
         &lt;price&gt;19.99&lt;/price&gt; 
-        &lt;image&gt;../assets/products/Nokia_6360.gif&lt;/image&gt; 
-        &lt;thumbnail&gt;../assets/products/Nokia_6360_sm.gif&lt;/thumbnail&gt; 
+        &lt;image&gt;../assets/products/Flex_6360.gif&lt;/image&gt; 
+        &lt;thumbnail&gt;../assets/products/Flex_6360_sm.gif&lt;/thumbnail&gt; 
     &lt;/product&gt; 
     &lt;product id="5"&gt; 
-        &lt;name&gt;Nokia Model 6680&lt;/name&gt; 
+        &lt;name&gt;Flex Model 6680&lt;/name&gt; 
         &lt;price&gt;19.99&lt;/price&gt; 
-        &lt;image&gt;../assets/products/Nokia_6680.gif&lt;/image&gt; 
-        &lt;thumbnail&gt;../assets/products/Nokia_6680_sm.gif&lt;/thumbnail&gt; 
+        &lt;image&gt;../assets/products/Flex_6680.gif&lt;/image&gt; 
+        &lt;thumbnail&gt;../assets/products/Flex_6680_sm.gif&lt;/thumbnail&gt; 
     &lt;/product&gt; 
     &lt;product id="6"&gt; 
-        &lt;name&gt;Nokia Model 6820&lt;/name&gt; 
+        &lt;name&gt;Flex Model 6820&lt;/name&gt; 
         &lt;price&gt;49.99&lt;/price&gt; 
-        &lt;image&gt;../assets/products/Nokia_6820.gif&lt;/image&gt; 
-        &lt;thumbnail&gt;../assets/products/Nokia_6820_sm.gif&lt;/thumbnail&gt; 
+        &lt;image&gt;../assets/products/Flex_6820.gif&lt;/image&gt; 
+        &lt;thumbnail&gt;../assets/products/Flex_6820_sm.gif&lt;/thumbnail&gt; 
     &lt;/product&gt; 
 &lt;/catalog&gt;</pre>
 

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -1588,9 +1588,9 @@ 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;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&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; 
         &lt;/mx:dataProvider&gt; 
     &lt;/mx:ButtonBar&gt; 
 &lt;/s:Application&gt; </pre>
@@ -1624,11 +1624,11 @@ and icon for each button:</p>
         &lt;mx:dataProvider&gt; 
             &lt;fx:Object label="Flash" 
                 icon="@Embed(source='assets/Flashlogo.gif')"/&gt; 
-            &lt;fx:Object label="Director" 
+            &lt;fx:Object label="Installer" 
                 icon="@Embed(source='assets/Dirlogo.gif')"/&gt; 
-            &lt;fx:Object label="Dreamweaver" 
+            &lt;fx:Object label="FlexJS" 
                 icon="@Embed(source='assets/Dlogo.gif')"/&gt; 
-            &lt;fx:Object label="ColdFusion" 
+            &lt;fx:Object label="TourDeFlex" 
                 icon="@Embed(source='assets/CFlogo.gif')"/&gt; 
         &lt;/mx:dataProvider&gt; 
     &lt;/mx:ButtonBar&gt; 
@@ -1703,9 +1703,9 @@ an event listener, named <samp class="co
             
         &lt;mx:dataProvider&gt; 
             &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&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; 
         &lt;/mx:dataProvider&gt; 
         &lt;/mx:ToggleButtonBar&gt; 
         &lt;s:TextArea id="myTA" width="250" height="100"/&gt; 
@@ -5348,10 +5348,10 @@ to specify its label text: </p>
         itemClick="navigateToURL(new URLRequest('http://www.adobe.com/' + 
             String(event.label).toLowerCase()), '_blank');"&gt; 
         &lt;mx:dataProvider&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&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; 
         &lt;/mx:dataProvider&gt;  
     &lt;/mx:LinkBar&gt; 
 &lt;/s:Application&gt; </pre>
@@ -5377,10 +5377,10 @@ to populate the LinkBar control, as the
         
             [Bindable] 
             private var linkData:ArrayCollection = new ArrayCollection([ 
-                {label:'Flash', url:'http://www.adobe.com/products/flash/'}, 
-                {label:'Director', url:'http://www.adobe.com/products/director/'}, 
-                {label:'Dreamweaver', url:'http://www.adobe.com/products/dreamweaver/'}, 
-                {label:'ColdFusion', url:'http://www.adobe.com/products/coldfusion/'}]); 
+                {label:'Flex', url:'http://flex.apache.org/products/Flex/'}, 
+                {label:'Installer', url:'http://flex.apache.org/products/Installer/'}, 
+                {label:'FlexJS', url:'http://flex.apache.org/products/FlexJS/'}, 
+                {label:'TourDeFlex', url:'http://flex.apache.org/products/TourDeFlex/'}]); 
         ]]&gt; 
     &lt;/fx:Script&gt; 
     
@@ -8954,14 +8954,14 @@ to define streams of different qualities
         &lt;s:source&gt; 
             &lt;s:DynamicStreamingVideoSource id="mySVS" 
                 host="rtmp://examplesserver/vod/"&gt; 
-                &lt;s:DynamicStreamingVideoItem id="dreamgirl150" 
-                    streamName="MP4:_PS_dreamgirl_150.f4v" 
+                &lt;s:DynamicStreamingVideoItem id="needs_replacing150" 
+                    streamName="MP4:_PS_needs_replacing_150.f4v" 
                     bitrate="150" /&gt; 
-                &lt;s:DynamicStreamingVideoItem id="dreamgirl500" 
-                    streamName="MP4:_PS_dreamgirl_500.f4v" 
+                &lt;s:DynamicStreamingVideoItem id="needs_replacing500" 
+                    streamName="MP4:_PS_needs_replacing_500.f4v" 
                     bitrate="500" /&gt; 
-                &lt;s:DynamicStreamingVideoItem id="dreamgirl1000" 
-                    streamName="MP4:_PS_dreamgirl_1000.f4v" 
+                &lt;s:DynamicStreamingVideoItem id="needs_replacing1000" 
+                    streamName="MP4:_PS_needs_replacing_1000.f4v" 
                     bitrate="1000" /&gt; 
             &lt;/s:DynamicStreamingVideoSource&gt; 
         &lt;/s:source&gt; 

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -1234,7 +1234,7 @@ cross-domain policy files</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, 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>
    </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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -62,7 +62,7 @@ or inline. This property can take a list
 example shows:</p>
 
          <pre class="codeblock"> .myClass { 
- 	<strong>fontFamily: Arial, Helvetica;</strong> 
+ 	<strong>fontFamily: Open_Sans, PT_Serif;</strong> 
  	color: Red; 
  	fontSize: 22; 
  	fontWeight: bold; 
@@ -93,7 +93,7 @@ that style, as the following example sho
     @namespace s "library://ns.adobe.com/flex/spark"; 
   
      s|VGroup { 
-        fontFamily: Helvetica; 
+        fontFamily: PT_Serif; 
         fontSize: 13pt; 
      } 
      
@@ -105,11 +105,11 @@ that style, as the following example sho
  
   &lt;s:Panel title="Styles Inherited from VGroup Type Selector"&gt; 
      &lt;s:VGroup&gt;  
-        &lt;s:Button label="This Button uses Helvetica"/&gt; 
-        &lt;s:Label text="This Label control is in Helvetica."/&gt; 
+        &lt;s:Button label="This Button uses PT_Serif"/&gt; 
+        &lt;s:Label text="This Label control is in PT_Serif."/&gt; 
         &lt;s:RichText height="75" width="200"&gt; 
             &lt;s:text&gt; 
-            The text in this RichText control uses the Helvetica font 
+            The text in this RichText control uses the PT_Serif font 
             because it is inherited from the VGroup style. 
             &lt;/s:text&gt; 
         &lt;/s:RichText&gt; 
@@ -198,7 +198,7 @@ describes these fonts:</p>
 
                      <td class="cellrowborder" valign="top" width="NaN%" headers="d211623e143 ">
                         <p>The <samp class="codeph">_sans</samp> device font is
-a sans-serif typeface; for example, Helvetica or Arial.</p>
+a sans-serif typeface; for example, PT_Serif or Open_Sans.</p>
 
                      </td>
 
@@ -263,7 +263,7 @@ client machine:</p>
       @namespace s "library://ns.adobe.com/flex/spark"; 
  
      .myClass { 
-        fontFamily: Arial, Helvetica, "_sans"; 
+        fontFamily: Open_Sans, PT_Serif, "_sans"; 
         color: Red; 
         fontSize: 12; 
         fontWeight: bold; 
@@ -1277,7 +1277,7 @@ specify is embedded, as the following ex
         tf1.font = "myPlainFont"; 
         
         var tf2:TextFormat = new TextFormat(); 
-        tf2.font = "Arial"; 
+        tf2.font = "Open_Sans"; 
         
         b1 = FlexGlobals.topLevelApplication.systemManager. 
            isFontFaceEmbedded(tf1); 
@@ -1290,14 +1290,14 @@ specify is embedded, as the following ex
      &lt;s:FormItem label="isFontFaceEmbedded (myPlainFont):"&gt; 
         &lt;s:Label id="l1" text=" {b1}"/&gt; 
      &lt;/s:FormItem&gt;         
-     &lt;s:FormItem label="isFontFaceEmbedded (Arial):"&gt; 
+     &lt;s:FormItem label="isFontFaceEmbedded (Open_Sans):"&gt; 
         &lt;s:Label id="l2" text="{b2}"/&gt; 
      &lt;/s:FormItem&gt;         
   &lt;/s:Form&gt;    
 &lt;/s:Application&gt;</pre>
 
             <p>In this example, the font identified by the myPlainFont family
-name is embedded, but the Arial font is not.</p>
+name is embedded, but the Open_Sans font is not.</p>
 
             <p>You can use the <a href="http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/flash/text/Font.html" target="_blank">Font</a> class’s <samp class="codeph">enumerateFonts()</samp> method
 to output information about device or embedded fonts. The following
@@ -1388,8 +1388,8 @@ This list will vary depending on the cli
 FONT 1:: name: myFont; typeface: bold; type: embeddedCFF* 
 FONT 2:: name: myFont; typeface: italic; type: embeddedCFF* 
 FONT 3:: name: Marlett; typeface: regular; type: device 
-FONT 4:: name: Arial; typeface: regular; type: device 
-FONT 5:: name: Arial CE; typeface: regular; type: device</pre>
+FONT 4:: name: Open_Sans; typeface: regular; type: device 
+FONT 5:: name: Open_Sans CE; typeface: regular; type: device</pre>
 
             <p>The <samp class="codeph">enumerateFonts()</samp> method takes a single Boolean
 argument: <samp class="codeph">enumerateDeviceFonts</samp>. The default value

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 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 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>
    </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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -1569,7 +1569,7 @@ simple visual components in ActionScript
 
       </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 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>
    </div>
 
 

Modified: flex/site/branches/flexdoc/content/doc/flex/using/flx_olapdatagrid_ol.html
URL: http://svn.apache.org/viewvc/flex/site/branches/flexdoc/content/doc/flex/using/flx_olapdatagrid_ol.html?rev=1676360&r1=1676359&r2=1676360&view=diff
==============================================================================
--- flex/site/branches/flexdoc/content/doc/flex/using/flx_olapdatagrid_ol.html (original)
+++ flex/site/branches/flexdoc/content/doc/flex/using/flx_olapdatagrid_ol.html Mon Apr 27 19:01:59 2015
@@ -84,7 +84,7 @@ quarter. The following code shows the fo
 
          <pre class="codeblock">  data:Object = { 
  	customer:"AAA",  
- 	product:"ColdFusion", 
+ 	product:"FlexJS", 
  	year:"2007", 
  	quarter:"Q1" 
  	revenue: "100.00"  
@@ -160,7 +160,7 @@ code shows an example format of flat dat
 
                   <pre class="codeblock">  data:Object = { 
  	customer:"AAA",  
- 	product:"ColdFusion", 
+ 	product:"FlexJS", 
  	quarter:"Q1" 
  	revenue: "100.00"  
  }</pre>
@@ -218,7 +218,7 @@ to a field of the flat data set. For exa
 that contains three fields:</p>
 
             <pre class="codeblock">  data:Object = { 
- 	product:"ColdFusion" 
+ 	product:"FlexJS" 
  	quarter :"Q1" 
  	revenue: "100.00",  
  }</pre>
@@ -227,8 +227,8 @@ that contains three fields:</p>
 
             <ul>
                <li>
-                  <p>The product field can have the values: ColdFusion, Flex,
-Dreamweaver, and Illustrator.</p>
+                  <p>The product field can have the values: FlexJS, Flex,
+Installer, and TourDeFlex.</p>
 
                </li>
 
@@ -248,13 +248,13 @@ product for the quarter.</p>
             <p>To aggregate your data, you create an OLAP cube with two dimensions:
 quarter and product. The value along each dimension of the cube
 is called a <em>member.</em> For example, the product dimension of
-the cube has the following members: ColdFusion, Flex, Dreamweaver,
-and Illustrator. For the quarter dimension, the members are Q1,
+the cube has the following members: FlexJS, Flex, Installer,
+and TourDeFlex. For the quarter dimension, the members are Q1,
 Q2, Q3, and Q4.</p>
 
             <p>The value at any point in the cube defined by the two dimensions
 is called a <em>measure</em> of the cube. For example, the measure
-at the point in the cube defined by (Q1, ColdFusion) is 100.00.
+at the point in the cube defined by (Q1, FlexJS) is 100.00.
 A schema can define one or more measures for a single point in the
 OLAP cube. </p>
 
@@ -263,8 +263,8 @@ The advantage of numeric values is that
 for display in the OLAPDataGrid control. Some typical aggregation
 types include sum, average, minimum, and maximum. For example, you
 specify the aggregation method of the revenue measure as <samp class="codeph">SUM</samp>.
-You then extract sales information from the cube for ColdFusion.
-The aggregated sales data contains the sum of all ColdFusion sales for
+You then extract sales information from the cube for FlexJS.
+The aggregated sales data contains the sum of all FlexJS sales for
 each quarter. </p>
 
          </div>
@@ -286,7 +286,7 @@ records:</p>
 
             <pre class="codeblock">  data:Object = { 
  	customer:"AAA",  
- 	product:"ColdFusion", 
+ 	product:"FlexJS", 
  	quarter:"Q1" 
  	revenue: "100.00"  
  }</pre>
@@ -571,7 +571,7 @@ which contains sales records in the foll
 
             <pre class="codeblock">  data:Object = { 
  	customer:"AAA",  
- 	product:"ColdFusion", 
+ 	product:"FlexJS", 
  	quarter:"Q1" 
  	revenue: "100.00"  
  }</pre>
@@ -1845,7 +1845,7 @@ for the OLAPDataGrid control</h3>
             <p>When you define your query, you might create a situation
 where a cell of the OLAPDataGrid does not contain a value. For example,
 when aggregating data by customer and product, you might have a
-customer that has never purchased Illustrator. For that customer
+customer that has never purchased TourDeFlex. For that customer
 and product combination, the corresponding cell of the OLAPDataGrid
 displays the String "NaN".</p>
 
@@ -1874,7 +1874,7 @@ define a single level. For example, you
 three fields:</p>
 
          <pre class="codeblock">  data:Object = { 
- 	product:"ColdFusion" 
+ 	product:"FlexJS" 
  	quarter :"Q1" 
  	revenue: "100.00",  
  }</pre>
@@ -1883,8 +1883,8 @@ three fields:</p>
 
          <ul>
             <li>
-               <p>The product field can have the values: ColdFusion, Flex,
-Dreamweaver, and Illustrator.</p>
+               <p>The product field can have the values: FlexJS, Flex,
+Installer, and TourDeFlex.</p>
 
             </li>
 
@@ -1928,23 +1928,23 @@ to initialize the cube, it has the follo
          <pre class="codeblock">  ProductDim 							// Dimension 
  	Product 							// Hierarchy 
  		(All)							// Member 
- 		ColdFusion							// Member 
+ 		FlexJS							// Member 
  		Flex							// Member 
- 		Dreamweaver							// Member 
- 		Illustrator							// Member 
+ 		Installer							// Member 
+ 		TourDeFlex							// Member 
   
  	ProductHier 							// Hierarchy  
  		(All)							// Level 
- 			ColdFusion							// Member 
+ 			FlexJS							// Member 
  			Flex							// Member 
- 			Dreamweaver							// Member 
- 			Illustrator							// Member 
+ 			Installer							// Member 
+ 			TourDeFlex							// Member 
  			 
  		Product 							// Level 
- 			ColdFusion							// Member 
+ 			FlexJS							// Member 
  			Flex							// Member 
- 			Dreamweaver							// Member 
- 			Illustrator							// Member 
+ 			Installer							// Member 
+ 			TourDeFlex							// Member 
   
  QuarterDim 							// Dimension  
  	Quarter 							// Hierarchy 
@@ -2182,7 +2182,7 @@ of these methods and properties:</p>
                         </td>
 
                         <td class="cellrowborder" valign="top" width="NaN%" headers="d326693e2073 ">
-                           <p>ColdFusion, Flex, Dreamweaver, and Illustrator</p>
+                           <p>FlexJS, Flex, Installer, and TourDeFlex</p>
 
                         </td>
 
@@ -2198,8 +2198,8 @@ of these methods and properties:</p>
                         </td>
 
                         <td class="cellrowborder" valign="top" width="NaN%" headers="d326693e2073 ">
-                           <p>(All), ColdFusion, Flex, Dreamweaver, and
-Illustrator</p>
+                           <p>(All), FlexJS, Flex, Installer, and
+TourDeFlex</p>
 
                         </td>
 
@@ -2392,7 +2392,7 @@ combinations of these methods:</p>
                         </td>
 
                         <td class="cellrowborder" valign="top" width="NaN%" headers="d326693e2310 ">
-                           <p>ColdFusion, Flex, Dreamweaver, and Illustrator</p>
+                           <p>FlexJS, Flex, Installer, and TourDeFlex</p>
 
                         </td>
 
@@ -2408,8 +2408,8 @@ combinations of these methods:</p>
                         </td>
 
                         <td class="cellrowborder" valign="top" width="NaN%" headers="d326693e2310 ">
-                           <p>(All), ColdFusion, Flex, Dreamweaver, and
-Illustrator</p>
+                           <p>(All), FlexJS, Flex, Installer, and
+TourDeFlex</p>
 
                         </td>
 
@@ -2703,7 +2703,7 @@ contains multiple levels. For example, y
 three fields:</p>
 
          <pre class="codeblock">  data:Object = { 
- 	product:"ColdFusion" 
+ 	product:"FlexJS" 
  	year :"2006" 
  	quarter :"Q1" 
  	revenue: "100.00",  
@@ -2713,8 +2713,8 @@ three fields:</p>
 
          <ul>
             <li>
-               <p>The product field can have the values: ColdFusion, Flex,
-Dreamweaver, and Illustrator.</p>
+               <p>The product field can have the values: FlexJS, Flex,
+Installer, and TourDeFlex.</p>
 
             </li>
 
@@ -2765,23 +2765,23 @@ following code shows:</p>
          <pre class="codeblock">  ProductDim 							// Dimension  
  	Product 							// Hierarchy 
  		(All)							// Member 
- 		ColdFusion 							// Member 
+ 		FlexJS 							// Member 
  		Flex 							// Member 
- 		Dreamweaver 							// Member 
- 		Illustrator 							// Member 
+ 		Installer 							// Member 
+ 		TourDeFlex 							// Member 
   
  	ProductHier 							// Hierarchy  
  		(All) 							// Level 
- 			ColdFusion 							// Member 
+ 			FlexJS 							// Member 
  			Flex 							// Member 
- 			Dreamweaver 							// Member 
- 			Illustrator 							// Member 
+ 			Installer 							// Member 
+ 			TourDeFlex 							// Member 
  			 
  		Product 							// Level 
- 			ColdFusion 							// Member 
+ 			FlexJS 							// Member 
  			Flex 							// Member 
- 			Dreamweaver 							// Member 
- 			Illustrator 							// Member 
+ 			Installer 							// Member 
+ 			TourDeFlex 							// Member 
   
  TimeDim 							// Dimension 
  	Year 							// Hierarchy 
@@ -3485,7 +3485,7 @@ one dimension each for product, region,
  	country:"US", 
  	state:"MA", 
  	region:"NewEngland", 
- 	product:"ColdFusion", 
+ 	product:"FlexJS", 
  	year:2005, 
  	quarter:"Q1" 
  	month:"January", 

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -561,10 +561,10 @@ object exactly as it appears on the scre
     &lt;mx:VBox id="myVBox"&gt; 
         &lt;mx:DataGrid id="myDataGrid" width="300"&gt; 
             &lt;mx:dataProvider&gt; 
-                &lt;fx:Object Product="Flash" Code="1000"/&gt; 
+                &lt;fx:Object Product="FlexJS" Code="1000"/&gt; 
                 &lt;fx:Object Product="Flex" Code="2000"/&gt; 
-                &lt;fx:Object Product="ColdFusion" Code="3000"/&gt; 
-                &lt;fx:Object Product="JRun" Code="4000"/&gt; 
+                &lt;fx:Object Product="TourDeFlex" Code="3000"/&gt; 
+                &lt;fx:Object Product="Installer" Code="4000"/&gt; 
             &lt;/mx:dataProvider&gt; 
         &lt;/mx:DataGrid&gt; 
         &lt;mx:Button id="myButton" 
@@ -816,10 +816,10 @@ following code shows the contents of the
         &lt;mx:FormHeading label="Product Information"/&gt; 
         &lt;mx:DataGrid id="myDataGrid" width="300"&gt; 
             &lt;mx:dataProvider&gt; 
-                &lt;fx:Object Product="Flash" Code="1000"/&gt; 
+                &lt;fx:Object Product="FlexJS" Code="1000"/&gt; 
                 &lt;fx:Object Product="Flex" Code="2000"/&gt; 
-                &lt;fx:Object Product="ColdFusion" Code="3000"/&gt; 
-                &lt;fx:Object Product="JRun" Code="4000"/&gt; 
+                &lt;fx:Object Product="TourDeFlex" Code="3000"/&gt; 
+                &lt;fx:Object Product="Installer" Code="4000"/&gt; 
             &lt;/mx:dataProvider&gt; 
         &lt;/mx:DataGrid&gt; 
         &lt;mx:Button id="myButton" 

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -389,7 +389,7 @@ to use less memory because they contain
                            <p>Images that define the appearance of the
 skin. These images can JPEG, GIF, or PNG files, or they can be symbols
 embedded in SWF files. Typically you use drawing software such as
-Adobe<sup>®</sup> PhotoShop<sup>®</sup> 
+Adobe<sup>®</sup> Photoshop<sup>®</sup> 
 or Adobe<sup>®</sup> Illustrator<sup>®</sup> 
 to create graphical skins. </p>
 
@@ -3723,7 +3723,7 @@ value of that property. </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 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>
    </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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -146,10 +146,10 @@ data items represented by String data:</
     &lt;s:List&gt; 
         &lt;s:dataProvider&gt; 
             &lt;mx:ArrayCollection&gt; 
-                &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-                &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+                &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+                &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
             &lt;/mx:ArrayCollection&gt; 
          &lt;/s:dataProvider&gt; 
     &lt;/s:List&gt; 
@@ -176,10 +176,10 @@ tag. Therefore, you can write the exampl
  
     &lt;s:List&gt; 
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:List&gt; 
 &lt;/s:Application&gt;</pre>
@@ -358,10 +358,10 @@ shows: <pre class="codeblock">&lt;?xml v
  
     &lt;s:ButtonBar id="myBB"&gt;  
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:ButtonBar&gt; 
     
@@ -408,12 +408,12 @@ the Spark list-based controls.</div>
         &lt;/s:layout&gt; 
         &lt;mx:ArrayCollection&gt; 
             &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Flash Builder&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Illustrator&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Installer&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
+            &lt;fx:String&gt;TourDeFlex&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:List&gt; 
 &lt;/s:Application&gt;</pre>
@@ -981,10 +981,10 @@ the item renderer uses the normal state.
     &lt;s:List itemRenderer="myComponents.ListSelectedIR"&gt; 
         &lt;s:dataProvider&gt; 
             &lt;mx:ArrayCollection&gt; 
-                &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-                &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+                &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+                &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
             &lt;/mx:ArrayCollection&gt; 
          &lt;/s:dataProvider&gt; 
     &lt;/s:List&gt; 
@@ -1118,10 +1118,10 @@ example shows: <pre class="codeblock">&l
  
     &lt;s:List&gt; 
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:List&gt; 
 &lt;/s:Application&gt;</pre>
@@ -1146,13 +1146,13 @@ example shows: <pre class="codeblock">&l
         &lt;s:dataProvider&gt; 
             &lt;mx:ArrayCollection&gt; 
                 &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Flash Builder&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-                &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Illustrator&lt;/fx:String&gt; 
-                &lt;fx:String&gt;PhotoShop&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Installer&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+                &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+                &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
+                &lt;fx:String&gt;TourDeFlex&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Squiggly&lt;/fx:String&gt; 
             &lt;/mx:ArrayCollection&gt; 
         &lt;/s:dataProvider&gt; 
     &lt;/s:List&gt; 
@@ -1195,11 +1195,11 @@ rows alternate among the three colors, a
         &lt;s:dataProvider&gt; 
             &lt;mx:ArrayCollection&gt; 
                 &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Flash Builder&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-                &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-                &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Installer&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+                &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+                &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+                &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
             &lt;/mx:ArrayCollection&gt; 
          &lt;/s:dataProvider&gt; 
     &lt;/s:List&gt; 
@@ -1282,11 +1282,11 @@ control, and the data item itself in a s
         change="myChangedHandler(event);"&gt; 
         &lt;mx:ArrayCollection&gt; 
             &lt;fx:String&gt;Flex&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Flash Builder&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Installer&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:List&gt; 
     
@@ -1562,10 +1562,10 @@ as the following example shows: <pre cla
  
     &lt;s:ButtonBar&gt;  
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:ButtonBar&gt; 
 &lt;/s:Application&gt;</pre>
@@ -1603,10 +1603,10 @@ as the following example shows: <pre cla
  
     &lt;s:TabBar&gt;  
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:TabBar&gt; 
 &lt;/s:Application&gt;</pre>
@@ -1744,10 +1744,10 @@ buttons:</p>
         requireSelection="true" 
         width="320"&gt; 
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:ButtonBar&gt; 
 &lt;/s:Application&gt;</pre>
@@ -1812,10 +1812,10 @@ listener, named <samp class="codeph">cha
     &lt;s:ButtonBar 
         change="changeHandler(event);"&gt; 
         &lt;mx:ArrayCollection&gt; 
-            &lt;fx:String&gt;Flash&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Director&lt;/fx:String&gt; 
-            &lt;fx:String&gt;Dreamweaver&lt;/fx:String&gt; 
-            &lt;fx:String&gt;ColdFusion&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Falcon&lt;/fx:String&gt; 
+            &lt;fx:String&gt;AntOnAIR&lt;/fx:String&gt; 
+            &lt;fx:String&gt;FlexJS&lt;/fx:String&gt; 
+            &lt;fx:String&gt;Mobile Trader&lt;/fx:String&gt; 
         &lt;/mx:ArrayCollection&gt; 
     &lt;/s:ButtonBar&gt; 
  

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -644,7 +644,7 @@ transform effects</a>.</p>
         &lt;s:Image id="targetImg" 
             horizontalCenter="0" 
             verticalCenter="0" 
-            source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+            source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             
         &lt;s:Button id="playButton" 
             left="5" bottom="5" 
@@ -685,7 +685,7 @@ image around the y-axis: </p>
         &lt;s:Image id="targetImg" 
             horizontalCenter="0" 
             verticalCenter="0" 
-            source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+            source="@Embed(source='assets/Flex_6630.png')"/&gt; 
  
         &lt;s:Button id="playButton" 
             left="5" bottom="5" 
@@ -746,11 +746,11 @@ to rotate the image around its center po
             horizontalCenter="0" 
             verticalCenter="0"&gt; 
             &lt;s:Image 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image id="targetImg" 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image  
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
         &lt;/s:HGroup&gt; 
  
         &lt;s:Button id="playButton" 
@@ -789,12 +789,12 @@ to the <samp class="codeph">transormX</s
             horizontalCenter="0" 
             verticalCenter="0"&gt; 
             &lt;s:Image 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image id="targetImg" 
                 transformX="100" 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image  
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
         &lt;/s:HGroup&gt; 
  
         &lt;s:Button id="playButton" 
@@ -896,11 +896,11 @@ rotates, and the target image overlaps t
             horizontalCenter="0" 
             verticalCenter="0"&gt; 
             &lt;s:Image 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image id="targetImg" 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image  
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
         &lt;/s:HGroup&gt; 
  
         &lt;s:Button id="playButton" 
@@ -948,11 +948,11 @@ of the other two images as the effect pl
             horizontalCenter="0" 
             verticalCenter="0"&gt; 
             &lt;s:Image 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image id="targetImg" 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image  
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
         &lt;/s:HGroup&gt; 
  
         &lt;s:Button id="playButton" 
@@ -1044,12 +1044,12 @@ that the parent container does not updat
             horizontalCenter="0" 
             verticalCenter="0"&gt; 
             &lt;s:Image 
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
             &lt;s:Image id="targetImg" 
-                source="@Embed(source='assets/Nokia_6630.png')" 
+                source="@Embed(source='assets/Flex_6630.png')" 
                 creationComplete="initOffsets();"/&gt; 
             &lt;s:Image  
-                source="@Embed(source='assets/Nokia_6630.png')"/&gt; 
+                source="@Embed(source='assets/Flex_6630.png')"/&gt; 
         &lt;/s:HGroup&gt; 
  
         &lt;s:HGroup left="5" bottom="5"&gt; 

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=1676360&r1=1676359&r2=1676360&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 Mon Apr 27 19:01:59 2015
@@ -2642,7 +2642,7 @@ The following properties have no effect
 
       </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 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>
    </div>
 
 



Mime
View raw message