diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-05 12:14:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-05 12:14:43 -0400 |
| commit | 722919e5d9af770d576ea6255ca0be091440858b (patch) | |
| tree | d1b7c0454c5a79cdbb4bdbd792c0e4874b94a8eb | |
| parent | 0500d982f4fdba241e085c5c601479dff813d829 (diff) | |
| parent | 12fa5bf83f78ff2efbafc0499e98028b81db71d4 (diff) | |
Merge remote-tracking branch 'jim/jim'
| -rwxr-xr-x | Build/mdwn2man | 2 | ||||
| -rw-r--r-- | doc/git-annex-smudge.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Build/mdwn2man b/Build/mdwn2man index 09b684a07..d50c2a011 100755 --- a/Build/mdwn2man +++ b/Build/mdwn2man @@ -10,7 +10,7 @@ while (<>) { s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg; s/\`([^\`]*)\`/\\fB$1\\fP/g; s/\`//g; - s/^\s*\./\\&./g; + s/^ *\./\\&./g; if (/^#\s/) { s/^#\s/.SH /; <>; # blank; diff --git a/doc/git-annex-smudge.mdwn b/doc/git-annex-smudge.mdwn index 7439c8784..3b34ab7dc 100644 --- a/doc/git-annex-smudge.mdwn +++ b/doc/git-annex-smudge.mdwn @@ -25,7 +25,7 @@ not need to configure it manually. clean = git-annex smudge --clean %f To make git use that filter driver, it needs to be configured in -the .gitattributes file or in `.git/config/attributes`. The latter +the `.gitattributes` file or in `.git/info/attributes`. The latter is normally configured when a repository is initialized, with the following contents: |