From ac4094e0ad70a6be2163b06d24b53992b93aee4f Mon Sep 17 00:00:00 2001 From: Marco Bonelli Date: Fri, 8 Feb 2019 01:28:43 +0100 Subject: [PATCH] Refactor: improve consistency of the term "directory". This commit changes the term "folder" to "directory" in every instance where the first is used in an example description, but the second is used in the example code, and vice versa. --- pages/common/ag.md | 2 +- pages/common/code.md | 4 ++-- pages/common/cpio.md | 2 +- pages/common/duplicity.md | 4 ++-- pages/common/pdfunite.md | 2 +- pages/common/rm.md | 6 +++--- pages/common/rsync.md | 4 ++-- pages/common/scp.md | 2 +- pages/common/srm.md | 2 +- pages/common/subl.md | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pages/common/ag.md b/pages/common/ag.md index 204a23a12..910fb278e 100644 --- a/pages/common/ag.md +++ b/pages/common/ag.md @@ -8,7 +8,7 @@ - Find files containing "foo" in a specific directory: -`ag {{foo}} {{path/to/folder}}` +`ag {{foo}} {{path/to/directory}}` - Find files containing "foo", but only list the filenames: diff --git a/pages/common/code.md b/pages/common/code.md index 90d1ec68e..20ebf644b 100644 --- a/pages/common/code.md +++ b/pages/common/code.md @@ -13,11 +13,11 @@ - Open a file or directory in VS Code: -`code {{path/to/file_or_folder}}` +`code {{path/to/file_or_directory}}` - Open a file or directory in the currently open VS Code window: -`code --reuse-window {{path/to/file_or_folder}}` +`code --reuse-window {{path/to/file_or_directory}}` - Compare two files in VS Code: diff --git a/pages/common/cpio.md b/pages/common/cpio.md index adbcf4056..259495443 100644 --- a/pages/common/cpio.md +++ b/pages/common/cpio.md @@ -7,7 +7,7 @@ `echo "{{file1}} {{file2}} {{file3}}" | cpio -o > {{archive.cpio}}` -- Copy all files and folders in a directory and add them [o]nto an archive, in [v]erbose mode: +- Copy all files and directories in a directory and add them [o]nto an archive, in [v]erbose mode: `find {{path/to/directory}} | cpio -ov > {{archive.cpio}}` diff --git a/pages/common/duplicity.md b/pages/common/duplicity.md index 74cbb52ae..761c730b4 100644 --- a/pages/common/duplicity.md +++ b/pages/common/duplicity.md @@ -3,7 +3,7 @@ > Creates incremental, compressed, encrypted and versioned backups. > Can also upload the backups to a variety of backend services. -- Backup a folder via FTPS to a remote machine, encrypting it with a password: +- Backup a directory via FTPS to a remote machine, encrypting it with a password: `FTP_PASSWORD={{ftp_login_password}} PASSPHRASE={{encryption_password}} duplicity {{path/to/source/directory}} {{ftps://user@hostname/target/directory/path/}}` @@ -25,4 +25,4 @@ - Restore a subdirectory from a GnuPG-encrypted local backup to a given location: -`PASSPHRASE={{gpg_key_password}} duplicity restore --encrypt-key {{gpg_key_id}} --file-to-restore {{relative/path/restorefolder}} file://{{absolute/path/to/backup/folder}} {{path/to/directory/to/restore/to}}` +`PASSPHRASE={{gpg_key_password}} duplicity restore --encrypt-key {{gpg_key_id}} --file-to-restore {{relative/path/restoredirectory}} file://{{absolute/path/to/backup/directory}} {{path/to/directory/to/restore/to}}` diff --git a/pages/common/pdfunite.md b/pages/common/pdfunite.md index 53cba201e..8fd412b17 100644 --- a/pages/common/pdfunite.md +++ b/pages/common/pdfunite.md @@ -6,6 +6,6 @@ `pdfunite {{path/to/fileA.pdf}} {{path/to/fileB.pdf}} {{path/to/merged_output.pdf}}` -- Merge a folder of PDFs into a single PDF: +- Merge a directory of PDFs into a single PDF: `pdfunite {{path/to/directory/*.pdf}} {{path/to/merged_output.pdf}}` diff --git a/pages/common/rm.md b/pages/common/rm.md index 5c4496299..bfd2b6a07 100644 --- a/pages/common/rm.md +++ b/pages/common/rm.md @@ -8,11 +8,11 @@ - Recursively remove a directory and all its subdirectories: -`rm -r {{path/to/folder}}` +`rm -r {{path/to/directory}}` - Forcibly remove a directory, without prompting for confirmation or showing error messages: -`rm -rf {{path/to/folder}}` +`rm -rf {{path/to/directory}}` - Interactively remove multiple files, with a prompt before every removal: @@ -20,4 +20,4 @@ - Remove files in verbose mode, printing a message for each removed file: -`rm -v {{path/to/folder/*}}` +`rm -v {{path/to/directory/*}}` diff --git a/pages/common/rsync.md b/pages/common/rsync.md index 2b35a2782..41414b450 100644 --- a/pages/common/rsync.md +++ b/pages/common/rsync.md @@ -17,11 +17,11 @@ - Transfer a directory and all its children from a remote to local: -`rsync -r {{remote_host_name}}:{{remote_folder_location}} {{local_folder_location}}` +`rsync -r {{remote_host_name}}:{{remote_directory_location}} {{local_directory_location}}` - Transfer only updated files from remote host: -`rsync -ru {{remote_host_name}}:{{remote_folder_location}} {{local_folder_location}}` +`rsync -ru {{remote_host_name}}:{{remote_directory_location}} {{local_directory_location}}` - Transfer file over SSH and delete local files that do not exist on remote host: diff --git a/pages/common/scp.md b/pages/common/scp.md index 3c1de2207..507a38f4d 100644 --- a/pages/common/scp.md +++ b/pages/common/scp.md @@ -13,7 +13,7 @@ - Recursively copy the contents of a directory from a remote host to a local directory: -`scp -r {{remote_host}}:{{path/to/remote_dir}} {{path/to/local_dir}}` +`scp -r {{remote_host}}:{{path/to/remote_directory}} {{path/to/local_directory}}` - Copy a file between two remote hosts transferring through the local host: diff --git a/pages/common/srm.md b/pages/common/srm.md index 532c491ff..a62875161 100644 --- a/pages/common/srm.md +++ b/pages/common/srm.md @@ -13,7 +13,7 @@ - Recursively remove a directory and its contents overwriting each file with a single-pass of random data: -`srm -r -s {{/path/to/folder}}` +`srm -r -s {{/path/to/directory}}` - Prompt before every removal: diff --git a/pages/common/subl.md b/pages/common/subl.md index 98d6ff0da..5d68793da 100644 --- a/pages/common/subl.md +++ b/pages/common/subl.md @@ -8,7 +8,7 @@ - Open a file or directory in Sublime Text: -`subl {{path/to/file_or_folder}}` +`subl {{path/to/file_or_directory}}` - Open a file and jump to a specific line number: