diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /libXdmcp | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'libXdmcp')
| -rw-r--r-- | libXdmcp/doc/xdmcp.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXdmcp/doc/xdmcp.xml b/libXdmcp/doc/xdmcp.xml index 36abb75a9..817838e58 100644 --- a/libXdmcp/doc/xdmcp.xml +++ b/libXdmcp/doc/xdmcp.xml @@ -1591,7 +1591,7 @@ should terminate the protocol at this point and display an error to the user. <entry spanname="col4_on"> Is the data sent to the display to indicate the type of authorization the manager will be using in the first call to -<function>XOpenDisplay</function> +<olink targetdoc='libX11' targetptr='XOpenDisplay'><function>XOpenDisplay</function></olink> after the <function>Manage</function> packet is received. @@ -3312,7 +3312,7 @@ Send <function>Refuse</function> packet Terminate any session in progress </para> <para> -<function>XOpenDisplay</function> +<olink targetdoc='libX11' targetptr='XOpenDisplay'><function>XOpenDisplay</function></olink> </para> <para> Open display succeeds -> |