aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2013-07-25 08:52:38 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2013-07-25 08:52:38 +0000
commitf82dc24efee22cac294b867ca998e285e4fb0aee (patch)
treec4728e25cd146631a663eaedfbc8e9d09cdd9cda
parentaa753498092fa2d3199cff953ae2e45a7bc61e30 (diff)
downloaddoc-f82dc24efee22cac294b867ca998e285e4fb0aee.tar.gz
doc-f82dc24efee22cac294b867ca998e285e4fb0aee.zip
- MFH
Notes
Notes: svn path=/projects/db5/; revision=42432
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml14
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml62
-rw-r--r--zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml4
3 files changed, 52 insertions, 28 deletions
diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index 9cf9617c8b..1fea4515bc 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -164,6 +164,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -197,6 +199,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -228,6 +232,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -276,6 +282,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -304,6 +312,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -314,14 +324,14 @@
<row>
<entry><literal>&amp;prompt.root;</literal></entry>
- <entry><literal>&prompt.root;</literal></entry>
+ <entry>&prompt.root;</entry>
<entry>The <username>root</username> user
prompt.</entry>
</row>
<row>
<entry><literal>&amp;prompt.user;</literal></entry>
- <entry><literal>&prompt.user;</literal></entry>
+ <entry>&prompt.user;</entry>
<entry>A prompt for an unprivileged user.</entry>
</row>
diff --git a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
index 68e5c76ce5..485ec0a3b1 100644
--- a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
@@ -84,38 +84,52 @@ augroup END</programlisting>
<filename role="package">editors/nano</filename> or
<filename role="package">editors/nano-devel</filename>.</para>
- <para>Configuration:</para>
+ <sect2 id="editor-config-nano-config">
+ <title>Configuration</title>
- <screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
+ <para>Copy the sample <acronym>XML</acronym> syntax highlight
+ file to the user's home directory:</para>
- <para>Use <command>printf</command> to add lines to the
- configuration file. Some have embedded <keycap>Tab</keycap>
- characters, making this easier than editing the file
- directly:</para>
+ <screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
- <screen>&prompt.user; <userinput>printf '# trailing whitespace\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,blue "[[:space:]]+$"\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# multiples of eight spaces at the start a line\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# (after zero or more tabs) should be a tab\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,blue "^([\t]*[ ]{8})+"\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# tabs after spaces\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,yellow "( )+\t"\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# lines longer than 70 characters\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,red "^(([ ]{2})+|(\t+))*[ ]{1}[^ ]{1}"\n' >> ~/.nanorc</userinput></screen>
+ <para>Add these lines to the new
+ <filename>~/.nanorc</filename>.</para>
- <para>Specify additional helpful options when running the
- editor.</para>
+ <programlisting># 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}).+$"</programlisting>
- <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
+ <para>Process the file to create embedded tabs:</para>
- <para>Users of &man.csh.1; can define an alias in
- <filename>~/.cshrc</filename> to automate these options:</para>
+ <screen>&prompt.user; <userinput>perl -i'' -pe 's/TAB/\t/g' ~/.nanorc</userinput></screen>
+ </sect2>
- <programlisting>alias nano "nano -AKipwz -r 70 -T8"</programlisting>
+ <sect2 id="editor-config-nano-use">
+ <title>Use</title>
- <para>After the alias is defined, the options will be added
- automatically:</para>
+ <para>Specify additional helpful options when running the
+ editor:</para>
- <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
+
+ <para>Users of &man.csh.1; can define an alias in
+ <filename>~/.cshrc</filename> to automate these
+ options:</para>
+
+ <programlisting>alias nano "nano -AKipwz -r 70 -T8"</programlisting>
+
+ <para>After the alias is defined, the options will be added
+ automatically:</para>
+
+ <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
+ </sect2>
</sect1>
</chapter>
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index 5798715c08..487ad1a9bf 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -1190,8 +1190,6 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<row>
<entry>BSD</entry>
- <entry>
- 参见 &man.bsdlabel.8;。</entry>
<entry>不带 MBR 的 BSD Label, 有时也称作危险的专用模式,
“dangerously dedicated mode”。 请参阅
&man.bsdlabel.8;。</entry>
@@ -1333,6 +1331,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<row>
<entry><literal>freebsd-boot</literal></entry>
<entry><literal>512K</literal></entry>
+ <entry/>
+ <entry/>
</row>
<row>