On Thu, May 19, 2011 at 08:28:48PM -0400, Gaetan Nadon wrote: > Reported-by: Christopher Yeleighton <[email protected]> > Signed-off-by: Gaetan Nadon <[email protected]>
Reviewed-by: Peter Hutterer <[email protected]> Cheers, Peter > --- > specs/libX11/CH08.xml | 6 +++--- > specs/libX11/CH09.xml | 9 +++++---- > specs/libX11/CH10.xml | 4 ++-- > specs/libX11/CH13.xml | 30 +++++++++++++++--------------- > specs/libX11/CH14.xml | 20 +++++++++----------- > 5 files changed, 34 insertions(+), 35 deletions(-) > > diff --git a/specs/libX11/CH08.xml b/specs/libX11/CH08.xml > index 376f194..febdbcb 100644 > --- a/specs/libX11/CH08.xml > +++ b/specs/libX11/CH08.xml > @@ -15,9 +15,9 @@ Once you have established a connection to a display, you > can use the Xlib graphi > <listitem><para>Transfer images between clients and the > server</para></listitem> > </itemizedlist> > <para> > -If the same drawable and GC is used for each call, Xlib batches back-to-back > calls to XDraw- > -Point, XDrawLine, XDrawRectangle, XFillArc, and XFillRectangle. Note that > this reduces > -the total number of requests sent to the server. > +If the same drawable and GC is used for each call, Xlib batches back-to-back > +calls to XDrawPoint, XDrawLine, XDrawRectangle, XFillArc, and XFillRectangle. > +Note that this reduces the total number of requests sent to the server. > </para> > <sect1 id="Clearing_Areas"> > <title>Clearing Areas</title> > diff --git a/specs/libX11/CH09.xml b/specs/libX11/CH09.xml > index 66d1bc3..413762f 100644 > --- a/specs/libX11/CH09.xml > +++ b/specs/libX11/CH09.xml > @@ -5,10 +5,11 @@ > <title>Window and Session Manager Functions</title> > > <para> > -Although it is difï¬cult to categorize functions as exclusively for an > application, a window man- > -ager, or a session manager, the functions in this chapter are most often > used by window managers > -and session managers. It is not expected that these functions will be used > by most application > -programs. Xlib provides management functions to: > +Although it is difï¬cult to categorize functions as exclusively for an > application, > +a window manager, or a session manager, the functions in this chapter are > most > +often used by window managers and session managers. It is not expected that > +these functions will be used by most application programs. Xlib provides > +management functions to: > </para> > > <itemizedlist> > diff --git a/specs/libX11/CH10.xml b/specs/libX11/CH10.xml > index d36ac19..ee1e391 100644 > --- a/specs/libX11/CH10.xml > +++ b/specs/libX11/CH10.xml > @@ -6,8 +6,8 @@ > > <para> > A client application communicates with the X server through the connection > you establish with > -the XOpenDisplay function. A client application sends requests to the X > server over this con- > -nection. These requests are made by the Xlib functions that are called in > the client application. > +the XOpenDisplay function. A client application sends requests to the X > server over this > +connection. These requests are made by the Xlib functions that are called in > the client application. > Many Xlib functions cause the X server to generate events, and the userâs > typing or moving the > pointer can generate events asynchronously. The X server returns events to > the client on the same > connection. > diff --git a/specs/libX11/CH13.xml b/specs/libX11/CH13.xml > index 25cb56f..9525750 100644 > --- a/specs/libX11/CH13.xml > +++ b/specs/libX11/CH13.xml > @@ -8,13 +8,12 @@ > An internationalized application is one that is adaptable to the > requirements of different native > languages, local customs, and character string encodings. The process of > adapting the operation > to a particular native language, local custom, or string encoding is called > localization. A goal of > -internationalization is to permit localization without program source > modiï¬cations or recompila- > -tion. > +internationalization is to permit localization without program source > modiï¬cations or recompilation. > </para> > <para> > -As one of the localization mechanisms, Xlib provides an X Input Method > (<acronym>XIM</acronym>) functional inter- > -face for internationalized text input and an X Output Method > (<acronym>XOM</acronym>) functional interface for > -internationalized text output. > +As one of the localization mechanisms, Xlib provides an X Input Method > (<acronym>XIM</acronym>) > +functional interface for internationalized text input and an X Output Method > +(<acronym>XOM</acronym>) functional interface for internationalized text > output. > </para> > <para> > Internationalization in X is based on the concept of a locale. A locale > deï¬nes the localized > @@ -32,9 +31,9 @@ behavior of a program at run time. Locales affect Xlib in > its: > <para> > ⢠> Encoding and decoding for inter-client text communication > -Characters from various languages are represented in a computer using an > encoding. Different > -languages have different encodings, and there are even different encodings > for the same charac- > -ters in the same language. > +Characters from various languages are represented in a computer using an > encoding. > +Different languages have different encodings, and there are even different > +encodings for the same characters in the same language. > </para> > <para> > This chapter deï¬nes support for localized text imaging and text input and > describes the locale > @@ -44,10 +43,10 @@ C language environment. The multibyte and wide character > functions are equivalen > the form of the text argument. > </para> > <para> > -The Xlib internationalization functions are not meant to provide support for > multilingual applica- > -tions (mixing multiple languages within a single piece of text), but they > make it possible to imple- > -ment applications that work in limited fashion with more than one language > in independent con- > -texts. > +The Xlib internationalization functions are not meant to provide support for > +multilingual applications (mixing multiple languages within a single piece > of text), > +but they make it possible to implement applications that work in limited > +fashion with more than one language in independent contexts. > </para> > <para> > The remainder of this chapter discusses: > @@ -9361,9 +9360,10 @@ typedef unsigned long XIMFeedback; > #define XIMVisibleToCenter (1L<<10) > > *â The values for XIMPrimary, XIMSecondary, and XIMTertiary were > incorrectly deï¬ned in > -the R5 speciï¬cation. The X Consortiumâs X11R5 implementation correctly > implemented the val- > -ues for these highlights. The value of these highlights has been corrected > in this speciï¬cation to > -agree with the values in the Consortiumâs X11R5 and X11R6 implementations. > +the R5 speciï¬cation. The X Consortiumâs X11R5 implementation correctly > +implemented the values for these highlights. The value of these highlights > has > +been corrected in this speciï¬cation to agree with the values in the > +Consortiumâs X11R5 and X11R6 implementations. > > </literallayout> > > diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml > index 78d0e3f..6283677 100644 > --- a/specs/libX11/CH14.xml > +++ b/specs/libX11/CH14.xml > @@ -7,14 +7,14 @@ > The Inter-Client Communication Conventions Manual, hereafter referred to as > the <acronym>ICCCM</acronym>, > details the X Consortium approved conventions that govern inter-client > communications. These > conventions ensure peer-to-peer client cooperation in the use of selections, > cut buffers, and shared > -resources as well as client cooperation with window and session managers. > For further informa- > -tion, see the Inter-Client Communication Conventions Manual. > +resources as well as client cooperation with window and session managers. > For further information, > +see the Inter-Client Communication Conventions Manual. > </para> > <para> > -Xlib provides a number of standard properties and programming interfaces > that are <acronym>ICCCM</acronym> com- > -pliant. The predeï¬ned atoms for some of these properties are deï¬ned in > the <X11/Xatom.h> > -header ï¬le, where to avoid name conï¬icts with user symbols their > #deï¬ne name has an XA_ pre- > -ï¬x. For further information about atoms and properties, see section 4.3. > +Xlib provides a number of standard properties and programming interfaces > that are <acronym>ICCCM</acronym> > +compliant. The predeï¬ned atoms for some of these properties are deï¬ned > in the <X11/Xatom.h> > +header ï¬le, where to avoid name conï¬icts with user symbols their > #deï¬ne name has an XA_ preï¬x. > +For further information about atoms and properties, see section 4.3. > </para> > <para> > Xlibâs selection and cut buffer mechanisms provide the primary programming > interfaces by which > @@ -57,8 +57,7 @@ managers are: > <entry>TEXT</entry> > <entry></entry> > <entry>The string name of the machine on > - which the client application is run- > - ning. > + which the client application is running. > </entry> > </row> > <row> > @@ -74,7 +73,7 @@ managers are: > <entry><property>WM_COMMAND</property></entry> > <entry>TEXT</entry> > <entry></entry> > - <entry>The command and arguments, null- > + <entry>The command and arguments, null > separated, used to invoke the application. > </entry> > </row> > @@ -134,8 +133,7 @@ managers are: > <entry><property>WM_STATE</property></entry> > <entry>32</entry> > <entry>Intended for communication > - between window and session man- > - agers only. > + between window and session managers only. > </entry> > </row> > <row> > -- > 1.6.0.4 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
