On 12-03-17 02:17 AM, Alan Coopersmith wrote: > Fix a bunch of links, including using olinks for other X.Org docs. > Add a 'luxi-fonts' id to License.xml so fonts.xml can link to it. > Clarify some wording in various areas. > > Signed-off-by: Alan Coopersmith <[email protected]> > --- > general/License.xml | 2 +- > general/fonts/fonts.xml | 24 ++++++++++++------------ > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/general/License.xml b/general/License.xml > index fc24c25..7142e4f 100644 > --- a/general/License.xml > +++ b/general/License.xml > @@ -675,7 +675,7 @@ SOFTWARE. > > </sect2> > > -<sect2> > +<sect2 id='luxi-fonts'> > <title>Bigelow & Holmes Inc and URW++ GmbH Luxi font license</title> > > <para> > diff --git a/general/fonts/fonts.xml b/general/fonts/fonts.xml > index 6508033..d3b0d81 100644 > --- a/general/fonts/fonts.xml > +++ b/general/fonts/fonts.xml > @@ -14,7 +14,7 @@ > <author><firstname>Juliusz</firstname><surname>Chroboczek</surname> > <email>[email protected]</email> > </author> > -<pubdate>23 October 2009</pubdate> > +<pubdate>16 March 2012</pubdate> > > </articleinfo> > > @@ -305,7 +305,7 @@ command `<command>bdftopcf</command>', <emphasis > remap="it">e.g.</emphasis> > $ bdftopcf courier12.bdf > </screen> > > -You will then want to compress the resulting PCF font files: > +You may then want to compress the resulting PCF font files: > > <screen> > $ gzip courier12.pcf > @@ -840,8 +840,8 @@ of core fonts bundled with popular operating and window > systems. > > <para> > The license terms for the Luxi fonts are included in the file > -`<filename>COPYRIGHT.BH</filename>', as well as in the <ulink > -url="../License.html">License document</ulink>. > +`<filename>COPYRIGHT.BH</filename>', as well as in the <olink > +targetdoc='License' targetptr='luxi-fonts'>License document</olink>. > </para> > > <para> > @@ -877,8 +877,8 @@ name have been removed from X11R&relvers;. > <title>More about core fonts</title> > > <para> > -This section describes X11R&relvers;-specific enhancements to the core > -X11 fonts system. > +This section describes XFree86-created enhancements to the core > +X11 fonts system that were adopted by X.Org. > </para> > > <sect2 id='Core_fonts_and_internationalisation'> > @@ -1876,9 +1876,8 @@ url="xlsfonts.1.html" > > and <ulink > url="showfont.1.html" > >showfont(1)</ulink > ->. In addition, you may want to read the X Logical > -Font Description document, by Jim Flowers, which is provided in the file > -`<filename>xc/doc/xlfd.PS.Z</filename>'. > +>. In addition, you may want to read the <olink targetdoc='xlfd'>X Logical > +Font Description document</olink>, by Jim Flowers. > </para> > > <para> > @@ -1894,7 +1893,7 @@ of information about digital fonts. > Xft and Fontconfig are described on > <ulink > url="http://www.fontconfig.org"; > ->Keith Packard's Fontconfig site</ulink > +>the Fontconfig site</ulink > >. > </para> > > @@ -1943,9 +1942,10 @@ url="http://www.cl.cam.ac.uk/~mgk25/unicode.html"; > </para> > > <para> > -The IANA RFC documents, available from a number of sites throughout > +The IETF RFC documents, available from a number of sites throughout > the world, often provide interesting information about character set > -issues; see for example RFC 373. > +issues; see for example <ulink > +url="https://datatracker.ietf.org/doc/rfc373/";>RFC 373</ulink>. > </para> > > </sect1>
I tested both olinks. Reviewed-by: Gaetan Nadon <[email protected]> _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
