Permalink
Browse files

fixed some typos

  • Loading branch information...
1 parent 6641a3b commit 543739a8c3a5de58f139d572b4581f250259f44d @josharnold52 josharnold52 committed Oct 11, 2011
@@ -55,7 +55,7 @@ import CanBuildFromWithZipper.ElemsWithContext
* parent by replacing its holes with the nodes from the Zipper, as determined by the replacement map.
* A formal definition of `unselect` can be found below.
*
- * Certain "modify" operations on a `Zipper` will propogate the zipper context to the result.
+ * Certain "modify" operations on a `Zipper` will propagate the zipper context to the result.
* The new Zipper's `unselect` method can then be viewed as applying
* these modifications back to the parent tree. Currently, the following methods
* support this propagation of the zipper context:
@@ -67,7 +67,7 @@ import CanBuildFromWithZipper.ElemsWithContext
* the replacement map to the new Zipper. The parent and holes of the new Zipper are always the same
* as those of the original.
*
- * Of course, propogation is only possible if the result can legally be a `Zipper`. Replacing a `Node`
+ * Of course, propagation is only possible if the result can legally be a `Zipper`. Replacing a `Node`
* with a `String`, for example, will result in an undecorated `IndexedSeq` because the result violates
* Zipper's type bounds.
*
@@ -94,8 +94,8 @@ import CanBuildFromWithZipper.ElemsWithContext
* conflicted holes. In particular, if modifications to a conflicted element are limited to its top-level properties
* (`name`, `attributes`, etc.), then the default strategy will apply those changes while preserving any modifications
* made to those descendant nodes also present in the Zipper. However, if the `children` property of a conflicted element
- * is directly modified, then the default strategy's behavior is formally unspecified. Currently it uses a hueristic
- * algortihm to resolve conflicts, but its details may change in a future release.
+ * is directly modified, then the default strategy's behavior is formally unspecified. Currently it uses a heuristic
+ * algorithm to resolve conflicts, but its details may change in a future release.
*
* Of the [[com.codecommit.antixml.Selectable]] operators, only `\\` is capable of producing conflicts.
* The `select`, `\`, and `\\!` operators always produce conflict-free Zippers.
@@ -42,7 +42,7 @@ import scala.collection.immutable.IndexedSeq
* that explicitly replaced `original` via modifications made to the Zipper.
* @param lastDirectUpdate  the largest update time of any direct update to the hole. If `directUpdates` is empty, this
* will indicate the time that the node was removed.
- * @param indirectUpdate  the indirect update for the hole and its associated update time. This node's decendants contains
+ * @param indirectUpdate  the indirect update for the hole and its associated update time. This node's descendants contains
* the results of all the updates made to the descendant holes causing the conflict. It's top-level attributes are the
* same as those of `original`
* @see [[com.codecommit.antixml.Zipper]], [[com.codecommit.antixml.ZipperMergeStrategy]]

0 comments on commit 543739a

Please sign in to comment.