Permalink
Browse files

Fix javadoc for either.

  • Loading branch information...
1 parent 4f49c9c commit 351af6fa6a08ddf51f03525d8cc4616d45f5caf1 @dsaff dsaff committed Apr 15, 2011
Showing with 4 additions and 1 deletion.
  1. +3 −0 acknowledgements.txt
  2. +1 −1 src/main/java/org/junit/matchers/JUnitMatchers.java
View
@@ -80,3 +80,6 @@
2011 Apr 15
reinholdfuereder@github for initial test for GH-39
+
+2011 Apr 15
+ ububenheimer@github for bug report https://github.com/KentBeck/junit/issues/208
@@ -74,7 +74,7 @@
/**
* This is useful for fluently combining matchers where either may pass, for example:
* <pre>
- * assertThat(string, both(containsString("a")).and(containsString("b")));
+ * assertThat(string, either(containsString("a")).or(containsString("b")));
* </pre>
*/
public static <T> CombinableMatcher<T> either(Matcher<T> matcher) {

0 comments on commit 351af6f

Please sign in to comment.