Permalink
Browse files

Merge remote-tracking branch 'origin/candidate-3.10.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
  • Loading branch information...
richardkchapman committed Nov 30, 2012
2 parents 96a147b + 33cdd43 commit 93cb20ad07726a060c3e706f4f974c4c2430f442
Showing with 1,025 additions and 402 deletions.
  1. +2 −2 docs/BuildTools/fo.xsl
  2. +2 −2 docs/BuildTools/fo.xsl.in
  3. +11 −10 docs/ECLPlayground/ECLPlayground-includer.xml
  4. +7 −5 docs/ECLPluginForEclipse/ECL_Plugin_for_Eclipse.xml
  5. +50 −30 docs/ECLProgrammersGuide/PrGd-Includer.xml
  6. +63 −35 docs/ECLStandardLibraryReference/SLR-includer.xml
  7. +10 −8 docs/HDFSConnector/HDFS_to_HPCC_ConnectorIncluder.xml
  8. +14 −9 docs/HPCCClientTools/ClientTools.xml
  9. +8 −6 docs/HPCCClientTools/TheECLIDEandHPCCClientTools.xml
  10. +8 −6 docs/HPCCDataHandling/DataHandling.xml
  11. +8 −6 docs/HPCCDataTutorial/DataTutorial.xml
  12. +45 −14 docs/IMDB/IMDB.xml
  13. +399 −0 docs/Installing_and_RunningTheHPCCPlatform/Inst-Mods/ssl-esp.xml
  14. +11 −5 docs/Installing_and_RunningTheHPCCPlatform/Installing_and_RunningTheHPCCPlatform.xml
  15. +51 −60 docs/One-Click_HPCCinAWS/One-Click_RuningHPCCinAmazonWebServicesEC2.xml
  16. +8 −6 docs/RDDERef/RDDERef.xml
  17. +8 −6 docs/RunningHPCCinaVirtualMachine/RunningHPCCinaVirtualMachine.xml
  18. +10 −8 docs/UsingConfigManager/UsingConfigManager.xml
  19. +7 −5 docs/Visualizing/Visualizing.xml
  20. BIN docs/images/AWS_InstantCloud_COVER_registeredTm.jpg
  21. BIN docs/images/AWS_InstantCloud_Login.jpg
  22. BIN docs/images/AWS_One-click_COVER_LN_Rightjustified.jpg
  23. BIN docs/images/AWS_OneClick_003a.jpg
  24. BIN docs/images/AWS_OneClick_005.jpg
  25. BIN docs/images/AWS_OneClick_006.jpg
  26. BIN docs/images/AWS_OneClick_LaunchLog.jpg
  27. BIN docs/images/AWS_OneClick_LaunchNew.jpg
  28. BIN docs/images/AWS_OneClick_Login.jpg
  29. BIN docs/images/AWS_OneClick_Terminated.jpg
  30. BIN docs/images/AWS_OneClick_ViewClusters.jpg
  31. BIN docs/images/AWS_OneClick_ViewClustersTerminate.jpg
  32. BIN docs/images/redswooshWithLogo3.jpg
  33. BIN docs/images/ssl-01.jpg
  34. BIN docs/images/ssl-02.jpg
  35. BIN docs/images/ssl-03.jpg
  36. BIN docs/images/ssl-04.jpg
  37. +10 −7 docs/wip/certify.xml
  38. +181 −106 ecl/hthor/hthor.cpp
  39. +56 −22 ecl/hthor/hthor.ipp
  40. +5 −1 esp/bindings/SOAP/Platform/soapparam.cpp
  41. +24 −20 esp/files/ecl/DENORMALIZE_Example.ecl
  42. +21 −21 esp/files/ecl/MACRO_Example.ecl
  43. +1 −0 roxie/roxiemem/roxierowbuff.hpp
  44. +1 −1 thorlcr/activities/hashdistrib/thhashdistribslave.cpp
  45. +4 −1 thorlcr/activities/lookupjoin/thlookupjoinslave.cpp
View
@@ -332,13 +332,13 @@
<!--NEW-inline_monospace-8-12-->
<xsl:template match="emphasis[@role='code']">
- <fo:inline font-family="courier">
+ <fo:inline font-family="monospace">
<xsl:apply-templates/>
</fo:inline>
</xsl:template>
<xsl:template match="emphasis[@role='codebold']">
- <fo:inline font-family="courier" font-weight="bold">
+ <fo:inline font-family="monospace" font-weight="bold">
<xsl:apply-templates/>
</fo:inline>
</xsl:template>
@@ -332,13 +332,13 @@
<!--NEW-inline_monospace-8-12-->
<xsl:template match="emphasis[@role='code']">
- <fo:inline font-family="courier">
+ <fo:inline font-family="monospace">
<xsl:apply-templates/>
</fo:inline>
</xsl:template>
<xsl:template match="emphasis[@role='codebold']">
- <fo:inline font-family="courier" font-weight="bold">
+ <fo:inline font-family="monospace" font-weight="bold">
<xsl:apply-templates/>
</fo:inline>
</xsl:template>
@@ -23,13 +23,15 @@
Number in the text of the message.</para>
<para>LexisNexis and the Knowledge Burst logo are registered trademarks
- of Reed Elsevier Properties Inc., used under license. Other products,
- logos, and services may be trademarks or registered trademarks of their
- respective companies. All names and example data used in this manual are
- fictitious. Any similarity to actual persons, living or dead, is purely
- coincidental.</para>
+ of Reed Elsevier Properties Inc., used under license. HPCC Systems is a
+ registered trademark of LexisNexis Risk Data Management Inc.</para>
- <para />
+ <para>Other products, logos, and services may be trademarks or
+ registered trademarks of their respective companies. All names and
+ example data used in this manual are fictitious. Any similarity to
+ actual persons, living or dead, is purely coincidental.</para>
+
+ <para> </para>
</legalnotice>
<xi:include href="common/Version.xml" xpointer="FooterInfo"
@@ -51,11 +53,10 @@
</bookinfo>
<chapter id="ECLPlaygroundChap">
- <title>
- <emphasis>ECL Playground</emphasis>
- </title>
+ <title><emphasis>ECL Playground</emphasis></title>
- <xi:include href="ECLPlayground/ECLPlay-Mods/ECL_Playground.xml" xpointer="ECL_Playground"
+ <xi:include href="ECLPlayground/ECLPlay-Mods/ECL_Playground.xml"
+ xpointer="ECL_Playground"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
</book>
@@ -24,11 +24,13 @@
Number in the text of the message.</para>
<para>LexisNexis and the Knowledge Burst logo are registered trademarks
- of Reed Elsevier Properties Inc., used under license. Other products and
- services may be trademarks or registered trademarks of their respective
- companies. All names and example data used in this manual are
- fictitious. Any similarity to actual persons, living or dead, is purely
- coincidental.</para>
+ of Reed Elsevier Properties Inc., used under license. HPCC Systems is a
+ registered trademark of LexisNexis Risk Data Management Inc.</para>
+
+ <para>Other products and services may be trademarks or registered
+ trademarks of their respective companies. All names and example data
+ used in this manual are fictitious. Any similarity to actual persons,
+ living or dead, is purely coincidental.</para>
<para><emphasis role="redbold">DRAFT 004</emphasis></para>
</legalnotice>
@@ -23,18 +23,19 @@
Number in the text of the message.</para>
<para>LexisNexis and the Knowledge Burst logo are registered trademarks
- of Reed Elsevier Properties Inc., used under license. Other products,
- logos, and services may be trademarks or registered trademarks of their
- respective companies. All names and example data used in this manual are
- fictitious. Any similarity to actual persons, living or dead, is purely
- coincidental.</para>
+ of Reed Elsevier Properties Inc., used under license. HPCC Systems is a
+ registered trademark of LexisNexis Risk Data Management Inc.</para>
- <para></para>
- </legalnotice>
+ <para>Other products, logos, and services may be trademarks or
+ registered trademarks of their respective companies. All names and
+ example data used in this manual are fictitious. Any similarity to
+ actual persons, living or dead, is purely coincidental.</para>
- <xi:include href="common/Version.xml" xpointer="FooterInfo"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <para> </para>
+ </legalnotice>
+ <xi:include href="common/Version.xml" xpointer="FooterInfo"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="common/Version.xml" xpointer="DateVer"
xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -44,7 +45,6 @@
<xi:include href="common/Version.xml" xpointer="Copyright"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<mediaobject role="logo">
<imageobject>
<imagedata fileref="images/LN_Rightjustified.jpg" />
@@ -55,81 +55,100 @@
<chapter>
<title>ECL Programming Concepts</title>
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Attribute_Creation.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Attribute_Creation.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Creating_example_data.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Creating_example_data.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Crosstab_reports.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Crosstab_reports.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Efficient_Value_TypeUsage.xml"
xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Using_Group_Function.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Using_Group_Function.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Automated_ECL.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Automated_ECL.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Job_Failure.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Job_Failure.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_NonRandom_Random.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_NonRandom_Random.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Workwith_XML_Data.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Workwith_XML_Data.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Workwith_Blobs.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Workwith_Blobs.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Using_ECL_Keys.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Using_ECL_Keys.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
<chapter>
<title>Working With SuperFiles</title>
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Superfile_Overview.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Superfile_Overview.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_CreateMaintain_Superfiles.xml"
xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Indexing_Superfiles.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Indexing_Superfiles.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Using_Superkeys.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Using_Superkeys.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
<chapter>
<title>Working With Roxie</title>
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Roxie_Overview.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Roxie_Overview.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_SOAPenable_Queries.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_SOAPenable_Queries.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Complex_ROXIE_Queries.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Complex_ROXIE_Queries.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_SOAPCALL_fromTHOR_to_ROXIE.xml"
xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_control_ROXIE_queries.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_control_ROXIE_queries.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_query_libraries.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_query_libraries.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Smart_Stepping.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Smart_Stepping.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
@@ -144,7 +163,8 @@
xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Simple_Random_Samples.xml" xpointer="element(/1)"
+ <xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Simple_Random_Samples.xml"
+ xpointer="element(/1)"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="ECLProgrammersGuide/PRG_Mods/PrG_Hex_String_to_Decimal_String.xml"
Oops, something went wrong.

0 comments on commit 93cb20a

Please sign in to comment.