Merge pull request #7180 from RubenKelevra/fixtypos

Fixtypos

.circleci/config.yml

@@ -174,7 +174,6 @@ jobs:
           name: Cloning
           command: |
             git clone https://github.com/ipfs/interop.git
-            git -C interop checkout "fix/disable-repo-interop-test"
             git -C interop log -1
       - restore_cache:
           keys:

.github/ISSUE_TEMPLATE/doc.md

@@ -6,7 +6,7 @@ labels: topic/docs-ipfs
 
 #### Location
 
-<!-- In the case of missing/erroneous documentation, where is the error? If possible, a link/url would be great! -->
+<!-- In the case of missing/erroneous documentation, where is the error? If possible, a link/URL would be great! -->
 
 #### Description
 

.github/ISSUE_TEMPLATE/question.md

@@ -1,11 +1,11 @@
 ---
 name: 'Question/Support'
-about: 'DO NOT SELECT THIS OPTION: Ask questions on discuss.ipfs.io, IRC (#ipfs on freenode), or Matrix (#ipfs:matrix.org)'
+about: 'DO NOT SELECT THIS OPTION: Ask questions on discuss.ipfs.io, IRC (#ipfs on Freenode), or Matrix (#ipfs:matrix.org)'
 labels: kind/question
 ---
 
 DO NOT ASK QUESTIONS HERE
 
-This bug tracker is only for actionable bug reports and feature requests. Please direct any questions to https://discuss.ipfs.io or to our Matrix (#ipfs:matrix.org) or IRC (#ipfs on freenode) channels.
+This bug tracker is only for actionable bug reports and feature requests. Please direct any questions to https://discuss.ipfs.io or our Matrix (#ipfs:matrix.org) or IRC (#ipfs on Freenode) channels.
 
 If you don't get an immediate response, please keep trying.

assets/init-doc/about

@@ -4,7 +4,7 @@
 IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas
 from Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single bit-
 torrent swarm, exchanging git objects. IPFS provides an interface as simple
-as the HTTP web, but with permanence built in. You can also mount the world
+as the HTTP web, but with permanence built-in. You can also mount the world
 at /ipfs.
 
 IPFS is a protocol:
@@ -20,14 +20,14 @@ IPFS is a web:
 - can be used to view documents like the web
 - files accessible via HTTP at `http://ipfs.io/<path>`
 - browsers or extensions can learn to use `ipfs://` directly
-- hash-addressed content guarantees authenticity
+- hash-addressed content guarantees the authenticity
 
 IPFS is modular:
 - connection layer over any network protocol
 - routing layer
 - uses a routing layer DHT (kademlia/coral)
 - uses a path-based naming service
-- uses bittorrent-inspired block exchange
+- uses BitTorrent-inspired block exchange
 
 IPFS uses crypto:
 - cryptographic-hash content addressing
@@ -40,10 +40,10 @@ IPFS is p2p:
 - completely decentralized architecture
 - **no** central point of failure
 
-IPFS is a cdn:
+IPFS is a CDN:
 - add a file to the filesystem locally, and it's now available to the world
 - caching-friendly (content-hash naming)
-- bittorrent-based bandwidth distribution
+- BitTorrent-based bandwidth distribution
 
 IPFS has a name service:
 - IPNS, an SFS inspired name system

assets/init-doc/help

@@ -4,4 +4,4 @@ Some helpful resources for finding your way around ipfs:
 - ipfs commands: a list of all commands
 - ipfs --help: every command describes itself
 - https://github.com/ipfs/go-ipfs -- the src repository
-- #ipfs on irc.freenode.org -- the community irc channel
+- #ipfs on irc.freenode.org -- the community IRC channel

assets/init-doc/quick-start

@@ -96,7 +96,7 @@ Tool:
 
 Browse:
 
-  webui:
+  WebUI:
 
     http://localhost:5001/webui
 

core/commands/files.go

@@ -36,11 +36,11 @@ var FilesCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Interact with unixfs files.",
 		ShortDescription: `
-Files is an API for manipulating IPFS objects as if they were a unix
+Files is an API for manipulating IPFS objects as if they were a Unix
 filesystem.
 
 The files facility interacts with MFS (Mutable File System). MFS acts as a
-single, dynamic filesystem mount. MFS has a root CID which is transparently
+single, dynamic filesystem mount. MFS has a root CID that is transparently
 updated when a change happens (and can be checked with "ipfs files stat /").
 
 All files and folders within MFS are respected and will not be cleaned up
@@ -61,7 +61,7 @@ to true. Use caution when setting this flag to false. It will improve
 performance for large numbers of file operations, but it does so at the cost
 of consistency guarantees. If the daemon is unexpectedly killed before running
 'ipfs files flush' on the files in question, then data may be lost. This also
-applies to running 'ipfs repo gc' concurrently with '--flush=false'
+applies to run 'ipfs repo gc' concurrently with '--flush=false'
 operations.
 `,
 	},
@@ -552,10 +552,10 @@ const (
 
 var filesReadCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
-		Tagline: "Read a file in a given mfs.",
+		Tagline: "Read a file in a given MFS.",
 		ShortDescription: `
 Read a specified number of bytes from a file at a given offset. By default,
-will read the entire file similar to unix cat.
+it will read the entire file similar to the Unix cat.
 
 Examples:
 
@@ -647,7 +647,7 @@ var filesMvCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Move files.",
 		ShortDescription: `
-Move files around. Just like traditional unix mv.
+Move files around. Just like the traditional Unix mv.
 
 Example:
 
@@ -702,7 +702,7 @@ a beginning offset to write to. The entire length of the input will be
 written.
 
 If the '--create' option is specified, the file will be created if it does not
-exist. Nonexistant intermediate directories will not be created unless the
+exist. Nonexistent intermediate directories will not be created unless the
 '--parents' option is specified.
 
 Newly created files will have the same CID version and hash function of the
@@ -712,7 +712,7 @@ Newly created leaves will be in the legacy format (Protobuf) if the
 CID version is 0, or raw if the CID version is non-zero.  Use of the
 '--raw-leaves' option will override this behavior.
 
-If the '--flush' option is set to false, changes will not be propogated to the
+If the '--flush' option is set to false, changes will not be propagated to the
 merkledag root. This can make operations much faster when doing a large number
 of writes to a deeper directory structure.
 
@@ -895,7 +895,7 @@ var filesFlushCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Flush a given path's data to disk.",
 		ShortDescription: `
-Flush a given path to disk. This is only useful when other commands
+Flush a given path to the disk. This is only useful when other commands
 are run with the '--flush=false'.
 `,
 	},

test/sharness/lib/test-lib-hashes.sh

@@ -1,5 +1,5 @@
 # this file defines several useful hashes used across the test codebase.
 # thus they can be defined + changed in one place
 
-HASH_WELCOME_DOCS="QmS4ustL54uo8FzR9455qaxZwuMiUhyvMcX9Ba8nUH4uVv"
+HASH_WELCOME_DOCS="QmQPeNsJPyVWPFDVHb77w8G42Fvo15z4bG2X8D2GhfbSXc"
 HASH_EMPTY_DIR="QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn"

test/sharness/t0054-dag-car-import-export.sh

@@ -149,7 +149,7 @@ test_init_ipfs
 
 
 test_expect_success "basic offline export of 'getting started' dag works" '
-  ipfs dag export QmS4ustL54uo8FzR9455qaxZwuMiUhyvMcX9Ba8nUH4uVv >/dev/null
+  ipfs dag export "$HASH_WELCOME_DOCS" >/dev/null
 '