From owner-svn-doc-all@freebsd.org Wed Oct 28 13:40:42 2015 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22AAFA1F27A; Wed, 28 Oct 2015 13:40:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFCAA189F; Wed, 28 Oct 2015 13:40:41 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9SDefrZ075846; Wed, 28 Oct 2015 13:40:41 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9SDefKt075845; Wed, 28 Oct 2015 13:40:41 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201510281340.t9SDefKt075845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 28 Oct 2015 13:40:41 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r47693 - head/en_US.ISO8859-1/books/porters-handbook/upgrading X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2015 13:40:42 -0000 Author: mat Date: Wed Oct 28 13:40:40 2015 New Revision: 47693 URL: https://svnweb.freebsd.org/changeset/doc/47693 Log: Whitespace, indentation, translators can ignore. Noticed by: igor Sponsored by: Absolight Modified: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml Wed Oct 28 00:53:13 2015 (r47692) +++ head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml Wed Oct 28 13:40:40 2015 (r47693) @@ -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: - - &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: - - &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 - + + 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* + + 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\* + + + + 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: - - 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. - - 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. - - - Any changes must be validated with - Tools/scripts/MOVEDlint.awk. - - 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 - - + 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 + + 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 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. + + 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 + +