2
2
mirror of https://github.com/octoleo/restic.git synced 2024-11-02 11:46:36 +00:00

Merge pull request #783 from opennota/master

Fix some typos
This commit is contained in:
Alexander Neumann 2017-02-09 10:43:27 +01:00
commit 073edd914d
11 changed files with 15 additions and 15 deletions

View File

@ -28,7 +28,7 @@ $ pacaur -S restic-git
# Building restic
restic is written in the Go programming language and you need at least Go version 1.6.
Building restic may also work with older versions of Go, but that's not spported.
Building restic may also work with older versions of Go, but that's not supported.
See the [Getting started](https://golang.org/doc/install) guide of the Go project for
instructions how to install Go.
@ -228,7 +228,7 @@ $ restic -r /tmp/backup backup ~/work --exclude=*.c --exclude-file=exclude
Patterns use [`filepath.Glob`](https://golang.org/pkg/path/filepath/#Glob) internally,
see [`filepath.Match`](https://golang.org/pkg/path/filepath/#Match) for syntax.
Additionally `**` exludes arbitrary subdirectories.
Additionally `**` excludes arbitrary subdirectories.
Environment-variables in exclude-files are expanded with [`os.ExpandEnv`](https://golang.org/pkg/os/#ExpandEnv).
By specifying the option `--one-file-system` you can instruct restic to only
@ -511,7 +511,7 @@ only available via HTTP, you can specify the URL to the server like this:
### Pre-Requisites
* Download and Install [Minio Server](https://minio.io/download/).
* You can also refer to [https://docs.minio.io](https://docs.minio.io) for step by step guidance on installation and getting started on Minio CLient and Minio Server.
* You can also refer to [https://docs.minio.io](https://docs.minio.io) for step by step guidance on installation and getting started on Minio Client and Minio Server.
You must first setup the following environment variables with the credentials of your running Minio Server.

View File

@ -128,7 +128,7 @@ func runForget(opts ForgetOptions, gopts GlobalOptions, args []string) error {
for _, s := range ids {
id, err := restic.FindSnapshot(repo, s)
if err != nil {
Warnf("cound not find a snapshot for ID %q, ignoring\n", s)
Warnf("could not find a snapshot for ID %q, ignoring\n", s)
continue
}

View File

@ -836,7 +836,7 @@ func TestRestoreWithPermissionFailure(t *testing.T) {
testRunRestore(t, gopts, filepath.Join(env.base, "restore"), snapshots[0])
// make sure that all files have been restored, regardeless of any
// make sure that all files have been restored, regardless of any
// permission errors
files := testRunLs(t, gopts, snapshots[0].String())
for _, filename := range files {
@ -935,7 +935,7 @@ func TestRebuildIndex(t *testing.T) {
}
if !strings.Contains(out, "restic rebuild-index") {
t.Fatalf("did not find hint for rebuild-index comman")
t.Fatalf("did not find hint for rebuild-index command")
}
testRunRebuildIndex(t, gopts)

View File

@ -220,7 +220,7 @@ func testParallelSaveWithDuplication(t *testing.T, seed int) {
errChannels := [](<-chan error){}
// interweaved processing of subsequent chunks
// interwoven processing of subsequent chunks
maxParallel := 2*duplication - 1
barrier := make(chan struct{}, maxParallel)

View File

@ -153,7 +153,7 @@ func buildSSHCommand(cfg Config) []string {
}
// OpenWithConfig opens an sftp backend as described by the config by running
// "ssh" with the appropiate arguments.
// "ssh" with the appropriate arguments.
func OpenWithConfig(cfg Config) (*SFTP, error) {
debug.Log("open with config %v", cfg)
return Open(cfg.Dir, "ssh", buildSSHCommand(cfg)...)
@ -193,7 +193,7 @@ func Create(dir string, program string, args ...string) (*SFTP, error) {
}
// CreateWithConfig creates an sftp backend as described by the config by running
// "ssh" with the appropiate arguments.
// "ssh" with the appropriate arguments.
func CreateWithConfig(cfg Config) (*SFTP, error) {
debug.Log("config %v", cfg)
return Create(cfg.Dir, "ssh", buildSSHCommand(cfg)...)

View File

@ -1,3 +1,3 @@
// Package fs implements an OS independend abstraction of a file system
// Package fs implements an OS independent abstraction of a file system
// suitable for backup purposes.
package fs

View File

@ -43,7 +43,7 @@ func (id ID) String() string {
return hex.EncodeToString(id[:])
}
// NewRandomID retuns a randomly generated ID. When reading from rand fails,
// NewRandomID returns a randomly generated ID. When reading from rand fails,
// the function panics.
func NewRandomID() ID {
id := ID{}

View File

@ -25,7 +25,7 @@ func (l Result) PackID() restic.ID {
return l.packID
}
// Size ruturns the size of the pack.
// Size returns the size of the pack.
func (l Result) Size() int64 {
return l.size
}

View File

@ -203,7 +203,7 @@ func (l *Lock) Stale() bool {
hn, err := os.Hostname()
if err != nil {
debug.Log("unable to find current hostnanme: %v", err)
debug.Log("unable to find current hostname: %v", err)
// since we cannot find the current hostname, assume that the lock is
// not stale.
return false

View File

@ -392,7 +392,7 @@ func (idx *Index) SetID(id restic.ID) error {
defer idx.m.Unlock()
if !idx.final {
return errors.New("indexs is not final")
return errors.New("index is not final")
}
if !idx.id.IsNull() {

View File

@ -87,7 +87,7 @@ func (sn Snapshot) String() string {
sn.id.Str(), sn.Paths, sn.Time, sn.Username, sn.Hostname)
}
// ID retuns the snapshot's ID.
// ID returns the snapshot's ID.
func (sn Snapshot) ID() *ID {
return sn.id
}