Skip to content

Commit

Permalink
regenerate manuals using ox-texinfo+ v1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tarsius committed Dec 1, 2016
1 parent d430d85 commit 426b1bf
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions Documentation/magit-popup.texi
Expand Up @@ -501,19 +501,19 @@ infix arguments, and then also one of its suffix commands.
'magit-commands
:man-page "git-tag"
:switches '((?a "Annotate" "--annotate")
(?s "Sign" "--sign")
(?f "Force" "--force"))
(?s "Sign" "--sign")
(?f "Force" "--force"))
:actions '((?t "Create" magit-tag)
(?k "Delete" magit-tag-delete)
(?p "Prune" magit-tag-prune))
(?k "Delete" magit-tag-delete)
(?p "Prune" magit-tag-prune))
:default-action 'magit-tag)
;;;###autoload
(defun magit-tag (name rev &optional args)
"Create a new tag with the given NAME at REV."
(interactive (list (magit-read-tag "Tag name")
(magit-read-branch-or-commit "Place tag on")
(magit-tag-arguments)))
(magit-read-branch-or-commit "Place tag on")
(magit-tag-arguments)))
(magit-run-git-with-editor "tag" args name rev))
@end lisp

Expand Down
20 changes: 10 additions & 10 deletions Documentation/magit.texi
Expand Up @@ -414,7 +414,7 @@ To use Melpa:
@lisp
(require 'package)
(add-to-list 'package-archives
'("melpa" . "http://melpa.org/packages/") t)
'("melpa" . "http://melpa.org/packages/") t)
@end lisp

@itemize
Expand All @@ -425,7 +425,7 @@ To use Melpa-Stable:
@lisp
(require 'package)
(add-to-list 'package-archives
'("melpa-stable" . "http://stable.melpa.org/packages/") t)
'("melpa-stable" . "http://stable.melpa.org/packages/") t)
@end lisp

Once you have added your preferred archive, you need to update the
Expand Down Expand Up @@ -491,7 +491,7 @@ Finally add this to your init file:
(with-eval-after-load 'info
(info-initialize)
(add-to-list 'Info-directory-list
"~/.emacs.d/site-lisp/magit/Documentation/"))
"~/.emacs.d/site-lisp/magit/Documentation/"))
@end lisp

Note that you have to add the @code{lisp} subdirectory to the @code{load-path}, not
Expand Down Expand Up @@ -1977,9 +1977,9 @@ To make this command available, use something like:

@lisp
(add-hook 'ido-setup-hook
(lambda ()
(define-key ido-completion-map
(kbd \"C-x g\") 'ido-enter-magit-status)))
(lambda ()
(define-key ido-completion-map
(kbd \"C-x g\") 'ido-enter-magit-status)))
@end lisp

Starting with Emacs 25.1 the Ido keymaps are defined just once
Expand Down Expand Up @@ -7340,7 +7340,7 @@ For example:
@example
[include]
path = /path/to/huge-gitconfig
path = /path/to/huge-gitconfig
@end example
Expand All @@ -7349,7 +7349,7 @@ For example:
@example
[status]
showUntrackedFiles = no
showUntrackedFiles = no
@end example
Expand Down Expand Up @@ -8621,8 +8621,8 @@ then you can override these settings just for Magit by using:
@lisp
(setq magit-git-global-arguments
(nconc magit-git-global-arguments
'("-c" "color.ui=false"
"-c" "color.diff=false")))
'("-c" "color.ui=false"
"-c" "color.diff=false")))
@end lisp
@node Expanding a file to show the diff causes it to disappear
Expand Down

0 comments on commit 426b1bf

Please sign in to comment.