Henrik Engstrom 26d49fecb9 Merge branch 'master' into 1063-docs-routing-he ... Conflicts: akka-docs/java/routing.rst akka-docs/scala/routing.rst		2011-12-15 20:15:32 +01:00
..
code/akka/docs	Merge branch 'master' into 1063-docs-routing-he	2011-12-15 20:15:32 +01:00
actors.rst	Merge remote-tracking branch 'origin/wip-simplify-configuring-new-router-in-props-jboner'	2011-12-15 10:32:31 +01:00
agents.rst	DOC: Disabled agents chapter, since it's in the akka-stm module. See #1488	2011-12-15 08:36:00 +01:00
dataflow.rst	Quick and dirty touch-up of Dataflow	2011-12-15 17:10:07 +01:00
dispatchers.rst	DOC: Rewrite config comments. See #1505	2011-12-14 15:12:40 +01:00
extending-akka.rst	Adding a Scala and a Java guide to Akka Extensions	2011-12-15 14:01:04 +01:00
fault-tolerance.rst	Renaming link/unlink to startsMonitoring/stopsMonitoring	2011-10-14 15:09:46 +02:00
fsm.rst	polish and add general/actors	2011-12-15 12:05:48 +01:00
futures.rst	Moved Timeout classes from akka.actor._ to akka.util._.	2011-12-14 17:34:56 +01:00
index.rst	Merge branch 'master' of github.com:jboner/akka	2011-12-15 15:22:55 +01:00
logging.rst	DOC: Rewrite config comments. See #1505	2011-12-14 15:12:40 +01:00
routing.rst	Fixed typo. See #1063	2011-12-15 19:04:57 +01:00
scheduler.rst	DOC: Improved scheduler doc. Split into Java/Scala samples	2011-12-14 21:52:39 +01:00
testing.rst	DOC: Update Testing Actor Systems (TestKit) Chapter. See #1486	2011-12-15 15:04:14 +01:00
testkit-example.rst	Updated docs with changes to 'actorOf(Props(..))'	2011-12-13 14:53:18 +01:00
transactors.rst	Removed STM module. See #1503	2011-12-14 12:39:27 +01:00
typed-actors.rst	Adding Typed Actor docs for Java, as well as some minor tweaks on some Java APIs	2011-12-15 16:57:29 +01:00