Change-Id: Ifc3b2c4d51e935f8cb4c5514e6c1f0c4bb9007ba
Reviewed-on: https://code.wireshark.org/review/30180
Reviewed-by: Guy Harris <guy@alum.mit.edu>
==== Source code distributions
It's still common for developers for UNIX-like platforms to give the
-enduser a source tarball and let the user compile it on their target
+end user a source tarball and let the user compile it on their target
machine (configure make make install). However, for different UNIX
and UNIX-like systems, such as Linux distributions, it's becoming more
common to release binary packages (e.g., .deb or .rpm files) these days.
If you have changed your source tree, you have to merge the official
changes since the last update into your source tree. You will install
the content of the `.tar.xz` file into a new directory and use a good
-merge tool (e.g. http://winmerge.sourceforge.net/[]for Windows to bring
+merge tool (e.g. http://winmerge.sourceforge.net/[]for Windows) to bring
your personal source tree in sync with the official sources again.
This method can be problematic and can be much more difficult and