=doc,htc #19252 fix docs where occasionally broken

This commit is contained in:
Konrad Malawski 2015-12-23 17:59:31 +01:00
parent 2f762c995b
commit ff152b816d
8 changed files with 98 additions and 23 deletions

View file

@ -1,8 +1,8 @@
.. _migration-2.0-java:
############################
Migration Guide 1.0 to 2.x
############################
##########################
Migration Guide 1.0 to 2.x
##########################
The 2.0 release contains some structural changes that require some
simple, mechanical source-level changes in client code. While these are detailed below,
@ -80,6 +80,7 @@ Update procedure
``BidiFlow.fromFlows`` or ``BidiFlow.fromFlowsMat``
5. Replace all uses of ``BidiFlow.apply()`` (Scala DSL) or ``BidiFlow.create()`` (Java DSL) when it converts two
functions to a ``BidiFlow`` with ``BidiFlow.fromFunctions``
Example
^^^^^^^
@ -122,7 +123,7 @@ Should be replaced by
Renamed ``inlet()`` and ``outlet()`` to ``in()`` and ``out()`` in ``SourceShape``, ``SinkShape`` and ``FlowShape``
==========================================================================================================
==================================================================================================================
The input and output ports of these shapes where called ``inlet()`` and ``outlet()`` compared to other shapes that
consistently used ``in()`` and ``out()``. Now all :class:`Shape` s use ``in()`` and ``out()``.

View file

@ -194,8 +194,8 @@ turns an object into a sequence of bytes.
The other stage that we talked about is a little more involved since reversing
a framing protocol means that any received chunk of bytes may correspond to
zero or more messages. This is best implemented using a :class:`PushPullStage`
(see also :ref:`stream-using-push-pull-stage-java`).
zero or more messages. This is best implemented using a :class:`GraphStage`
(see also :ref:`graphstage-java`).
.. includecode:: ../../../akka-samples/akka-docs-java-lambda/src/test/java/docs/stream/BidiFlowDocTest.java#framing