Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct some typographical errors. #112

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Correct some typographical errors. #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ keychain.1: keychain.pod keychain.sh
keychain.1.gz: keychain.1
gzip -9 keychain.1

GENKEYCHAINPL = open P, "keychain.txt" or die "cant open keychain.txt"; \
GENKEYCHAINPL = open P, "keychain.txt" or die "cannot open keychain.txt"; \
while (<P>) { \
$$printing = 0 if /^\w/; \
$$printing = 1 if /^(SYNOPSIS|OPTIONS)/; \
Expand All @@ -39,7 +39,7 @@ GENKEYCHAINPL = open P, "keychain.txt" or die "cant open keychain.txt"; \
s/(^|\s)(-+[-\w]+)/$$1\$${GREEN}$$2\$${OFF}/g; \
$$pod .= $$_; \
}; \
open B, "keychain.sh" or die "cant open keychain.sh"; \
open B, "keychain.sh" or die "cannot open keychain.sh"; \
$$/ = undef; \
$$_ = <B>; \
s/INSERT_POD_OUTPUT_HERE[\r\n]/$$pod/ || die; \
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ IMPORTANT - GitHub Contributors

Please apply your patches to `keychain.sh`, *not* the generated `keychain`
script, which we are now including in the git repo to facilitate the
distribution of release archives direct from GitHub. All development work will
be done on the 'devel' branch and will only be merged with the master branch when
distribution of release archives directly from GitHub. All development work will
be done on the 'devel' branch and will only be merged into the master branch when
a new release is made. This should allow the generated files (keychain, man pages,
spec file)to remain in sync on the master branch but no guarantees are made except
spec file) to remain in sync on the master branch but no guarantees are made except
for the tagged release. They will be regenerated for official release archives
only (those tagged with the release version.). Anyone using or contributing to the
only (those tagged with the release version). Anyone using or contributing to the
'devel' branch should assume the generated files are out of date and regenerate
locally if needed.
Thanks!
Expand Down
4 changes: 2 additions & 2 deletions keychain.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ available on the system.)

As an additional feature, if a private key has an extension ".ext", keychain
will look for privkey.ext.pub first, and if not found, will look for
privkeyname.pub.
privkey.pub.

Keychain also supports gpg-agent in the same ways that ssh-agent is
supported. By default keychain attempts to start ssh-agent only.
Expand Down Expand Up @@ -234,7 +234,7 @@ keychain-2.5.0, this was the behavior of the bare "--stop" option.

=item others

Kill agent processes other than the one keychain is providing. Prior
Kill agent processes other than the ones keychain is providing. Prior
to keychain-2.5.0, keychain would do this automatically. The new
behavior requires that you specify it explicitly if you want it.

Expand Down