Merge commit '9cdbe28' into merge/2.10.x-to-master

Conflicts:
	build.examples.xml
	build.xml
	docs/examples/actors/pingpong.scala
	docs/examples/fors.scala
	docs/examples/iterators.scala
	docs/examples/jolib/Ref.scala
	docs/examples/jolib/parallelOr.scala
	docs/examples/monads/callccInterpreter.scala
	docs/examples/monads/directInterpreter.scala
	docs/examples/monads/errorInterpreter.scala
	docs/examples/monads/simpleInterpreter.scala
	docs/examples/monads/stateInterpreter.scala
	docs/examples/parsing/ArithmeticParser.scala
	docs/examples/patterns.scala
	docs/examples/pilib/elasticBuffer.scala
	docs/examples/pilib/handover.scala
	docs/examples/pilib/piNat.scala
	docs/examples/typeinf.scala
	src/build/pack.xml

1 files changed, 19 insertions, 16 deletions

diff --git a/build.xml b/build.xml
index 2fd6491510..e8bd5179e7 100755
--- a/build.xml
+++ b/build.xml
@@ -1715,29 +1715,32 @@ TODO:
 
 
   <target name="dist.doc" depends="dist.base, docs.done">
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs" overwrite="true" flatten="true">
-      <file file="${scala-xml-javadoc}"/>
-      <file file="${scala-parser-combinators-javadoc}"/>
+    <mkdir dir="${dist.dir}/doc"/>
+    <mkdir dir="${dist.dir}/doc/licenses"/>
+    <mkdir dir="${dist.dir}/doc/tools"/>
+    <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc" overwrite="true"/>
+    <copy file="${docs.dir}/README"  toDir="${dist.dir}/doc" overwrite="true"/>
+    <copy                            toDir="${dist.dir}/doc/licenses" overwrite="true">
+      <fileset dir="${docs.dir}/licenses"/>
+    </copy>
+    <copy                            toDir="${dist.dir}/doc/tools" overwrite="true">
+      <fileset dir="${build-docs.dir}/manual/html"/>
     </copy>
 
-    <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc" overwrite="true"/>
-    <copy file="${docs.dir}/README" toDir="${dist.dir}/doc" overwrite="true"/>
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs/api"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/api" overwrite="true">
+    <mkdir dir="${dist.dir}/api"/>
+    <copy toDir="${dist.dir}/api" overwrite="true">
       <fileset dir="${build-docs.dir}/library"/>
     </copy>
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs/examples"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/examples" overwrite="true">
-      <fileset dir="${docs.dir}/examples">
-        <exclude name="**/*.desired.sha1"/>
-      </fileset>
-    </copy>
     <copy file="${src.dir}/swing/doc/README"
-          toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"
-          overwrite="true"/>
+          toFile="${dist.dir}/api/README.scala-swing" overwrite="true"/>
+    <copy toDir="${dist.dir}/doc/api" overwrite="true" flatten="true">
+      <file file="${scala-xml-javadoc}"/>
+      <file file="${scala-parser-combinators-javadoc}"/>
+    </copy>
+      
   </target>
 
+
   <target name="dist.man" depends="dist.base, docs.man">
     <mkdir dir="${dist.dir}/man"/>
     <copy toDir="${dist.dir}/man" overwrite="true">