- Fix a typo
- Standardize on en_US spellings for synchronize and summarize Approved by: gjb
This commit is contained in:
parent
d90b55ea76
commit
5b796df221
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=39574
1 changed files with 4 additions and 4 deletions
|
@ -545,7 +545,7 @@
|
|||
|
||||
<para>When committing from a working copy like the one above,
|
||||
<acronym>SVN</acronym> will commit directly to the upstream
|
||||
repository, then syncronise the mirror.</para>
|
||||
repository, then synchronise the mirror.</para>
|
||||
|
||||
<para>However, the <quote>killer app</quote> for
|
||||
<acronym>SVK</acronym> is the ability to work without a
|
||||
|
@ -558,7 +558,7 @@
|
|||
<para>Once again, any path can be used, it does not have to
|
||||
specifically be the one in the example.</para>
|
||||
|
||||
<para>Before use, the local branch has to be synchronised,
|
||||
<para>Before use, the local branch has to be synchronized,
|
||||
like so:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>svk pull //local/freebsd/head</userinput></screen>
|
||||
|
@ -1241,7 +1241,7 @@
|
|||
|
||||
<para>The rules for selecting the merge target (the
|
||||
directory that you will merge the changes to) can be
|
||||
summarised as follows:</para>
|
||||
summarized as follows:</para>
|
||||
|
||||
<orderedlist>
|
||||
<listitem>
|
||||
|
@ -2958,7 +2958,7 @@ U stable/9/share/man/man4/netmap.4
|
|||
a no-brainer and requires some feedback first. People
|
||||
really do not mind sweeping changes if the result is
|
||||
something clearly better than what they had before, they
|
||||
just do not like being <emphasis>surprised</emphasis> by
|
||||
just do not like being <emphasis>surprized</emphasis> by
|
||||
those changes. The very best way of making sure that
|
||||
you are on the right track is to have your code reviewed by
|
||||
one or more other committers.</para>
|
||||
|
|
Loading…
Reference in a new issue