Merge pull request junit-team#372 from matthewfarwell/doc-methodrule

Several javadoc referred to MethodRule when they should have referred to...

src/main/java/org/junit/rules/MethodRule.java

@@ -23,6 +23,8 @@
  *   <li>{@link Timeout}: cause test to fail after a set time</li>
  *   <li>{@link Verifier}: fail test if object state ends up incorrect</li>
  * </ul>
+ * 
+ * Note that {@link MethodRule} is now deprecated, you should be using {@link TestRule} instead.
  */
 @Deprecated
 public interface MethodRule {

src/main/java/org/junit/rules/TestWatcher.java

@@ -14,7 +14,7 @@
  * 	private static String watchedLog;
  * 
  * 	@Rule
- * 	public MethodRule watchman= new TestWatcher() {
+ * 	public TestRule watchman= new TestWatcher() {
  * 		@Override
  * 		protected void failed(Description d) {
  * 			watchedLog+= d + "\n";

src/main/java/org/junit/rules/Timeout.java

@@ -15,7 +15,7 @@
  * 	public static String log;
  * 
  * 	@Rule
- * 	public MethodRule globalTimeout= new Timeout(20);
+ * 	public TestRule globalTimeout= new Timeout(20);
  * 
  * 	@Test
  * 	public void testInfiniteLoop1() {

src/main/java/org/junit/rules/Verifier.java

@@ -13,7 +13,7 @@
  *        private ErrorLog errorLog = new ErrorLog();
  *     
  *        @Rule
- *        public MethodRule verifier = new Verifier() {
+ *        public TestRule verifier = new Verifier() {
  *           @Override public void verify() {
  *              assertTrue(errorLog.isEmpty());
  *           }