diff options
| author | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
|---|---|---|
| committer | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
| commit | ba4502fe1465f7803beca3ae187e41f0b25bef10 (patch) | |
| tree | de8bdc219eeeba72e1a8b271ac96234c3c5af447 /doc | |
| parent | b121ef10f500c0377c2ce665e8ccd8b97a6aedfd (diff) | |
| parent | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (diff) | |
| download | emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.tar.gz emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.zip | |
Merge branch 'emacs-24'
Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/.gitignore | 23 | ||||
| -rw-r--r-- | doc/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 8 | ||||
| -rw-r--r-- | doc/lispintro/.gitignore | 24 | ||||
| -rw-r--r-- | doc/lispref/.gitignore | 13 | ||||
| -rw-r--r-- | doc/misc/.gitignore | 23 |
6 files changed, 14 insertions, 83 deletions
diff --git a/doc/emacs/.gitignore b/doc/emacs/.gitignore deleted file mode 100644 index 3ff56b474dd..00000000000 --- a/doc/emacs/.gitignore +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | *.aux | ||
| 2 | *.cp | ||
| 3 | *.cps | ||
| 4 | *.dvi | ||
| 5 | *.fn | ||
| 6 | *.fns | ||
| 7 | *.ky | ||
| 8 | *.kys | ||
| 9 | *.log | ||
| 10 | *.op | ||
| 11 | *.ops | ||
| 12 | |||
| 13 | *.pg | ||
| 14 | *.pgs | ||
| 15 | *.ps | ||
| 16 | *.tmp | ||
| 17 | *.toc | ||
| 18 | *.tp | ||
| 19 | *.tps | ||
| 20 | *.vr | ||
| 21 | *.vrs | ||
| 22 | Makefile | ||
| 23 | makefile | ||
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index e608248b263..1ce7aa15aec 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-11-16 Tassilo Horn <tsdh@gnu.org> | ||
| 2 | |||
| 3 | * misc.texi (DocView Slicing): Describe how to slice with the | ||
| 4 | mouse. Fix command mentioned by slice by BoundingBox paragraph. | ||
| 5 | (Bug#18040) | ||
| 6 | |||
| 1 | 2014-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> | 7 | 2014-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 8 | ||
| 3 | * misc.texi (Network Security): Use "untrustworthy" instead of | 9 | * misc.texi (Network Security): Use "untrustworthy" instead of |
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 5bd0fc88b4e..39632cbe077 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi | |||
| @@ -525,12 +525,14 @@ and the slice's width and height. | |||
| 525 | 525 | ||
| 526 | A more convenient graphical way to specify the slice is with @kbd{s | 526 | A more convenient graphical way to specify the slice is with @kbd{s |
| 527 | m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to | 527 | m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to |
| 528 | select the slice. | 528 | select the slice. Simply press and hold the left mouse button at the |
| 529 | @c ??? How does this work? | 529 | upper-left corner of the region you want to have in the slice, then |
| 530 | move the mouse pointer to the lower-right corner and release the | ||
| 531 | button. | ||
| 530 | 532 | ||
| 531 | The most convenient way is to set the optimal slice by using | 533 | The most convenient way is to set the optimal slice by using |
| 532 | BoundingBox information automatically determined from the document by | 534 | BoundingBox information automatically determined from the document by |
| 533 | typing @kbd{s b} (@code{doc-view-set-slice-using-mouse}). | 535 | typing @kbd{s b} (@code{doc-view-set-slice-from-bounding-box}). |
| 534 | 536 | ||
| 535 | @findex doc-view-reset-slice | 537 | @findex doc-view-reset-slice |
| 536 | To cancel the selected slice, type @kbd{s r} | 538 | To cancel the selected slice, type @kbd{s r} |
diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore index e1af5a918b0..cf992dc8649 100644 --- a/doc/lispintro/.gitignore +++ b/doc/lispintro/.gitignore | |||
| @@ -1,21 +1,3 @@ | |||
| 1 | *.aux | 1 | !cons-*.pdf |
| 2 | *.fn | 2 | !drawers.pdf |
| 3 | *.fns | 3 | !lambda-*.pdf |
| 4 | *.cps | ||
| 5 | *.cp | ||
| 6 | *.kys | ||
| 7 | *.ky | ||
| 8 | *.toc | ||
| 9 | *.pgs | ||
| 10 | *.pg | ||
| 11 | *.log | ||
| 12 | *.vrs | ||
| 13 | *.vr | ||
| 14 | *.dvi | ||
| 15 | *.ps | ||
| 16 | *.tp | ||
| 17 | *.tps | ||
| 18 | *.tmp | ||
| 19 | *.txt | ||
| 20 | Makefile | ||
| 21 | makefile | ||
diff --git a/doc/lispref/.gitignore b/doc/lispref/.gitignore deleted file mode 100644 index ba74d365995..00000000000 --- a/doc/lispref/.gitignore +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | texput.log | ||
| 2 | elisp.?? | ||
| 3 | elisp.??? | ||
| 4 | config.log | ||
| 5 | config.cache | ||
| 6 | config.status | ||
| 7 | Makefile | ||
| 8 | makefile | ||
| 9 | elisp | ||
| 10 | elisp-? | ||
| 11 | elisp-?? | ||
| 12 | elisp1* | ||
| 13 | elisp2* | ||
diff --git a/doc/misc/.gitignore b/doc/misc/.gitignore deleted file mode 100644 index 3ff56b474dd..00000000000 --- a/doc/misc/.gitignore +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | *.aux | ||
| 2 | *.cp | ||
| 3 | *.cps | ||
| 4 | *.dvi | ||
| 5 | *.fn | ||
| 6 | *.fns | ||
| 7 | *.ky | ||
| 8 | *.kys | ||
| 9 | *.log | ||
| 10 | *.op | ||
| 11 | *.ops | ||
| 12 | |||
| 13 | *.pg | ||
| 14 | *.pgs | ||
| 15 | *.ps | ||
| 16 | *.tmp | ||
| 17 | *.toc | ||
| 18 | *.tp | ||
| 19 | *.tps | ||
| 20 | *.vr | ||
| 21 | *.vrs | ||
| 22 | Makefile | ||
| 23 | makefile | ||