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, 0 insertions, 26 deletions

diff --git a/docs/examples/xml/phonebook/embeddedBook.scala b/docs/examples/xml/phonebook/embeddedBook.scala
deleted file mode 100644
index 3286485f0b..0000000000
--- a/docs/examples/xml/phonebook/embeddedBook.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-/* examples/phonebook/embeddedBook.scala */
-package phonebook  
-
-object embeddedBook {
-
-  val company  = <a href="http://acme.org">ACME</a>
-  val first    = "Burak"
-  val last     = "Emir"
-  val location = "work"
-
-  val embBook = 
-    <phonebook>
-      <descr>
-        This is the <b>phonebook</b> of the 
-        {company} corporation.
-      </descr>
-      <entry>
-        <name>{ first+" "+last }</name> 
-        <phone where={ location }>+41 21 693 68 {val x = 60 + 7; x}</phone>
-      </entry>
-    </phonebook>;
-
-  def main(args: Array[String]) =
-    Console.println( embBook )
-
-}