Johan Andrén 55af6cee5b Merge pull request #19596 from hochgi/hochgi-adding-batch-to-docs ... =str adding documentation for batch & batchWeighted combinators		2016-01-25 14:18:30 +01:00
..
additional	=osgi #19323 Add to documentation on OSGi	2016-01-19 09:39:48 -07:00
common	=pro #19068 All copyrights ranges and single years updated to a range ending in 2016	2016-01-25 10:20:30 +01:00
dev	=doc #17752 Compatibility with latest version of Sphinx	2015-07-09 08:14:53 +03:00
experimental	=per #18123 Deprecate PersistentView	2015-08-14 15:05:59 +02:00
general	Merge pull request #19596 from hochgi/hochgi-adding-batch-to-docs	2016-01-25 14:18:30 +01:00
images	+doc #19429 initial merge of docs-dev and docs	2016-01-14 00:31:03 +01:00
intro	=doc #18989 Make docs more googlable with regards to docker containers	2016-01-21 12:13:56 +01:00
java	Merge pull request #19604 from akka/wip-19441-convert-from-Option-to-Optional-in-javadsl-johanandren	2016-01-25 14:12:31 +01:00
project	add migration guides for Scala and Java	2016-01-20 10:27:00 +01:00
scala	Merge pull request #19604 from akka/wip-19441-convert-from-Option-to-Optional-in-javadsl-johanandren	2016-01-25 14:12:31 +01:00
conf.py	+doc #19429 initial merge of docs-dev and docs	2016-01-14 00:31:03 +01:00
index.rst	restructure ToC of reST docs	2013-04-19 13:40:37 +02:00
java.rst	+doc #19429 initial merge of docs-dev and docs	2016-01-14 00:31:03 +01:00
scala.rst	+doc #19429 initial merge of docs-dev and docs	2016-01-14 00:31:03 +01:00