svn commit: r50805 - in head/en_US.ISO8859-1: articles/fonts articles/freebsd-update-server articles/hubs books/developers-handbook/ipv6 books/developers-handbook/tools books/handbook/network-serve...
Mathieu Arnold
mat at FreeBSD.org
Thu Sep 7 11:56:19 UTC 2017
Author: mat
Date: Thu Sep 7 11:56:16 2017
New Revision: 50805
URL: https://svnweb.freebsd.org/changeset/doc/50805
Log:
Fix some extra spacing in screen entries.
While there, replace some with programlisting when more suited.
Sponsored by: Absolight
Modified:
head/en_US.ISO8859-1/articles/fonts/article.xml
head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
head/en_US.ISO8859-1/articles/hubs/article.xml
head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
Modified: head/en_US.ISO8859-1/articles/fonts/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/fonts/article.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/articles/fonts/article.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -307,7 +307,7 @@
look like:</para>
<informalexample>
- <screen>-bitstream-charter-medium-r-normal-xxx-0-0-0-0-p-0-iso8859-1
+ <programlisting>-bitstream-charter-medium-r-normal-xxx-0-0-0-0-p-0-iso8859-1
| | | | | | | | | | | | \ \
| | | | | \ \ \ \ \ \ \ +----+- character set
| | | | \ \ \ \ \ \ \ +- average width
@@ -317,7 +317,7 @@
| | | \ \ \ \ +- points
| | | \ \ \ +- pixels
| | | \ \ \
- foundry family weight slant width additional style</screen>
+ foundry family weight slant width additional style</programlisting>
</informalexample>
<para>A new name needs to be created for each new font. If you
@@ -438,8 +438,7 @@ end readonly def
simply using
<informalexample>
- <screen>…-normal-r-normal-…-p-…
- </screen>
+ <screen>…-normal-r-normal-…-p-…</screen>
</informalexample>
as the name, and then use
@@ -725,8 +724,7 @@ EOF</userinput>
<para>In the work area, you will need to make the utility.
Just type:</para>
- <screen><prompt>#</prompt> <userinput>make -f Makefile.sub afmtodit</userinput>
- </screen>
+ <screen><prompt>#</prompt> <userinput>make -f Makefile.sub afmtodit</userinput></screen>
<para>You may also need to copy
<filename>/usr/contrib/groff/devps/generate/textmap</filename>
@@ -745,8 +743,7 @@ EOF</userinput>
<para>Create the <filename>.afm</filename> file by
typing:</para>
- <screen><prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps <replaceable>TTF_name</replaceable> <replaceable>PS_font_name</replaceable> <replaceable>AFM_name</replaceable></userinput>
- </screen>
+ <screen><prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps <replaceable>TTF_name</replaceable> <replaceable>PS_font_name</replaceable> <replaceable>AFM_name</replaceable></userinput></screen>
<para>Where, <replaceable>TTF_name</replaceable> is your
TrueType font file, <replaceable>PS_font_name</replaceable>
@@ -770,8 +767,7 @@ EOF</userinput>
Aladdin Ghostscript 5.10 (1997-11-23)
Copyright (C) 1997 Aladdin Enterprises, Menlo Park, CA. All rights reserved.
This software comes with NO WARRANTY: see the file PUBLIC for details.
-Converting 3of9.ttf to 3of9.pfa and 3of9.afm.
- </screen>
+Converting 3of9.ttf to 3of9.pfa and 3of9.afm.</screen>
<para>If you want the converted fonts to be stored in
<filename>A.pfa</filename> and <filename>B.afm</filename>,
@@ -781,8 +777,7 @@ Converting 3of9.ttf to 3of9.pfa and 3of9.afm.
Aladdin Ghostscript 5.10 (1997-11-23)
Copyright (C) 1997 Aladdin Enterprises, Menlo Park, CA. All rights reserved.
This software comes with NO WARRANTY: see the file PUBLIC for details.
-Converting 3of9.ttf to A.pfa and B.afm.
- </screen>
+Converting 3of9.ttf to A.pfa and B.afm.</screen>
</listitem>
<listitem>
@@ -798,9 +793,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
<filename>generate/textmap</filename> as being in this
directory.)</para>
- <screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm \
- generate/textmap <replaceable>PS_font_name</replaceable></userinput>
- </screen>
+ <screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm generate/textmap <replaceable>PS_font_name</replaceable></userinput></screen>
<para>Where, <filename>file.afm</filename> is the
<replaceable>AFM_name</replaceable> created by
@@ -812,10 +805,8 @@ Converting 3of9.ttf to A.pfa and B.afm.
<command>tiff2pf.ps</command> command above, then the 3of9
Barcode font can be created using the command:</para>
- <screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc 3of9.afm \
- generate/textmap 3of9</userinput>
- </screen>
-
+ <screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc 3of9.afm generate/textmap 3of9</userinput></screen>
+
<para>Ensure that the resulting
<replaceable>PS_font_name</replaceable> file (e.g.,
<filename>3of9</filename> in the example above) is located
Modified: head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -785,15 +785,15 @@ the new builds.</screen>
release and architecture and you are ready to build off your
custom release.</para>
- <screen># Compare ${WORKDIR}/release and ${WORKDIR}/$1, identify which parts
- # of the world|doc subcomponent are missing from the latter, and
- # build a tarball out of them.
- findextradocs () {
- }
+ <programlisting># Compare ${WORKDIR}/release and ${WORKDIR}/$1, identify which parts
+# of the world|doc subcomponent are missing from the latter, and
+# build a tarball out of them.
+findextradocs () {
+}
- # Add extra docs to ${WORKDIR}/$1
- addextradocs () {
- }</screen>
+# Add extra docs to ${WORKDIR}/$1
+addextradocs () {
+}</programlisting>
</listitem>
<listitem>
<para>Adding <option>-j
@@ -806,7 +806,7 @@ the new builds.</screen>
recommended, as it may cause the build to become
unreliable.</para>
- <screen> # Build the world
+ <programlisting> # Build the world
log "Building world"
cd /usr/src &&
make -j 2 ${COMPATFLAGS} buildworld 2>&1
@@ -815,7 +815,7 @@ the new builds.</screen>
log "Distributing world"
cd /usr/src/release &&
make -j 2 obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+ make ${COMPATFLAGS} release.1 release.2 2>&1</programlisting>
</listitem>
<listitem>
@@ -826,9 +826,9 @@ the new builds.</screen>
update mirrors, however this tip is not necessary unless you
wish to provide a redundant service.</para>
- <screen> _http._tcp.update.myserver.com. IN SRV 0 2 80 host1.myserver.com.
- SRV 0 1 80 host2.myserver.com.
- SRV 0 0 80 host3.myserver.com.</screen>
+ <programlisting>_http._tcp.update.myserver.com. IN SRV 0 2 80 host1.myserver.com.
+ IN SRV 0 1 80 host2.myserver.com.
+ IN SRV 0 0 80 host3.myserver.com.</programlisting>
</listitem>
</itemizedlist>
</sect1>
Modified: head/en_US.ISO8859-1/articles/hubs/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/hubs/article.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/articles/hubs/article.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -305,8 +305,7 @@
</para>
</note>
<para>A command line to mirror FreeBSD might look like:</para>
- <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://ftp4.de.FreeBSD.org/FreeBSD/ /pub/FreeBSD/</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://ftp4.de.FreeBSD.org/FreeBSD/ /pub/FreeBSD/</userinput></screen>
<para>Consult the documentation for <application>rsync</application>,
which is also available at
<link xlink:href="http://rsync.samba.org/">http://rsync.samba.org/</link>,
@@ -325,8 +324,7 @@
The FreeBSD website should only be mirrored via
<application>rsync</application>.</para>
<para>A command line to mirror the FreeBSD web site might look like:</para>
- <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://bit0.us-west.freebsd.org/FreeBSD-www-data/ /usr/local/www/</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://bit0.us-west.freebsd.org/FreeBSD-www-data/ /usr/local/www/</userinput></screen>
</sect2>
<sect2 xml:id="mirror-pkgs">
<title>Mirroring Packages</title>
Modified: head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -382,8 +382,7 @@
example, you may see something like:
</para>
- <screen> fe80:1::200:f8ff:fe01:6317
- </screen>
+ <screen> fe80:1::200:f8ff:fe01:6317</screen>
<para>in the routing table and interface address structure (struct
in6_ifaddr). The address above is a link-local unicast address
@@ -831,8 +830,7 @@ fe80:2::%ep0/64 link#2
lo0 = 8
cce0 = 10
3282 one ext mbuf
- 0 two or more ext mbuf
- </screen>
+ 0 two or more ext mbuf</screen>
<para>Each input function calls IP6_EXTHDR_CHECK in the beginning to
check if the region between IP6 and its header is continuous.
@@ -875,8 +873,7 @@ fe80:2::%ep0/64 link#2
socket gets IPv4 conn.)
--- ---
FreeBSD 4.x configurable supported
- default: enabled
- </screen>
+ default: enabled</screen>
<para>The following sections will give you more details, and how you can
configure the behavior.</para>
@@ -921,11 +918,10 @@ FreeBSD 4.x configurable supported
<para>To resolve this issue more easily, there is system dependent
&man.setsockopt.2; option, IPV6_BINDV6ONLY, used like below.</para>
- <screen> int on;
+ <programlisting> int on;
setsockopt(s, IPPROTO_IPV6, IPV6_BINDV6ONLY,
- (char *)&on, sizeof (on)) < 0));
- </screen>
+ (char *)&on, sizeof (on)) < 0));</programlisting>
<para>When this call succeed, then this socket only receive IPv6
packets.</para>
@@ -1015,11 +1011,10 @@ FreeBSD 4.x configurable supported
wildcard bind (enabled by default). You can disable it on
each socket basis with &man.setsockopt.2; like below.</para>
- <screen> int on;
+ <programlisting> int on;
setsockopt(s, IPPROTO_IPV6, IPV6_BINDV6ONLY,
- (char *)&on, sizeof (on)) < 0));
- </screen>
+ (char *)&on, sizeof (on)) < 0));</programlisting>
<para>Wildcard AF_INET6 socket grabs IPv4 connection if and only
if the following conditions are satisfied:</para>
@@ -1062,21 +1057,19 @@ FreeBSD 4.x configurable supported
<para>As a result, RFC2553 defines struct sockaddr_storage as
follows:</para>
- <screen> struct sockaddr_storage {
+ <programlisting> struct sockaddr_storage {
u_char __ss_len; /* address length */
u_char __ss_family; /* address family */
/* and bunch of padding */
- };
- </screen>
+ };</programlisting>
<para>On the contrary, XNET draft defines as follows:</para>
- <screen> struct sockaddr_storage {
+ <programlisting> struct sockaddr_storage {
u_char ss_len; /* address length */
u_char ss_family; /* address family */
/* and bunch of padding */
- };
- </screen>
+ };</programlisting>
<para>In December 1999, it was agreed that RFC2553bis should pick
the latter (XNET) definition.</para>
@@ -1103,9 +1096,8 @@ FreeBSD 4.x configurable supported
<para>never touch __ss_family. cast to sockaddr * and use sa_family
like:</para>
- <screen> struct sockaddr_storage ss;
- family = ((struct sockaddr *)&ss)->sa_family
- </screen>
+ <programlisting> struct sockaddr_storage ss;
+ family = ((struct sockaddr *)&ss)->sa_family</programlisting>
</listitem>
</orderedlist>
@@ -1197,8 +1189,7 @@ FreeBSD 4.x configurable supported
FAITH-relay dual stack node
^
| IPv6 TCP toward 2001:0DB8:0200:ffff::163.221.202.12
- source IPv6 node
- </screen>
+ source IPv6 node</screen>
<para>&man.faithd.8; must be invoked on FAITH-relay dual stack
node.</para>
@@ -1519,9 +1510,7 @@ ECN forbidden copy TOS bits except for ECN drop T
ECN allowed copy TOS bits except for ECN use inner TOS bits with some
CE (masked with 0xfe) from change. if outer ECN CE bit
inner to outer. is 1, enable ECN CE bit on
- set ECN CE bit to 0. the inner.
-
- </screen>
+ set ECN CE bit to 0. the inner.</screen>
<para>General strategy for configuration is as follows:</para>
<itemizedlist>
Modified: head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -440,8 +440,7 @@
<informalexample>
<screen>&prompt.user; <userinput>cc foobar.c</userinput> <lineannotation>executable is a.out</lineannotation>
-&prompt.user; <userinput>cc -o foobar foobar.c</userinput> <lineannotation>executable is foobar</lineannotation>
- </screen>
+&prompt.user; <userinput>cc -o foobar foobar.c</userinput> <lineannotation>executable is foobar</lineannotation></screen>
</informalexample>
</listitem>
</varlistentry>
@@ -455,8 +454,7 @@
you are using a <filename>Makefile</filename>.</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc -c foobar.c</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc -c foobar.c</userinput></screen>
</informalexample>
<para>This will produce an <firstterm>object file</firstterm> (not an
@@ -483,8 +481,7 @@
satisfied it works properly.</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc -g foobar.c</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc -g foobar.c</userinput></screen>
</informalexample>
<para>This will produce a debug version of the
@@ -513,8 +510,7 @@
compiler's optimizer.</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc -O -o foobar foobar.c</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc -O -o foobar foobar.c</userinput></screen>
</informalexample>
<para>This will produce an optimized version of
@@ -610,8 +606,7 @@
line.</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput></screen>
</informalexample>
<para>This will link the math library functions into
@@ -643,8 +638,7 @@
like this. What does it mean?</para>
<informalexample>
- <screen>/var/tmp/cc0143941.o: Undefined symbol `_sin' referenced from text segment
- </screen>
+ <screen>/var/tmp/cc0143941.o: Undefined symbol `_sin' referenced from text segment</screen>
</informalexample>
</question>
@@ -655,8 +649,7 @@
so:</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput></screen>
</informalexample>
</answer>
</qandaentry>
@@ -683,8 +676,7 @@ int main() {
<para>and I compiled it as:</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc temp.c -lm</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc temp.c -lm</userinput></screen>
</informalexample>
<para>like you said I should, but I get this when I run
@@ -692,8 +684,7 @@ int main() {
<informalexample>
<screen>&prompt.user; <userinput>./a.out</userinput>
-2.1 ^ 6 = 1023.000000
- </screen>
+2.1 ^ 6 = 1023.000000</screen>
</informalexample>
<para>This is <emphasis>not</emphasis> the right answer!
@@ -735,8 +726,7 @@ int main() {
<informalexample>
<screen>&prompt.user; <userinput>./a.out</userinput>
-2.1 ^ 6 = 85.766121
- </screen>
+2.1 ^ 6 = 85.766121</screen>
</informalexample>
<para>If you are using any of the mathematical functions,
@@ -762,8 +752,7 @@ int main() {
option:</para>
<informalexample>
- <screen>&prompt.user; <userinput>cc -o foobar foobar.c</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>cc -o foobar foobar.c</userinput></screen>
</informalexample>
</answer>
</qandaentry>
@@ -803,8 +792,7 @@ int main() {
checking the current directory. Either type:</para>
<informalexample>
- <screen>&prompt.user; <userinput>./test</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>./test</userinput></screen>
</informalexample>
<para>or choose a better name for your program!</para>
@@ -960,14 +948,12 @@ free(foo);
<answer>
<para>Yes, just go to another console or xterm, do</para>
- <screen>&prompt.user; <userinput>ps</userinput>
- </screen>
+ <screen>&prompt.user; <userinput>ps</userinput></screen>
<para>to find out the process ID of your program, and
do</para>
- <screen>&prompt.user; <userinput>kill -ABRT <replaceable>pid</replaceable></userinput>
- </screen>
+ <screen>&prompt.user; <userinput>kill -ABRT <replaceable>pid</replaceable></userinput></screen>
<para>where
<parameter><replaceable>pid</replaceable></parameter> is
@@ -1589,7 +1575,7 @@ Cannot access memory at address 0x7020796d.
not, gentle reader, here is how to do it (courtesy of the
<command>gdb</command> info pages):</para>
- <screen><lineannotation>…</lineannotation>
+ <programlisting><lineannotation>…</lineannotation>
if ((pid = fork()) < 0) /* _Always_ check this */
error();
else if (pid == 0) { /* child */
@@ -1599,7 +1585,7 @@ else if (pid == 0) { /* child */
sleep(10); /* Wait until someone attaches to us */
<lineannotation>…</lineannotation>
} else { /* parent */
- <lineannotation>…</lineannotation></screen>
+ <lineannotation>…</lineannotation></programlisting>
<para>Now all you have to do is attach to the child, set
<symbol>PauseMode</symbol> to <literal>0</literal>, and wait
@@ -1821,8 +1807,7 @@ else if (pid == 0) { /* child */
if you are doing something outside Emacs and you want to
edit a file, you can just type in</para>
- <screen>&prompt.user; <userinput>emacsclient <replaceable>filename</replaceable></userinput>
- </screen>
+ <screen>&prompt.user; <userinput>emacsclient <replaceable>filename</replaceable></userinput></screen>
<para>and then you can edit the file in your
Emacs!
Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -4244,9 +4244,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</pro
located in <filename>example.com.db</filename> would look
similar to</para>
- <screen>&prompt.user; <userinput>dnssec-signzone -o
- example.com -k Kexample.com.+005+nnnnn.KSK example.com.db
- Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
+ <screen>&prompt.user; <userinput>dnssec-signzone -o example.com -k Kexample.com.+005+nnnnn.KSK example.com.db Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
<para>The key supplied to the <option>-k</option> argument
is the <acronym>KSK</acronym> and the other key file is
Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml Thu Sep 7 11:21:07 2017 (r50804)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml Thu Sep 7 11:56:16 2017 (r50805)
@@ -932,8 +932,7 @@ perm vboxnetctl 0660</programlisting>
machine, the user needs to be a member of the <systemitem
class="groupname">operator</systemitem> group.</para>
- <screen>&prompt.root; <userinput>pw groupmod operator -m
- <replaceable>yourusername</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>yourusername</replaceable></userinput></screen>
<para>Restart the login session and
<application>&virtualbox;</application> for these changes to take
More information about the svn-doc-all
mailing list