anchor.diff:  
   ### <a id='memory-troubleshoot'></a>Troubleshoot Out Of Memory ###
   
  -A Java app may crash because of insufficient memory on the Garden container or the JVM. See the following sections for help diagnosing the issue.
  +A Java app may crash because of insufficient memory on the Garden container or the JVM on which it runs. See the following sections for help diagnosing and resolving such issues.
   
   #### JVM 
   
  -* **Error**: `java.lang.OutOfMemoryError`. See the following example.
  +* **Error**: `java.lang.OutOfMemoryError`. See the following example:
       <pre class="terminal">
       $ cf logs APP-NAME --recent
       2016-06-20T09:18:51.00+0100 [APP/0] OUT java.lang.OutOfMemoryError: Metaspace   
       </pre>
   * **Cause**: If the JVM cannot garbage-collect enough space to ensure the allocation of a data-structure, it fails with [java.lang.OutOfMemoryError](https://docs.oracle.com/javase/8/docs/api/java/lang/OutOfMemoryError.html). In the example above, JVM has an under-sized `metaspace`. You may see failures in other memory pools, such as `heap`.
  -* **Solution**: Correct the configurations of the JVM. See [Allocate Sufficient Memory](#memory).
  +* **Solution**: Configure the JVM correctly for your app. See [Allocate Sufficient Memory](#memory).
   
   #### Garden Container
  +
  +<p class="note"><strong>Note</strong>: The solutions in this section require configuring the memory calculator, which is a sub-project of the CF Java buildpack that calculates suitable memory settings for Java apps when you push them. See the <a href="https://github.com/cloudfoundry/java-buildpack-memory-calculator">java-buildpack-memory-calculator</a> repository for more information. If you have any question about the memory calculator, you can use the <b>#java-buildpack</b> channel of the <a href="https://cloundfoundry.slack.com">Cloud Foundry</a> Slack organization.</p>
   
   * **Error**: The Garden container terminates the Java process with the `out of memory` event. See the following example:
       <pre class="terminal">
  
positive.code:     ```
  
      In the example above, the overall memory amount reserved by the JVM for representing the stacks of Java threads is `800 * 512k = 400m`.
  
      The right settings for `stack` and `stack_threads` depend on the app code, including the libraries it uses.
      It may even be the case that an app has no upper limit, such as in the case of [cavalier usage](http://dev.bizo.com/2014/06/cached-thread-pool-considered-harmlful.html) of [`CachedThreadPool` executors](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Executors.html#newCachedThreadPool--).
      However, you still must calculate the depth of the thread stacks and how much space the JVM should reserve for each of them.
  
  ### <a id='upload'></a>Troubleshoot Failed Upload ###
  
negative.code: 
      This error appears when the JVM allocates more OS-level memory than the quota requested by the app, such as [through the manifest](https://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html#memory).
  
  * **Cause 1 - Insufficient native memory**: This error commonly means that the JVM requires more `native` memory. In the scope of the Java buildpack and the memory calculator, the term `native` means the memory required for the JVM to work, along with forms of memory not covered in the other classifications of the memory calculator. This includes the memory footprint of OS-level threads, [direct NIO buffers](https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html), code cache, program counters, and more.
  
  * **Solution 1**: Determine how much `native` memory a Java app needs by [measuring it](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/tooldescr007.html) with realistic workloads and fine-tuning it accordingly.
  You can then configure the Java buildpack using the `native` [setting](https://github.com/cloudfoundry/java-buildpack/blob/master/docs/jre-open_jdk_jre.md#memory-sizes) of the memory calculator, as in the example below:
  
      ```
      ---
  