Commit graph

112 commits

Author SHA1 Message Date
Nik Clayton
84712fedb0 Step 1. Find <ulink url="mailto:...">...</ulink> and change the <ulink>
to <email>.

        Can't do this globally. Some of the links are odd (i.e,. the link
        is not their e-mail address but is their name, eg

          <ulink url="mailto:nik@freebsd.org">Nik Clayton</ulink>

        which would turn to

          <email>Nik Clayton</email>

        which isn't very useful. Ignore these ones, and do the others.
        (i.e., the ones that look like

           <ulink url="mailto:nik@freebsd.org">nik@freebsd.org</ulink>

        )

        This Emacs regexp does the job.

            Search for: <ulink\s-+url="mailto[^>]+>\([^<]+\)</ulink>
          Replace with: <email>\1</email>

Step 2. A lot of the <email>...</email> sets will have '<' and '>' embedded
        in them (as entities). These can be removed, since the stylesheet
        will add them;

            Search for: <email>&lt;\([^&]+\)&gt;</email>
          Replace with: <email>\1</email>

Step 3. The trick now is to turn

            <ulink url="mailto:nik@freebsd.org">Nik Clayton</ulink>

        into

            Nik Clayton <email>nik@freebsd.org</email>

        This step could (possibly) have been done first, and then steps
        1 and 2 could be done globally. I haven't done this because of
        concerns about the ordering of names within languages. This
        transformation is fairly simple in English, I've no idea what
        it's like in Japanese.

            Search for: <ulink\s-+url="mailto:\([^"]+\)">\([^<]+\)</ulink>
          Replace with: \2 <email>\1</email>

Step 4. Remove leading and trailing spaces that may have slipped in

            Search for: <email>\s-+
          Replace with: <email>

            Search for: \s-+</email>
          Replace with: </email>
1998-10-26 23:51:34 +00:00
Nik Clayton
950e361ac7 Use the correct ISO entities for dashes. According to a TeX manual I have
kicking around here,

    daughter-in-law, X-rated    = hyphen      =  -
    pages 13--67                = en-dash     = &ndash;
    yes---or no?                = em-dash     = &mdash;
    0, 1, and -1                = minus sign  = &minus;
1998-10-26 23:51:03 +00:00
Nik Clayton
aefedf6246 Removed white space after <title> and before </title>. Use two search and
replaces

    \s-+</title>  ->  </title>
    <title>\s-+   ->  <title>
1998-10-26 23:50:34 +00:00
Nik Clayton
bf13e1a617 <emphasis remap=..> -> <emphasis>
<literal remap=..>  -> <literal>
<command remap=..>  -> <command>

Or deleted <emphasis ..> altogether in some cases.

More redundant <para>..</para>'s removed.
1998-10-26 23:49:59 +00:00
Nik Clayton
84100bea23 As previous commits, to end of file. 1998-10-26 23:49:18 +00:00
Nik Clayton
78a4c3d87a As previous commit, to line 35973. 1998-10-22 23:07:02 +00:00
Nik Clayton
0e0b8f123f As earlier commits, to line 30118 1998-10-22 23:06:05 +00:00
Nik Clayton
00731dde7d Small changes to keep it validating. 1998-10-22 23:03:53 +00:00
Nik Clayton
9b4366d812 As previous commit, to line 24997 1998-10-22 23:03:04 +00:00
Nik Clayton
3ea0381580 As previous commit, to line 20370. 1998-10-21 22:05:23 +00:00
Nik Clayton
eb020dff6d As previous commit, to line 15126 1998-10-21 22:02:39 +00:00
Nik Clayton
6d7e38c02a As previous commit, now to up to line 11490. 1998-10-21 22:00:19 +00:00
Nik Clayton
cfb82ba9ca With the agreement of the Japanese team, a change in the way I'm doing
things.

I'm now working through from the beginning of the handbook to end,
correcting as I go. I'll commit in chunks of 5,000 lines (or
thereabouts).

Most of the changes fall into the following categories.

  * <emphasis remap=bf> --> <emphasis>

  * Spurious <para>s around <*list>s deleted (but not reformatted)

    "C-c -" in Emacs SGML mode (when the point is on an element starting
    or end tags) will delete that element's starting or end tags.

  * Marked smileys with <!-- smiley --> for possible future deletion

  * Deleting <emphasis>, around

    <term><emphasis>...</emphasis></term> -> <term>...</term>

  * Fine tuning markup choices in some cases

    - <filename>C:</filename>  ->  <devicename>C:</devicename>

  * Extra <note>s here and there.

  * Some <*list>s to <procedure> (and <listitem>s to <step>)

  * ASCII emphasis converted to <emphasis>

    i.e.,   do it like *this*  ->  do it like <emphasis>this</emphasis>

  * <symbol> -> <replaceable>

There are very few whitespace changes, although a few have probably
cropped up. The vast majority of the whitespace changes will happen in
one megacommit, hopefully some time next week.

This does the first 5,000 lines or so.
1998-10-21 21:58:40 +00:00
Nik Clayton
2a882be047 A lot of </para> tags have leading whitespace before them. Remove it. Do
this (in Emacs) by searching for

    \s-+</para>

and replacing with

    </para>

Do this for all occurences *except* where the element immediately before
the </para> is one of <itemizedlist>, <orderedlist>, <variablelist>,
<procedure>. The <para>...</para> wrapping these elements is mostly
redundant, and will be removed later.
1998-10-21 21:53:36 +00:00
Nik Clayton
f0b535db82 Some paragraphs have leading space(s). E.g.,
<para>  There is some leading space here.</para>

Get rid of it, doing an emacs search/replace for

    <para> +\([^ ]\)

and replacing with

    <para>\1

This can be done globally.
1998-10-21 21:52:28 +00:00
Nik Clayton
2d91cbead9 Removed double whitespace from the end of stops -- . , ! ? : ;
Some parts of the handbook had single spaces after stops, some had double
or triple. While the typographical convention for monospaced fonts may
be to use double spaces after them, that doesn't apply here. TeX will
ignore them, as will HTML. If we need them for a plain text version of the
Handbook then the stylesheet / conversion mechanism can insert them
as necessary.

Searching for

   _\([;:!\.\?,]\)  +_

in Emacs and replacing with

   _\1 _

(ignore the '_', they're just to delineate the regexps) does the job
quite nicely. However, you can't do this everywhere, since some of the
double spaces might be in program listings or other literal sections
(e.g., the BSD Copyright), so you need to sit and bounce on the 'y' or
'n' key as appropriate for each occurance of a stop.
1998-10-21 21:51:11 +00:00
Nik Clayton
ce7ee35d24 Finished sweep. If it's white space sensitive (examples, program
listings, PGP signatures...) the white space is now correct. I may
have missed one or two on the way, I'll catch them later.
1998-10-21 21:48:30 +00:00
Nik Clayton
63d609a2b1 Continuing on from the previous commit -- this takes it up to the beginning
of chapter 16. . .
1998-10-16 23:58:33 +00:00
Doug White
f078b5a32a Fix incorrect ccdconfig command line.
Noticed most recently by: Bill Richter <richterb@binkley.wellsfargo.com>
1998-10-14 03:25:31 +00:00
Nik Clayton
1afc0ec7a2 Reviewing the use of <informalexample> and <screen>.
In some cases <informalexample> wasn't appropriate, and the markup was
changed to <programlisting> or other.

In some cases there were spurious <para> elements before and after the
<informalexample>. These were removed.

Reformatted text within <screen> elements because the whitespace *is*
significant.

Added <prompt> and <userinput> elements within <screen> where necessary.

If I spotted inappropriate use of markup within the immediate vicinity
of the <informalexample> elements then I fixed that (mostly the use of
<emphasis remap="...">).

This is part one of these changes -- there's a load of them, and this
goes up to line 11,284 or thereabouts, roughly one third of the way
through.
1998-10-12 21:56:14 +00:00
Nik Clayton
a497ab6892 After an extended absence (quit job, set up company, get girlfriend, get
contract, start contract, work too many hours per day) I'm back working
on the DocBook conversion :-)

Create two new entities, prompt.root and prompt.user. Use these where the
user is shown an OS prompt, to indicate whether they should be a normal
user or do it as root.

Everything else that looks like a prompt (e.g., C:\> which occurs here
and there) is also marked up as <prompt>.
1998-10-01 06:11:44 +00:00
Nik Clayton
775d061074 <ulink url="...man.cgi?...">...</ulink> -> <citerefentry>...</citerefentry> 1998-08-25 09:06:27 +00:00
Nik Clayton
bab9c37eab Fix up some uses of <screen> and the use of <emphasis> elements within
and near it. Most of the time this consisted of replacing the <emphasis>
with <replaceable> or <userinput>. Sometimes <screen> is the wrong element
to use, and will need replacing with something like <programlisting> or
<literallayout>.
1998-08-25 09:01:24 +00:00
Wolfram Schneider
1be10e6538 change footer E-Mail address www -> freebsd-questions 1998-08-24 23:47:10 +00:00
Wolfram Schneider
159c929bcb Converted from HTML to docbook. 1998-08-24 23:43:17 +00:00
Nik Clayton
94c41b401a <emphasis remap=..>...</emphasis> -> <maketarget>...</maketarget> 1998-08-11 08:30:38 +00:00
Nik Clayton
e1b4ca8f64 <emphasis remap=..>...</emphasis> -> <makevar>...</makevar> 1998-08-11 08:29:39 +00:00
Nik Clayton
ef411ca3f4 <emphasis remap=..>...</emphasis> -> <literal>...</literal> 1998-08-11 08:28:42 +00:00
Wolfram Schneider
b5d07eae94 Use relative URLs. 1998-08-09 22:53:56 +00:00
Wolfram Schneider
28bbc4b306 Fix links due repository copy. 1998-08-04 14:24:23 +00:00
Wolfram Schneider
e4acca8a48 Set WEBBASE variable. 1998-08-03 14:44:26 +00:00
Nik Clayton
e51e782dab Convert things that look like man page references (i.e.,
command(number)) from the variety of different existing markup
(which included <command>, <emphasis>, and <ulink>s to man2html
CGI scripts) to a common format, which is

    <citerefentry>
      <refentrytitle>command</refentrytitle>
      <manvolnum>number</manvolnum>
    </citerefentry>

although in the interests of keeping the changes as simple as possible
for the translators, the above was flattened on to one line.
1998-08-03 08:53:53 +00:00
Nik Clayton
52f07f3229 Removed the Makefile and SGML source for this (old and outdated) copy of
my "make world" tutorial.
1998-07-24 13:32:05 +00:00
Nik Clayton
e43d54cdc3 Remove the listing for my "make world" tutorial. Nothing on the site seems
to link to it any more, and the version on my website is currently more
up to date. An AltaVista search to see if any one else had linked to it
didn't turn up anything, so I think this is pretty safe. I'll 'cvs remove'
the directory and its files shortly.
1998-07-24 13:31:04 +00:00
Nik Clayton
fdf212e121 <emphasis remap=bf>...</emphasis> --> <command>...</command> 1998-07-14 13:17:31 +00:00
Nik Clayton
08e30a4fe7 As per chapter 18 of the handbook (which I should know back to front by now)
formally list myself as MAINTAINER.
1998-06-30 09:09:23 +00:00
Nik Clayton
ef83a54132 Use the new freebsd.dsl file when converting the Handbook. 1998-06-30 09:04:12 +00:00
Nik Clayton
d800c05cd2 Fix the use of `` and '' in the section that explains kernel options. Use
'"' to ease cut-n-paste.
1998-06-30 08:43:42 +00:00
Nik Clayton
b91811480c Replace the last few occurences of curly quoted items (`` and '')
with the right markup.
1998-06-29 09:48:32 +00:00
Nik Clayton
f4e931897c <emphasis remapt=it> -> <emphasis> in some cases. 1998-06-29 09:46:44 +00:00
Nik Clayton
1454451780 Mark up domain names, hostnames, IP addresses, netmasks and MAC addresses
using the new <hostid> element (with appropriate roles).
1998-06-29 09:43:53 +00:00
Nik Clayton
4649264b1d More things that should be filenames marked up as such. 1998-06-29 09:38:56 +00:00
Nik Clayton
190d8f54c8 Use the new FreeBSD Doc. Project DTD. 1998-06-29 08:23:33 +00:00
Nik Clayton
a805131f7a A cleanup to get it to validate. Fixed some invalid and missplet markup.
Lots of undefined entities still exist, but they will be fixed with a
later commit.
1998-06-26 11:37:37 +00:00
Nik Clayton
7fe8560d70 Replaced double quotes with appropriate elements. 1998-06-26 11:33:59 +00:00
Joseph Koshy
8a73f30eab Make the fonts tutorial upto-date with respect to TrueType support in FreeBSD.
PR:		docs/7049
Reviewed by:	the -doc list.
Spl-thanks-to: 	CHOI Junho <junker@jazz.snu.ac.kr> for information
		about Asian font support.
1998-06-26 10:47:27 +00:00
Nik Clayton
a053b05e64 Another sweep for "" and "`" (and their closing equivalents), replacing
them with the correct markup.

The only quotes left now are either around items for which I'm not 100%
sure which element to use, or in literal blocks as part of commands the
user types in.
1998-06-19 08:48:37 +00:00
Nik Clayton
b1405c0516 Examine text marked up as <acronym>, alter markup as appropriate. 1998-06-19 08:39:18 +00:00
Wolfram Schneider
3a1e6bb0f4 In the example for mydevselect the switch statement never closes.
nit pick nit pick... :) by Mike Tesch <tesch@malibu.caida.org>
1998-06-18 13:20:41 +00:00
Nik Clayton
cf82da2a44 A quick hack to build the HTML version of the DocBook handbook -- partly
so I can check my progress, partly so that others can offer comments on
the result of the conversion.

See <URL:http://www.freebsd.org/~nik/handbook/book01.htm> for the first
results. Keep in mind that the conversion has not been fine tuned in any
way. That said, comments are welcome.
1998-06-18 09:06:04 +00:00