XFA: Sync build and documentation differences with master

README.md

 # PDFium
 
 ## Prerequisites
 
 Get the chromium depot tools via the instructions at
 http://www.chromium.org/developers/how-tos/install-depot-tools (this provides
 the gclient utilty needed below).
 
 Also install Python, Subversion, and Git and make sure they're in your path.
 
@@ skipping 15 matching lines @@
 
 We use the GYP library to generate the build files.
 
 At this point, you have two options. The first option is to use the [Ninja]
 (http://martine.github.io/ninja/) build system (also included with the
 depot\_tools checkout). This is the default as of mid-September, 2015.
 Previously, the second option (platform-specific build files) was the default.
 Most PDFium developers use Ninja, as does our [continuous build system]
 (http://build.chromium.org/p/client.pdfium/).
 
- * On Windows: `build\gyp\_pdfium`
- * For all other platforms: `build/gyp\_pdfium`
+ * On Windows: `build\gyp_pdfium`
+ * For all other platforms: `build/gyp_pdfium`
 
 The second option is to generate platform-specific build files, i.e. Makefiles
 on Linux, sln files on Windows, and xcodeproj files on Mac. To do so, set the
 GYP\_GENERATORS environment variable appropriately (e.g. "make", "msvs", or
 "xcode") before running the above command.
 
 ## Building the code
 
 If you used Ninja, you can build the sample program by: `ninja -C out/Debug
-pdfium\_test` You can build the entire product (which includes a few unit
+pdfium_test` You can build the entire product (which includes a few unit
 tests) by: `ninja -C out/Debug`.
 
 If you're not using Ninja, then building is platform-specific.
 
- * On Linux: `make pdfium\_test`
+ * On Linux: `make pdfium_test`
  * On Mac: `open build/all.xcodeproj`
  * On Windows: open build\all.sln
 
 ## Running the sample program
 
 The pdfium\_test program supports reading, parsing, and rasterizing the pages of
 a .pdf file to .ppm or .png output image files (windows supports two other
-formats). For example: `out/Debug/pdfium\_test --ppm path/to/myfile.pdf`. Note
+formats). For example: `out/Debug/pdfium_test --ppm path/to/myfile.pdf`. Note
 that this will write output images to `path/to/myfile.pdf.<n>.ppm`.
 
 ## Testing
 
 There are currently several test suites that can be run:
 
  * pdfium\_unittests
  * pdfium\_embeddertests
  * testing/tools/run\_corpus\_tests.py
  * testing/tools/run\_javascript\_tests.py
@@ skipping 54 matching lines @@
 ```
 git checkout origin/xfa
 git checkout -b merge_branch
 git branch --set-upstream-to=origin/xfa
 git cherry-pick -x <commit hash>
 git commit --amend # add Merge to XFA
 git cl upload
 ```
 
 Then wait for approval, and `git cl land`