diff --git a/hw/xfree86/doc/sgml/DESIGN.xml b/hw/xfree86/doc/sgml/DESIGN.xml
index 8a3047b40..826a9702c 100644
--- a/hw/xfree86/doc/sgml/DESIGN.xml
+++ b/hw/xfree86/doc/sgml/DESIGN.xml
@@ -150,7 +150,7 @@ changes:
active
if there is a reference
to it in an active &k.screen; section.
active
if there is a reference to it either from the command line, or from
an active &k.serverlayout; section.
@@ -336,7 +336,7 @@ framebuffer code are outside the scope of this document.
helper
functions to take care of things
that most drivers need. These helpers help minimise the amount of code
duplication between drivers. The use of helper functions by drivers is
however optional, though encouraged. The basic philosophy behind the
@@ -466,11 +466,11 @@ mechanism for this.
Bus
is ambiguous as it is used for different things: it may refer
to physical incompatible extension connectors in a computer system.
The RAC system knows two such systems: The ISA bus and the PCI bus.
(On the software level EISA, MCA and VL buses are currently treated
- like ISA buses). ``Bus'' may also refer to logically different
+ like ISA buses). Bus
may also refer to logically different
entities on a single bus system which are connected via bridges. A
PCI system may have several distinct PCI buses connecting each other
by PCI-PCI bridges or to the host CPU by HOST-PCI bridges.
@@ -503,7 +503,7 @@ mechanism for this.
Resource
refers to a range of memory or I/O addresses an entity
can decode.
all or nothing
. It is enabled prior to calling driver probes, at
the start of subsequent server generations, and when VT switching
back to the Xserver. It is disabled at the end of server generations,
and when VT switching away from the Xserver.
@@ -775,7 +775,7 @@ Here is what primary
video device. These
devices remain disabled for the next step.
unused
values.
privates
pointers is also allocated and
the privates
index to
hook their data into by calling
- privates
data is persistent.
disabled
during OPERATING state will be
ignored entirely.
unused
will only conflict with an overlapping
resource of an other entity if the second is actually in use
during OPERATING state.
unused
resource was found to conflict but the entity
does not use any other resource of this type the entire resource
type will be disabled for that entity.
@@ -2279,8 +2279,8 @@ these and will disable them before returning from- where the ``ppix'' field in a ScrnInfoRec + where theppix field in a ScrnInfoRec points to the pixmap used by the screen'sSaveRestoreImage() function to hold the screen's contents while switched out. @@ -1759,7 +1759,7 @@ MODECHECK_FINAL are intended for checks that may involve more than one mode. call. This would predominantly be data allocated byChipPreInit() that persists across server generations. It would include thedriverPrivate , - and any ``privates'' entries that modules may have allocated. + and anyprivatesentries that modules may have allocated.
disabledor +
unusedduring OPERATING stage. Although these steps could also be performed in
disabledduring OPERATING state will be ignored entirely.
unusedwill only conflicts with an overlapping resource of an other entity if the second is actually in use during OPERATING state.
unusedresource was found to conflict however the entity does not use any other resource of this type the entire resource type will be disabled for that entity.
unusedduring OPERATING state. @@ -2602,8 +2602,8 @@ available at the driver level: Takes a
bus, +
deviceand
funcare decimal integers. The ":func" part may be omitted, and the func value assumed to be zero, but this isn't encouraged. The "PCI" prefix may also be omitted. The prefix "AGP" is currently equivalent to the "PCI" prefix. If the string @@ -3147,7 +3147,7 @@ The flags are ORed together.
Optionentries
@@ -6036,9 +6036,9 @@ typedef struct {This function should be used when comparing strings from the config file with expected values. It works like strcmp() , - but is not case sensitive and space, tab, and `_ ' characters + but is not case sensitive and space, tab, andcharacters are ignored in the comparison. The use of this function isn't restricted to parsing option values. It may be used anywhere where this functionality required. @@ -4498,7 +4498,7 @@ typedef struct {_ XFree86 offers the X Video Extension which allows clients to treat video -as any another primitive and ``Put'' video into drawables. By default, +as any another primitive and @@ -5065,7 +5065,7 @@ typedef struct { Each adaptor may have an array of these advertising the attributes for its ports. Currently defined flags arePutvideo into drawables. By default, the extension reports no video adaptors as being available since the DDX layer has not been initialized. The driver can initialize the DDX layer by filling out one or moreXF86VideoAdaptorRecs @@ -4606,12 +4606,12 @@ as follows:VIDEO_NO_CLIPPING @@ -4817,7 +4817,7 @@ as follows: the various hardware expected to be used with this extension, it is not expected that all hardware will be able to do this exactly as described. In that case the driver should just do - ``the best it can,'' scaling as closely to the target rectangle + This indicates that the video adaptor does not support - clipping. The driver will never receive ``Put'' requests + clipping. The driver will never receive Putrequests where less than the entire area determined bydrw_x ,drw_y ,drw_w anddrw_h is visible. - This flag does not apply to ``Get'' requests. Hardware - that is incapable of clipping ``Gets'' may punt or get + This flag does not apply toGetrequests. Hardware + that is incapable of clippingGetsmay punt or get the extents of the clipping region passed to it.the best it can,scaling as closely to the target rectangle as it can without rendering outside of it. In the worst case, the driver can opt to just not turn on the video.XvGettable andXvSettable which may be OR'd together indicating that - attribute is ``gettable'' or ``settable'' by the client. The + attribute isgettableorsettableby the client. Themin andmax field specify the valid range for the value.Name is a text string describing the attribute by name. @@ -5385,7 +5385,7 @@ XFree86 common layer.- When loading ``external'' modules (modules that don't + When loading externalmodules (modules that don't have the standard entry point, for example a special shared library) the options parameter can be set toEXTERN_MODULE to tell the @@ -5423,7 +5423,7 @@ typedef struct { information in the module'sXF86ModuleVersionInfo record (which is described below). The values in comments above - indicate ``don't care'' settings for each of the fields. + indicatedon't caresettings for each of the fields. The comparisons made are as follows:@@ -5968,12 +5968,12 @@ the server, and may also be used from within modules. int errmaj, int errmin); - This function prints an error message that includes the text ``Failed - to load module'', the module name modname , a message + This function prints an error message that includes the textFailed + to load module, the module namemodname , a message specific to theerrmaj value, and the value iferrmin . Ifname is non-NULL , it is printed as an identifying prefix - to the message (followed by a `:'). + to the message (followed by a:).
helperfunctions that video driver might find useful. While video drivers are not required to use any of -these to be considered ``compliant'', the use of appropriate helpers is +these to be considered
compliant, the use of appropriate helpers is strongly encouraged to improve the consistency of driver behaviour.
data transport clock, which is the clock that will have to be programmed in the chip when it has a programmable clock, or the clock that will be picked from the clocks list when it is not a programmable one. Thus: @@ -7975,7 +7975,7 @@ programming the standard VGA registers, and for handling VGA colourmaps. void writeMiscOut(vgaHWPtr hwp, CARD8 value);
- Write ` value ' to the Miscellaneous Output register. + Writeto the Miscellaneous Output register.value
new design. For a fleshing out and sample implementation of some of the bits outlined here, refer to that driver. Note that this is an example only. The approach used here will not be appropriate for all drivers. @@ -8122,7 +8122,7 @@ appropriate for all drivers. Each driver must reserve a unique driver name, and a string that is used to prefix all of its externally visible symbols. This is to avoid name space clashes when loading multiple drivers. The examples here are for -the ``ZZZ'' driver, which uses the ``ZZZ'' or ``zzz'' prefix for its externally +the
ZZZdriver, which uses the
ZZZor
zzzprefix for its externally visible symbols.
standardoptions should be used where appropriate before inventing new options.