Date: Tue, 4 Apr 2017 13:16:44 +0000 (UTC) From: Sevan Janiyan <sevan@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50128 - head/en_US.ISO8859-1/books/handbook/cutting-edge Message-ID: <201704041316.v34DGiQ6085424@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sevan Date: Tue Apr 4 13:16:44 2017 New Revision: 50128 URL: https://svnweb.freebsd.org/changeset/doc/50128 Log: 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 Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue Apr 4 13:13:10 2017 (r50127) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue Apr 4 13:16:44 2017 (r50128) @@ -1704,9 +1704,9 @@ Script started, output file is /var/tmp/ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704041316.v34DGiQ6085424>