Trac #51, #59: Minor clean-up after review.
diff --git a/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java
index c78cf81..d9f460d 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java
@@ -45,13 +45,13 @@
 	}

 

 	@Test

-	public void testGetFile() {

+	public void testGetDestile() {

 		AgentOptions options = new AgentOptions("destfile=/var/test.exec");

 		assertEquals("/var/test.exec", options.getDestfile());

 	}

 

 	@Test

-	public void testSetFile() {

+	public void testSetDestile() {

 		AgentOptions options = new AgentOptions();

 		options.setDestfile("/var/test.exec");

 		assertEquals("/var/test.exec", options.getDestfile());

@@ -59,19 +59,19 @@
 	}

 

 	@Test

-	public void testGetMergeTrue() {

+	public void testGetAppendTrue() {

 		AgentOptions options = new AgentOptions("append=true");

 		assertTrue(options.getAppend());

 	}

 

 	@Test

-	public void testGetMergeFalse() {

+	public void testGetAppendFalse() {

 		AgentOptions options = new AgentOptions("append=false");

 		assertFalse(options.getAppend());

 	}

 

 	@Test

-	public void testSetMergeTrue() {

+	public void testSetAppendTrue() {

 		AgentOptions options = new AgentOptions();

 		options.setAppend(true);

 		assertTrue(options.getAppend());

@@ -79,7 +79,7 @@
 	}

 

 	@Test

-	public void testSetMergeFalse() {

+	public void testSetAppendFalse() {

 		AgentOptions options = new AgentOptions();

 		options.setAppend(false);

 		assertFalse(options.getAppend());

diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index a0d8633..ff640e8 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -20,8 +20,10 @@
 

 <h3>API Changes</h3>

 <ul>

-  <li>Agent option file changed to destfile</li>

-  <li>Agent option merge changed to append</li>

+  <li>Agent option and Ant task parameter <code>file</code> changed to

+      <code>destfile</code> (Trac #59).</li>

+  <li>Agent option and Ant task parameter <code>merge</code> changed to

+      <code>append</code> (Trac #51).</li>

 </ul>

 

 <h3>New Features</h3>