diff options
| author | Sevan Janiyan <sevan@FreeBSD.org> | 2017-04-04 13:16:44 +0000 |
|---|---|---|
| committer | Sevan Janiyan <sevan@FreeBSD.org> | 2017-04-04 13:16:44 +0000 |
| commit | 4750fff1d5a5a25ba1f0a4152a011875947989ac (patch) | |
| tree | d53b6b0cae74716f5cac8bb80b7a0f6fdcdb3942 /en_US.ISO8859-1/books/handbook/cutting-edge | |
| parent | ed3b6bc268ddb61add1a20024ad477c002e50041 (diff) | |
| download | doc-4750fff1d5a5a25ba1f0a4152a011875947989ac.tar.gz doc-4750fff1d5a5a25ba1f0a4152a011875947989ac.zip | |
Reword sentences to improve readability.
PR: 218072
Submitted by: Samuel Breese <samuel AT chame co>
Approved by: bcr (mentor)
Differential Revision: https://reviews.freebsd.org/D10261
Notes
Notes:
svn path=/head/; revision=50128
Diffstat (limited to 'en_US.ISO8859-1/books/handbook/cutting-edge')
| -rw-r--r-- | en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml index f8af0af318..27129b69b9 100644 --- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml @@ -1704,9 +1704,9 @@ Script started, output file is /var/tmp/mw.out</screen> replace the current file with the new one. For most unmodified files, this is the best option.</para> - <para>Choosing to merge the file will present a text editor, and - the contents of both files. The files can be merged by - reviewing both files side by side on the screen, and choosing + <para>Choosing to merge the file will present a text editor with + the contents of both files open. The files can be merged by + reviewing both files side by side on the screen and choosing parts from both to create a finished product. When the files are compared side by side, <keycap>l</keycap> selects the left contents and <keycap>r</keycap> selects contents from the |