diff --git a/akka-docs/java/stm.rst b/akka-docs/java/stm.rst index 4871a945b1..0b648599ad 100644 --- a/akka-docs/java/stm.rst +++ b/akka-docs/java/stm.rst @@ -12,12 +12,14 @@ Overview of STM An `STM `_ turns the Java heap into a transactional data set with begin/commit/rollback semantics. Very much like a regular database. It implements the first three -letters in ACID; ACI: +letters in `ACID`_; ACI: * Atomic * Consistent * Isolated +.. _ACID: http://en.wikipedia.org/wiki/ACID + Generally, the STM is not needed very often when working with Akka. Some use-cases (that we can think of) are: @@ -51,18 +53,6 @@ memory cells, holding an (arbitrary) immutable value, that implement CAS coordinated changes across many Refs. -Persistent Datastructures -========================= - -Working with immutable collections can sometimes give bad performance due to -extensive copying. Scala provides so-called persistent datastructures which -makes working with immutable collections fast. They are immutable but with -constant time access and modification. They use structural sharing and an insert -or update does not ruin the old structure, hence "persistent". Makes working -with immutable composite types fast. The persistent datastructures currently -consist of a Map and Vector. - - Integration with Actors ======================= diff --git a/akka-docs/scala/stm.rst b/akka-docs/scala/stm.rst index aae7ce9ef4..3b1fe4cb2c 100644 --- a/akka-docs/scala/stm.rst +++ b/akka-docs/scala/stm.rst @@ -12,12 +12,14 @@ Overview of STM An `STM `_ turns the Java heap into a transactional data set with begin/commit/rollback semantics. Very much like a regular database. It implements the first three -letters in ACID; ACI: +letters in `ACID`_; ACI: * Atomic * Consistent * Isolated +.. _ACID: http://en.wikipedia.org/wiki/ACID + Generally, the STM is not needed very often when working with Akka. Some use-cases (that we can think of) are: @@ -60,7 +62,10 @@ makes working with immutable collections fast. They are immutable but with constant time access and modification. They use structural sharing and an insert or update does not ruin the old structure, hence "persistent". Makes working with immutable composite types fast. The persistent datastructures currently -consist of a Map and Vector. +consist of a `Map`_ and `Vector`_. + +.. _Map: http://www.scala-lang.org/api/current/index.html#scala.collection.immutable.Map +.. _Vector: http://www.scala-lang.org/api/current/index.html#scala.collection.immutable.Vector Integration with Actors