From owner-svn-doc-projects@FreeBSD.ORG Thu Jul 25 08:52:39 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2B83C67A; Thu, 25 Jul 2013 08:52:39 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1713B2799; Thu, 25 Jul 2013 08:52:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6P8qcWd046902; Thu, 25 Jul 2013 08:52:38 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6P8qc79046899; Thu, 25 Jul 2013 08:52:38 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201307250852.r6P8qc79046899@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 25 Jul 2013 08:52:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r42432 - in projects/db5: en_US.ISO8859-1/books/fdp-primer/docbook-markup en_US.ISO8859-1/books/fdp-primer/editor-config zh_CN.GB2312/books/handbook/bsdinstall X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jul 2013 08:52:39 -0000 Author: gabor Date: Thu Jul 25 08:52:38 2013 New Revision: 42432 URL: http://svnweb.freebsd.org/changeset/doc/42432 Log: - MFH Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/db5/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml projects/db5/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml Directory Properties: projects/db5/ (props changed) projects/db5/en_US.ISO8859-1/ (props changed) projects/db5/zh_CN.GB2312/ (props changed) Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Thu Jul 25 08:50:43 2013 (r42431) +++ projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Thu Jul 25 08:52:38 2013 (r42432) @@ -164,6 +164,8 @@ + + @@ -197,6 +199,8 @@ + + @@ -228,6 +232,8 @@ + + @@ -276,6 +282,8 @@ + + @@ -304,6 +312,8 @@ + + @@ -314,14 +324,14 @@ &prompt.root; - &prompt.root; + &prompt.root; The root user prompt. &prompt.user; - &prompt.user; + &prompt.user; A prompt for an unprivileged user. Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml ============================================================================== --- projects/db5/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml Thu Jul 25 08:50:43 2013 (r42431) +++ projects/db5/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml Thu Jul 25 08:52:38 2013 (r42432) @@ -84,38 +84,52 @@ augroup END editors/nano or editors/nano-devel. - Configuration: + + Configuration - &prompt.user; cp /usr/local/share/nano/xml.nanorc ~/.nanorc + Copy the sample XML syntax highlight + file to the user's home directory: - Use printf to add lines to the - configuration file. Some have embedded Tab - characters, making this easier than editing the file - directly: + &prompt.user; cp /usr/local/share/nano/xml.nanorc ~/.nanorc - &prompt.user; printf '# trailing whitespace\n' >> ~/.nanorc -&prompt.user; printf 'color ,blue "[[:space:]]+$"\n' >> ~/.nanorc -&prompt.user; printf '# multiples of eight spaces at the start a line\n' >> ~/.nanorc -&prompt.user; printf '# (after zero or more tabs) should be a tab\n' >> ~/.nanorc -&prompt.user; printf 'color ,blue "^([\t]*[ ]{8})+"\n' >> ~/.nanorc -&prompt.user; printf '# tabs after spaces\n' >> ~/.nanorc -&prompt.user; printf 'color ,yellow "( )+\t"\n' >> ~/.nanorc -&prompt.user; printf '# lines longer than 70 characters\n' >> ~/.nanorc -&prompt.user; printf 'color ,red "^(([ ]{2})+|(\t+))*[ ]{1}[^ ]{1}"\n' >> ~/.nanorc + Add these lines to the new + ~/.nanorc. - Specify additional helpful options when running the - editor. + # trailing whitespace +color ,blue "[[:space:]]+$" +# multiples of eight spaces at the start a line +# (after zero or more tabs) should be a tab +color ,blue "^([TAB]*[ ]{8})+" +# tabs after spaces +color ,yellow "( )+TAB" +# highlight indents that have an odd number of spaces +color ,red "^(([ ]{2})+|(TAB+))*[ ]{1}[^ ]{1}" +# lines longer than 70 characters +color ,yellow "^(.{71})|(TAB.{63})|(TAB{2}.{55})|(TAB{3}.{47}).+$" - &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml + Process the file to create embedded tabs: - Users of &man.csh.1; can define an alias in - ~/.cshrc to automate these options: + &prompt.user; perl -i'' -pe 's/TAB/\t/g' ~/.nanorc + - alias nano "nano -AKipwz -r 70 -T8" + + Use - After the alias is defined, the options will be added - automatically: + Specify additional helpful options when running the + editor: - &prompt.user; nano chapter.xml + &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml + + Users of &man.csh.1; can define an alias in + ~/.cshrc to automate these + options: + + alias nano "nano -AKipwz -r 70 -T8" + + After the alias is defined, the options will be added + automatically: + + &prompt.user; nano chapter.xml + Modified: projects/db5/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml ============================================================================== --- projects/db5/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml Thu Jul 25 08:50:43 2013 (r42431) +++ projects/db5/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml Thu Jul 25 08:52:38 2013 (r42432) @@ -1190,8 +1190,6 @@ Trying to mount root from cd9660:/dev/is BSD - - 参见 &man.bsdlabel.8;。 不带 MBR 的 BSD Label， 有时也称作危险的专用模式， “dangerously dedicated mode”。 请参阅 &man.bsdlabel.8;。 @@ -1333,6 +1331,8 @@ Trying to mount root from cd9660:/dev/is freebsd-boot 512K + +