From 2b932a83b64e65539f240d48a34ddfce63505856 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 28 Oct 2015 13:40:40 +0000 Subject: [PATCH] Whitespace, indentation, translators can ignore. Noticed by: igor Sponsored by: Absolight --- .../porters-handbook/upgrading/chapter.xml | 145 +++++++++--------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml index 748d9293b2..a5a615bea3 100644 --- a/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml @@ -13,7 +13,7 @@ When a port is not the most recent version available from the authors, update the local working copy of - /usr/ports. The port might have already been + /usr/ports. The port might have already been updated to the new version. When working with more than a few ports, it will probably be @@ -24,13 +24,13 @@ dependencies. The next step is to see if there is an update already pending. - To do this, there are two options. There is a searchable interface - to the FreeBSD - Problem Report (PR) or bug database. - Select Ports Tree in - the Product dropdown, and enter the name of the port in the - Summary field. + To do this, there are two options. There is a searchable + interface to the FreeBSD Problem + Report (PR) or bug database. Select Ports + Tree in the Product dropdown, and + enter the name of the port in the Summary + field. However, sometimes people forget to put the name of the port into the Summary field in an unambiguous fashion. In that @@ -62,9 +62,10 @@ To create a suitable diff for a single patch, copy the file that needs patching to - something.orig, save the changes to - something and then create the - patch: + something.orig, + save the changes to + something and then + create the patch: &prompt.user; diff -u something.orig something > something.diff @@ -187,8 +188,8 @@ svn.FreeBSD.org - is the &os; public Subversion server. - See Subversion + server. See Subversion mirror sites for more information. @@ -297,87 +298,89 @@ <filename>/usr/ports/UPDATING</filename> - If upgrading the port requires special steps like - changing configuration files or running a specific program, - it must be documented in this file. The format of - an entry in this file is as follows: + If upgrading the port requires special steps like + changing configuration files or running a specific program, + it must be documented in this file. The format of + an entry in this file is as follows: - YYYYMMDD: + YYYYMMDD: AFFECTS: users of portcategory/portname AUTHOR: Your name <Your email address> Special instructions - - When including exact - portmaster, - portupgrade, and/or - pkg instructions, please make sure - to get the shell escaping right. For example, do - not use: + + When including exact + portmaster, + portupgrade, and/or + pkg instructions, please make + sure + to get the shell escaping right. For example, do + not use: - &prompt.root; pkg delete -g -f docbook-xml* docbook-sk* docbook[2345]??-* docbook-4* + &prompt.root; pkg delete -g -f docbook-xml* docbook-sk* docbook[2345]??-* docbook-4* - As shown, the command will only work with - bourne shells. Instead, use the - form shown below, which will work with both - bourne shell and - c-shell: + As shown, the command will only work with + bourne shells. Instead, use the + form shown below, which will work with both + bourne shell and + c-shell: - &prompt.root; pkg delete -g -f docbook-xml\* docbook-sk\* docbook\[2345\]\?\?-\* docbook-4\* - + &prompt.root; pkg delete -g -f docbook-xml\* docbook-sk\* docbook\[2345\]\?\?-\* docbook-4\* + - - It is recommended that the AFFECTS line contains a glob - matching all the ports affected by the entry so that automated - tools can parse it as easily as possible. If an update - concerns all the existing BIND 9 - versions the AFFECTS content must be - users of dns/bind9*, it must - not be users of BIND - 9 - + + It is recommended that the AFFECTS line contains a glob + matching all the ports affected by the entry so that + automated tools can parse it as easily as possible. If an + update concerns all the existing BIND + 9 versions the AFFECTS + content must be users of dns/bind9*, it + must not be users of BIND + 9 + <filename>/usr/ports/MOVED</filename> - This file is used to - list moved or removed ports. Each line in the file is made - up of the name of the port, where the port was moved, when, - and why. If the port was removed, the section detailing where - it was moved can be left blank. Each section must be - separated by the | (pipe) character, like - so: + This file is used to + list moved or removed ports. Each line in the file is made + up of the name of the port, where the port was moved, when, + and why. If the port was removed, the section detailing where + it was moved can be left blank. Each section must be + separated by the | (pipe) character, like + so: - old name|new name (blank for deleted)|date of move|reason + old name|new name (blank for deleted)|date of move|reason - The date must be entered in the form - YYYY-MM-DD. New entries are added to - the top of the file to keep it in reverse chronological order, - with the last entry first. + The date must be entered in the form + YYYY-MM-DD. New entries are added to + the top of the file to keep it in reverse chronological order, + with the last entry first. - If a port was removed but has since been restored, - delete the line in this file that states that it was - removed. + If a port was removed but has since been restored, + delete the line in this file that states that it was + removed. - If a port was renamed and then renamed back to its original - name, add a new one with the intermediate name to the - old name, and remove the old entry as to not create a - loop. + If a port was renamed and then renamed back to its + original name, add a new one with the intermediate name to the + old name, and remove the old entry as to not create a + loop. - - Any changes must be validated with - Tools/scripts/MOVEDlint.awk. + + Any changes must be validated with + Tools/scripts/MOVEDlint.awk. - If using a ports directory other than /usr/ports, use: + If using a ports directory other than + /usr/ports, use: - - &prompt.user; cd /home/user/ports -&prompt.user; env PORTSDIR=$PWD Tools/scripts/MOVEDlint.awk - - + + &prompt.user; cd /home/user/ports + &prompt.user; env PORTSDIR=$PWD Tools/scripts/MOVEDlint.awk + +