Line 527: |
Line 527: |
| <h3>Main Pages</h3> | | <h3>Main Pages</h3> |
| | | |
− | <p></p> | + | <p>Recent additions and bottom table</p> |
| | | |
| <table class="wikitable markupTable"> | | <table class="wikitable markupTable"> |
Line 535: |
Line 535: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup"><span style="color: #007700"><p></span>Lorem ipsum dolor sit amet, consectetur adipiscing elit.<span style="color: #007700"><ref></span>Wikipedia. (2019, September 1). [https://en.wikipedia.org/wiki/Main_Page Wikipedia]. Retrieved from Wikipedia<span style="color: #007700"></ref></p></span></td> | + | <td class="markup"></td> |
| + | <td class="disclaimer"> |
| + | <table><tr> |
| + | <td>[[File:Traffic_cone.png|40px]]</td> |
| + | <td class="disclaimerText">Recent additions include [[Technology_Trends/Blockchain|Blockchain]], [[Technology_Trends/Drones|Drones]].</td> |
| + | </tr></table> |
| + | </td> |
| + | </tr> |
| + | <tr> |
| + | <td></td> |
| <td> | | <td> |
− | <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.<sup><nowiki>[1]</nowiki></sup></p> | + | <table class="wikitable sortable technology-table" style="border: 0px solid;"> |
− | <p class="header2">References</p>
| + | <tr> |
− | <ol>
| + | <th colspan="3">Name</th> |
− | <li>Wikipedia. (2019, September 1). [https://en.wikipedia.org/wiki/Main_Page Wikipedia]. Retrieved from Wikipedia</li> | + | <th>Status</th> |
− | </ol> | + | <th style="white-space: nowrap;">Release Date</th> |
| + | <th>Official Publications</th> |
| + | </tr> |
| + | <tr> |
| + | <td style="border-right: 0px solid; text-align:right;">[[Technology_Trends/Blockchain|Blockchain]]</td> |
| + | <td style="border-left: 0px solid; border-right: 0px solid;">-</td> |
| + | <td style="border-left: 0px solid; text-align:left">[[Tendances_Technologiques/Chaîne_de_Blocs|Chaîne de Blocs]]</td> |
| + | <td>Published</td> |
| + | <td>2019-05-23</td> |
| + | <td>[[Media:EN_-_Technology_Trends_-_Blockchain.pdf|EN]] - [[Media:FR_-_Tendances_Technologiques_-_Blockchain.pdf|FR]]</td> |
| + | </tr> |
| + | <tr> |
| + | <td style="border-right: 0px solid; text-align:right;">3D XPoint (Optane)</td> |
| + | <td style="border-left: 0px solid; border-right: 0px solid;">-</td> |
| + | <td style="border-left: 0px solid; text-align:left">3D XPoint (Optane)</td> |
| + | <td>Development</td> |
| + | <td>FY 19-20 Q2</td> |
| + | <td></td> |
| + | </tr> |
| + | </table> |
| </td> | | </td> |
| </tr> | | </tr> |
| </table> | | </table> |
| + | |
| + | <table><tr> |
| + | <td>[[File:Traffic_cone.png|40px]]</td> |
| + | <td class="disclaimerText">Recent additions include [[Technology_Trends/Blockchain|Blockchain]], [[Technology_Trends/Drones|Drones]], [[Technology_Trends/Internet_of_Things|Internet of Things]], [[Technology_Trends/Low_Code_Application_Development|Low Code Application Development]], [[Technology_Trends/Open_by_Default|Open by Default]], [[Technology_Trends/Zero_Trust_Network|Zero Trust Network]].</td> |
| + | </tr></table> |
| + | |
| + | |
| + | <h2>Technology Trend Briefing Papers</h2> |
| + | |
| + | <table class="wikitable sortable technology-table" style="border: 0px solid;"> |
| + | <tr> |
| + | <th colspan="3">Name</th> |
| + | <th>Status</th> |
| + | <th style="white-space: nowrap;">Release Date</th> |
| + | <th>Official Publications</th> |
| + | </tr> |
| + | <tr> |
| + | <td style="border-right: 0px solid; text-align:right;">[[Technology_Trends/Blockchain|Blockchain]]</td> |
| + | <td style="border-left: 0px solid; border-right: 0px solid;">-</td> |
| + | <td style="border-left: 0px solid; text-align:left">[[Tendances_Technologiques/Chaîne_de_Blocs|Chaîne de Blocs]]</td> |
| + | <td>Published</td> |
| + | <td>2019-05-23</td> |
| + | <td>[[Media:EN_-_Technology_Trends_-_Blockchain.pdf|EN]] - [[Media:FR_-_Tendances_Technologiques_-_Blockchain.pdf|FR]]</td> |
| + | </tr> |
| + | <tr> |
| + | <td style="border-right: 0px solid; text-align:right;">3D XPoint (Optane)</td> |
| + | <td style="border-left: 0px solid; border-right: 0px solid;">-</td> |
| + | <td style="border-left: 0px solid; text-align:left">3D XPoint (Optane)</td> |
| + | <td>Development</td> |
| + | <td>FY 19-20 Q2</td> |
| + | <td></td> |
| + | </tr> |
| + | </table> |
| + | |
| + | |
| + | |
| + | |
| + | |
| | | |
| <h3>Hype cycle table</h3> | | <h3>Hype cycle table</h3> |