-a change to <file>debian/changelog</file>). This can be either a change
-to the upstream source, or a change to the Debian bits of the source.
- <p>
-A binary NMU is a recompilation and upload of a binary package for a
-new architecture. As such, it is usually part of a porting effort. A
-binary NMU is a non-maintainer uploaded binary version of a package
-(often for another architecture), with no source changes required.
-There are many cases where porters must fix problems in the source in
-order to get them to compile for their target architecture; that would
-be considered a source NMU rather than a binary NMU. As you can see,
-we don't distinguish in terminology between porter NMUs and non-porter
-NMUs.
- <p>
-Both classes of NMUs, source and binary, can be lumped by the term
-``NMU''. However, this often leads to confusion, since most people
-think ``source NMU'' when they think ``NMU''. So it's best to be
-careful. In this chapter, if I use the unqualified term ``NMU'', I
-mean both source and binary NMUs.
+a change to <file>debian/changelog</file>). This can be either a
+change to the upstream source, or a change to the Debian bits of the
+source. Note, however, that source NMUs may also include
+architecture-dependent packages, as well as an updated Debian diff
+(or, more rarely, new upstream source as well).
+ <p>
+A binary-only NMU is a recompilation and upload of a binary package
+for a given architecture. As such, it is usually part of a porting
+effort. A binary-only NMU is a non-maintainer uploaded binary version
+of a package, with no source changes required. There are many cases
+where porters must fix problems in the source in order to get them to
+compile for their target architecture; that would be considered a
+source NMU rather than a binary-only NMU. As you can see, we don't
+distinguish in terminology between porter NMUs and non-porter NMUs.
+ <p>
+Both classes of NMUs, source and binary-only, can be lumped by the
+term ``NMU''. However, this often leads to confusion, since most
+people think ``source NMU'' when they think ``NMU''. So it's best to
+be careful. In this chapter, if we use the unqualified term ``NMU'',
+we refer to any type of non-maintainer upload NMUs, whether source and
+binary, or binary-only.