From ccf902ef8686b8c82b253f0b169f73dcfb907707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Antonsson?= Date: Thu, 26 Jun 2014 09:11:20 +0200 Subject: [PATCH] +pro,doc Make sure that doc gets published during subproject release --- akka-docs-dev/_sphinx/themes/akka/layout.html | 4 ++-- akka-docs-dev/rst/conf.py | 4 ++-- akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/akka-docs-dev/_sphinx/themes/akka/layout.html b/akka-docs-dev/_sphinx/themes/akka/layout.html index e060cf1be1..3a0451b391 100644 --- a/akka-docs-dev/_sphinx/themes/akka/layout.html +++ b/akka-docs-dev/_sphinx/themes/akka/layout.html @@ -61,8 +61,8 @@
{{ title }}
- - + +
diff --git a/akka-docs-dev/rst/conf.py b/akka-docs-dev/rst/conf.py index 015609c9e1..865efbd21e 100644 --- a/akka-docs-dev/rst/conf.py +++ b/akka-docs-dev/rst/conf.py @@ -71,9 +71,9 @@ latex_paper_size = 'a4' latex_font_size = '10pt' latex_documents = [ - ('java', 'AkkaJava.tex', u' Akka Java Documentation', + ('java', 'AkkaStreamAndHTTPJava.tex', u' Akka Stream and HTTP Experimental Java Documentation', u'Typesafe Inc', 'manual'), - ('scala', 'AkkaScala.tex', u' Akka Scala Documentation', + ('scala', 'AkkaStreamAndHTTPScala.tex', u' Akka Stream and HTTP Experimental Scala Documentation', u'Typesafe Inc', 'manual'), ] diff --git a/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala index 67a0867e61..8d1f9e7ea7 100644 --- a/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala @@ -2,13 +2,14 @@ package docs.http //#import-model import akka.http.model._ -import org.scalatest.MustMatchers //#import-model import akka.stream.testkit.AkkaSpec import akka.util.ByteString import akka.http.model.headers.{ GenericHttpCredentials, BasicHttpCredentials } +import org.scalatest.MustMatchers + class ModelSpec extends AkkaSpec { "construct request" in {