Date: Wed, 22 Aug 2012 18:11:32 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39420 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201208221811.q7MIBWKH073421@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Wed Aug 22 18:11:32 2012 New Revision: 39420 URL: http://svn.freebsd.org/changeset/doc/39420 Log: Improve wording. Suggested by: wblock Approved by: joel (mentor) Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.sgml Wed Aug 22 16:51:24 2012 (r39419) +++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml Wed Aug 22 18:11:32 2012 (r39420) @@ -1452,7 +1452,7 @@ $target - head/$source:$P,$Q,$R</screen> all paths are relative to the top of the svn repository. for more information on the directory layout, see <xref linkend="subversion-primer-base-layout">.</para> - <para>The first step is to check the existing mergeinfo.</para> + <para>The first step is to inspect the existing mergeinfo.</para> <screen>&prompt.user; <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput></screen> @@ -1466,9 +1466,9 @@ U stable/9/share/man/man4/netmap.4 'stable/9/share/man/man4': U stable/9/share/man/man4</screen> - <para>Check that the merge info is still ok; the revision - number of the merged revision should be added. Once this - is checked, the only thing left is the actual commit.</para> + <para>Check that the revision number of the merged revision + has been added. Once this is verified, the only thing left + is the actual commit.</para> <screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen> </sect5>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208221811.q7MIBWKH073421>