Changeset View
Changeset View
Standalone View
Standalone View
en_US.ISO8859-1/articles/committers-guide/article.xml
| Show First 20 Lines • Show All 4,004 Lines • ▼ Show 20 Lines | <qandaentry> | ||||
| <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput> | <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput> | ||||
| &prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable></userinput></screen> | &prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable></userinput></screen> | ||||
| <para>Pick a date that is before the removal but after | <para>Pick a date that is before the removal but after | ||||
| the last true commit.</para> | the last true commit.</para> | ||||
| </step> | </step> | ||||
| <step> | <step> | ||||
| <para>Perform whatever changes are necessary to make | <para>Perform whatever changes are necessary to make | ||||
bcr: I would add a sentence stop at the comma here. Otherwise, this whole paragraph consists of only… | |||||
Not Done Inline ActionsThe use of "Perform whatever" is a little weird. How about: Make the changes necessary to get the port working again. wblock: The use of "Perform whatever" is a little weird. How about:
Make the changes necessary to get… | |||||
| the port work again. If it was deleted because the | the port work again. If it was deleted because the | ||||
| distfiles are no longer available you will need to | distfiles are no longer available you will need to | ||||
Not Done Inline ActionsThe meaning of "last true commit" is kind of unclear. wblock: The meaning of "last true commit" is kind of unclear. | |||||
Not Done Inline ActionsNeeds a comma at the pause, and avoid using "you": distfiles are no longer available, either volunteer to host the distfiles, or find someone wblock: Needs a comma at the pause, and avoid using "you":
distfiles are no longer available, either… | |||||
| volunteer to host them yourself, or find someone | volunteer to host them yourself, or find someone | ||||
| else to do so.</para> | else to do so.</para> | ||||
| </step> | </step> | ||||
| <step> | <step> | ||||
| <para><command>svn add</command> or | <para>If some files have been added, or removed during | ||||
| <command>svn remove</command> any appropriate | the resurection process, use <command>svn | ||||
| files.</para> | add</command> or <command>svn remove</command> | ||||
| appropriately.</para> | |||||
Not Done Inline ActionsIf I remember my school english correctly, there is something missing here (*looks to native speakers for help*). I think it should say: If some files have been added, or were removed during ... bcr: If I remember my school english correctly, there is something missing here (*looks to native… | |||||
Not Done Inline Actions"appropriately" must be interpreted by the reader. It would be helpful to expand on that, like "to make sure the source control tracking of those files is corrected." (There's probably a better way to say that.) wblock: "appropriately" must be interpreted by the reader. It would be helpful to expand on that, like… | |||||
| </step> | </step> | ||||
| <step> | <step> | ||||
| <para>Restore the <varname>SUBDIR</varname> listing of | <para>Restore the <varname>SUBDIR</varname> listing of | ||||
| the port in the parent directory | the port in the parent directory | ||||
| <filename>Makefile</filename>, and delete the entry | <filename>Makefile</filename>, and delete the entry | ||||
| from <filename>ports/MOVED</filename>.</para> | from <filename>ports/MOVED</filename>.</para> | ||||
| </step> | </step> | ||||
| ▲ Show 20 Lines • Show All 607 Lines • ▼ Show 20 Lines | <answer> | ||||
| maintainer should be contacted to find out why the | maintainer should be contacted to find out why the | ||||
| distfile has changed.</para> | distfile has changed.</para> | ||||
| </answer> | </answer> | ||||
| </qandaentry> | </qandaentry> | ||||
| </qandadiv> | </qandadiv> | ||||
| </qandaset> | </qandaset> | ||||
| </sect1> | </sect1> | ||||
| <sect1 xml:id="non-committers"> | <sect1 xml:id="non-committers"> | ||||
Not Done Inline ActionsEnd the question with a question mark. wblock: End the question with a question mark. | |||||
| <title>Issues Specific to Developers Who Are Not | <title>Issues Specific to Developers Who Are Not | ||||
| Committers</title> | Committers</title> | ||||
| <para>A few people who have access to the &os; machines do not | <para>A few people who have access to the &os; machines do not | ||||
| have commit bits. Almost all of this document will apply to | have commit bits. Almost all of this document will apply to | ||||
| these developers as well (except things specific to commits and | these developers as well (except things specific to commits and | ||||
| the mailing list memberships that go with them). In particular, | the mailing list memberships that go with them). In particular, | ||||
| we recommend that you read:</para> | we recommend that you read:</para> | ||||
| <itemizedlist> | <itemizedlist> | ||||
| <listitem> | <listitem> | ||||
Not Done Inline ActionsThis should be "for doing so", but is not really needed: merged, and respond with the proper procedure. wblock: This should be "for doing so", but is not really needed:
merged, and respond with the proper… | |||||
| <para><link linkend="admin">Administrative | <para><link linkend="admin">Administrative | ||||
| Details</link></para> | Details</link></para> | ||||
| </listitem> | </listitem> | ||||
Not Done Inline ActionsNo comma after "number". wblock: No comma after "number". | |||||
| <listitem> | <listitem> | ||||
| <para><link | <para><link | ||||
| linkend="conventions-everyone">Conventions</link></para> | linkend="conventions-everyone">Conventions</link></para> | ||||
Not Done Inline ActionsThis can be reworded into a smoother sentence with less pauses: A script is provided to automate merging a specific commit: wblock: This can be reworded into a smoother sentence with less pauses:
A script is provided to… | |||||
| <note> | <note> | ||||
Not Done Inline ActionsPassive->Active: s/It can be/It is/ wblock: Passive->Active: s/It can be/It is/ | |||||
| <para>You should get your mentor to add you to the | <para>You should get your mentor to add you to the | ||||
| <quote>Additional Contributors</quote> | <quote>Additional Contributors</quote> | ||||
| (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.xml</filename>), | (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.xml</filename>), | ||||
| if you are not already listed there.</para> | if you are not already listed there.</para> | ||||
| </note> | </note> | ||||
| </listitem> | </listitem> | ||||
| <listitem> | <listitem> | ||||
| ▲ Show 20 Lines • Show All 219 Lines • Show Last 20 Lines | |||||
I would add a sentence stop at the comma here. Otherwise, this whole paragraph consists of only one long sentence. Instead, it would read like this:
It is also possible to specify a date. In that case ... last true commit.
Don't forget to add an extra space after the sentence stop.