Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef0d2c16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rdunlap' (patches from Randy Dunlap) 

Merge documentation fixes from Randy Dunlap.

* emailed patches from Randy Dunlap <rdunlap@infradead.org>:
  Documentation: update /proc/stat "intr" count summary
  Documentation: update java sample wrapper for java 7
  Documentation: update thunderbird email client settings
  Documentation: fix typos in drm docbook
parents f016a644 3568a1db

Documentation/DocBook/drm.tmpl

+6 −6
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ 
  <partintro>

  <partintro>

    <para>

    <para>

      This first part of the DRM Developer's Guide documents core DRM code,

      This first part of the DRM Developer's Guide documents core DRM code,

      helper libraries for writting drivers and generic userspace interfaces

      helper libraries for writing drivers and generic userspace interfaces

      exposed by DRM drivers.

      exposed by DRM drivers.

    </para>

    </para>

  </partintro>

  </partintro>
@@ -459,7 +459,7 @@ char *date;</synopsis> 
      providing a solution to every graphics memory-related problems, GEM

      providing a solution to every graphics memory-related problems, GEM

      identified common code between drivers and created a support library to

      identified common code between drivers and created a support library to

      share it. GEM has simpler initialization and execution requirements than

      share it. GEM has simpler initialization and execution requirements than

      TTM, but has no video RAM management capabitilies and is thus limited to

      TTM, but has no video RAM management capabilities and is thus limited to

      UMA devices.

      UMA devices.

    </para>

    </para>

    <sect2>

    <sect2>
@@ -889,7 +889,7 @@ int (*prime_fd_to_handle)(struct drm_device *dev, 
	    vice versa. Drivers must use the kernel dma-buf buffer sharing framework

	    vice versa. Drivers must use the kernel dma-buf buffer sharing framework

	    to manage the PRIME file descriptors. Similar to the mode setting

	    to manage the PRIME file descriptors. Similar to the mode setting

	    API PRIME is agnostic to the underlying buffer object manager, as

	    API PRIME is agnostic to the underlying buffer object manager, as

	    long as handles are 32bit unsinged integers.

	    long as handles are 32bit unsigned integers.

	  </para>

	  </para>

	  <para>

	  <para>

	    While non-GEM drivers must implement the operations themselves, GEM

	    While non-GEM drivers must implement the operations themselves, GEM
@@ -2356,7 +2356,7 @@ void intel_crt_init(struct drm_device *dev) 
      first create properties and then create and associate individual instances

      first create properties and then create and associate individual instances

      of those properties to objects. A property can be instantiated multiple

      of those properties to objects. A property can be instantiated multiple

      times and associated with different objects. Values are stored in property

      times and associated with different objects. Values are stored in property

      instances, and all other property information are stored in the propery

      instances, and all other property information are stored in the property

      and shared between all instances of the property.

      and shared between all instances of the property.

    </para>

    </para>

    <para>

    <para>
@@ -2697,10 +2697,10 @@ int num_ioctls;</synopsis> 
  <sect1>

  <sect1>

    <title>Legacy Support Code</title>

    <title>Legacy Support Code</title>

    <para>

    <para>

      The section very brievely covers some of the old legacy support code which

      The section very briefly covers some of the old legacy support code which

      is only used by old DRM drivers which have done a so-called shadow-attach

      is only used by old DRM drivers which have done a so-called shadow-attach

      to the underlying device instead of registering as a real driver. This

      to the underlying device instead of registering as a real driver. This

      also includes some of the old generic buffer mangement and command

      also includes some of the old generic buffer management and command

      submission code. Do not use any of this in new and modern drivers.

      submission code. Do not use any of this in new and modern drivers.

    </para>

    </para>

Documentation/email-clients.txt

+5 −10
Original line number Original line Diff line number Diff line
@@ -201,20 +201,15 @@ To beat some sense out of the internal editor, do this: 




- Edit your Thunderbird config settings so that it won't use format=flowed.

- Edit your Thunderbird config settings so that it won't use format=flowed.

  Go to "edit->preferences->advanced->config editor" to bring up the

  Go to "edit->preferences->advanced->config editor" to bring up the

  thunderbird's registry editor, and set "mailnews.send_plaintext_flowed" to

  thunderbird's registry editor.

  "false".





- Disable HTML Format: Set "mail.identity.id1.compose_html" to "false".

- Set "mailnews.send_plaintext_flowed" to "false"





- Enable "preformat" mode: Set "editor.quotesPreformatted" to "true".

- Set "mailnews.wraplength" from "72" to "0"





- Enable UTF8: Set "prefs.converted-to-utf8" to "true".

- "View" > "Message Body As" > "Plain Text"





- Install the "toggle wordwrap" extension.  Download the file from:

- "View" > "Character Encoding" > "Unicode (UTF-8)"

    https://addons.mozilla.org/thunderbird/addon/2351/

  Then go to "tools->add ons", select "install" at the bottom of the screen,

  and browse to where you saved the .xul file.  This adds an "Enable

  Wordwrap" entry under the Options menu of the message composer.





~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

TkRat (GUI)

TkRat (GUI)

Documentation/filesystems/proc.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -1245,8 +1245,9 @@ second). The meanings of the columns are as follows, from left to right: 




The "intr" line gives counts of interrupts  serviced since boot time, for each

The "intr" line gives counts of interrupts  serviced since boot time, for each

of the  possible system interrupts.   The first  column  is the  total of  all

of the  possible system interrupts.   The first  column  is the  total of  all

interrupts serviced; each  subsequent column is the  total for that particular

interrupts serviced  including  unnumbered  architecture specific  interrupts;

interrupt.

each  subsequent column is the  total for that particular numbered interrupt.

Unnumbered interrupts are not shown, only summed into the total.





The "ctxt" line gives the total number of context switches across all CPUs.

The "ctxt" line gives the total number of context switches across all CPUs.

Documentation/java.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,9 @@ shift 
#define CP_METHODREF 10

#define CP_METHODREF 10

#define CP_INTERFACEMETHODREF 11

#define CP_INTERFACEMETHODREF 11

#define CP_NAMEANDTYPE 12

#define CP_NAMEANDTYPE 12

#define CP_METHODHANDLE 15

#define CP_METHODTYPE 16

#define CP_INVOKEDYNAMIC 18





/* Define some commonly used error messages */

/* Define some commonly used error messages */
@@ -242,14 +245,19 @@ void skip_constant(FILE *classfile, u_int16_t *cur) 
		break;

		break;

	case CP_CLASS:

	case CP_CLASS:

	case CP_STRING:

	case CP_STRING:

	case CP_METHODTYPE:

		seekerr = fseek(classfile, 2, SEEK_CUR);

		seekerr = fseek(classfile, 2, SEEK_CUR);

		break;

		break;

	case CP_METHODHANDLE:

		seekerr = fseek(classfile, 3, SEEK_CUR);

		break;

	case CP_INTEGER:

	case CP_INTEGER:

	case CP_FLOAT:

	case CP_FLOAT:

	case CP_FIELDREF:

	case CP_FIELDREF:

	case CP_METHODREF:

	case CP_METHODREF:

	case CP_INTERFACEMETHODREF:

	case CP_INTERFACEMETHODREF:

	case CP_NAMEANDTYPE:

	case CP_NAMEANDTYPE:

	case CP_INVOKEDYNAMIC:

		seekerr = fseek(classfile, 4, SEEK_CUR);

		seekerr = fseek(classfile, 4, SEEK_CUR);

		break;

		break;

	case CP_LONG:

	case CP_LONG: