From b681699a7a1bb68bc5ba8c9c9d82cbc73db791ba Mon Sep 17 00:00:00 2001 From: sfoo Date: Sun, 11 Feb 2018 15:33:42 -0500 Subject: [PATCH 1/2] Review dictionary for extraneous words --- ci/vale/dictionary.txt | 28 +----------- ...bsonic-media-server-on-ubuntu-or-debian.md | 2 +- .../install-and-configure-mumble-on-debian.md | 2 +- ...s-using-filebeat-elastic-stack-centos-7.md | 2 +- ...-clusters-with-galera-debian-and-ubuntu.md | 2 +- ...rails-with-apache-on-ubuntu-9-04-jaunty.md | 2 +- .../dns/previewing-websites-without-dns.md | 4 +- ...nnel-with-your-linode-for-safe-browsing.md | 2 +- .../vpn/set-up-wireguard-vpn-on-ubuntu.md | 2 +- docs/quick-answers/linux/how-to-use-git.md | 2 +- docs/quick-answers/linux/how-to-use-wget.md | 2 +- .../how-to-install-midnight-commander.md | 2 +- .../nginx/how-to-configure-nginx.md | 2 +- ...nx-on-ubuntu-12-04-lts-precise-pangolin.md | 2 +- .../how-to-install-and-configure-wordpress.md | 2 +- docs/websites/wikis/confluence-on-centos-5.md | 2 +- .../wikis/confluence-on-debian-5-lenny.md | 2 +- .../websites/wikis/confluence-on-fedora-13.md | 2 +- .../wikis/confluence-on-ubuntu-10-04-lucid.md | 2 +- .../wikis/confluence-on-ubuntu-9-10-karmic.md | 2 +- .../wikis/ikiwiki-on-ubuntu-9-10-karmic.md | 44 +++++++++---------- 21 files changed, 41 insertions(+), 71 deletions(-) diff --git a/ci/vale/dictionary.txt b/ci/vale/dictionary.txt index 53b5d6daa25..b858a321d4b 100644 --- a/ci/vale/dictionary.txt +++ b/ci/vale/dictionary.txt @@ -5,7 +5,6 @@ adc addon addons addr -addressfield adduser adminpack adodb @@ -79,8 +78,6 @@ backtick backticks bak bampton -bandwdith -bandwith barcode baremetal base64 @@ -102,7 +99,6 @@ bootups bounceback brackley bram -broswer bs4 bugtracker bukkit @@ -111,7 +107,6 @@ bungeecord burndown byrequests bzip2 -bzip2 bzrtools c2s cabd @@ -159,7 +154,6 @@ clickjacking client1 client2 clojure -clonefrom clozure cls cluebringer @@ -171,7 +165,6 @@ cmdmod cmusieve cnf codebase -codeblock codec com2sec comodo @@ -179,14 +172,12 @@ conda config configs configtest -confluece convolutional coose copyfrom copyto coreutils corporateclean -couldn cpanminus cpu cqlsh @@ -216,8 +207,6 @@ cyberduck cyg cygwin cz -d39a -d693 daemonization daemonize daemonized @@ -259,7 +248,6 @@ df dhclient dialogs diavel -didn diffie digium diplays @@ -304,7 +292,6 @@ dshield dsn ducati dust2 -dust2 dvcs e2fsck ea04 @@ -329,8 +316,6 @@ epel erb erlang esc -essage -estart etcd etcd0 eth0 @@ -368,7 +353,6 @@ fb4c fcgi fcgiwrap fcrontab -fd86 fdisk fdriver fe70 @@ -376,7 +360,6 @@ fedf fetchmail fetchmailrc ff02 -fi fiiiile file1 filebeat @@ -461,7 +444,6 @@ guarisma gui gunicorn gz -gzio gzip gzipped gzipping @@ -490,7 +472,6 @@ hoc homebrew host1 host2 -hostames hostname hostnames hotspots @@ -854,11 +835,9 @@ oftc ohai ok oldstable -ommand oneof onone ons -ontinue opencart opendkim openfire @@ -884,7 +863,6 @@ owncloud pacman pagent pagespeed -pakages pandoc param paramiko @@ -1024,7 +1002,6 @@ remotehost replset repo repos -repositoryformatversion resharding resilvering resolv @@ -1275,7 +1252,7 @@ ui uidl un unban -Unbans +unbans unbilled unbundle uncheck @@ -1284,17 +1261,14 @@ uncomment uncommented uncommenting uncompress -unecrypted unencrypted unformatted -unforseen unicast unintuitive uniq unmerged unmount unmounting -unncessary unoptimized unpatched unregister diff --git a/docs/applications/media-servers/install-subsonic-media-server-on-ubuntu-or-debian.md b/docs/applications/media-servers/install-subsonic-media-server-on-ubuntu-or-debian.md index c17d3000cac..0d71117b589 100644 --- a/docs/applications/media-servers/install-subsonic-media-server-on-ubuntu-or-debian.md +++ b/docs/applications/media-servers/install-subsonic-media-server-on-ubuntu-or-debian.md @@ -117,7 +117,7 @@ If you have a firewall set up on your Linode, be sure to edit the permissions to mkdir /var/music chown subsonic:subsonic /var/music -2. Open Subsonic in your broswer by navigating to the Linode's IP address or domain name. Be sure to append a colon and the port number after the address. If you've configured subsonic to use SSL, be sure to prepend `https` to the address. +2. Open Subsonic in your browser by navigating to the Linode's IP address or domain name. Be sure to append a colon and the port number after the address. If you've configured subsonic to use SSL, be sure to prepend `https` to the address. If you’re using Subsonic’s default SSL certificate, you’ll see a message like the following. You can safely "proceed anyway": diff --git a/docs/applications/voip/install-and-configure-mumble-on-debian.md b/docs/applications/voip/install-and-configure-mumble-on-debian.md index 7883eb1495d..db2f3059719 100644 --- a/docs/applications/voip/install-and-configure-mumble-on-debian.md +++ b/docs/applications/voip/install-and-configure-mumble-on-debian.md @@ -88,7 +88,7 @@ For Debian 7 or earlier: | welcometext | Set the text that shows in the text chat log when you login. | | port | Set the port you wish to bind to and have your users connect to. | | serverpassword | Set a password that users will have to use to login. This is not the same as the SuperUser password and therefore, should be different. | - | bandwidth | Set the maximum bandwith (in bits per second) each user can use. | + | bandwidth | Set the maximum bandwidth (in bits per second) each user can use. | | users | Set the maximum number of users that can connect to the server at once. | diff --git a/docs/databases/elasticsearch/monitor-nginx-web-server-logs-using-filebeat-elastic-stack-centos-7.md b/docs/databases/elasticsearch/monitor-nginx-web-server-logs-using-filebeat-elastic-stack-centos-7.md index daad94ee750..4a08350406f 100644 --- a/docs/databases/elasticsearch/monitor-nginx-web-server-logs-using-filebeat-elastic-stack-centos-7.md +++ b/docs/databases/elasticsearch/monitor-nginx-web-server-logs-using-filebeat-elastic-stack-centos-7.md @@ -348,7 +348,7 @@ include /etc/nginx/default.d/*.conf; {{< /file-excerpt >}} -2. estart nginx: +2. Restart nginx: sudo systemctl restart nginx diff --git a/docs/databases/mariadb/set-up-mariadb-clusters-with-galera-debian-and-ubuntu.md b/docs/databases/mariadb/set-up-mariadb-clusters-with-galera-debian-and-ubuntu.md index 4d2af6df8f4..737128a9c40 100644 --- a/docs/databases/mariadb/set-up-mariadb-clusters-with-galera-debian-and-ubuntu.md +++ b/docs/databases/mariadb/set-up-mariadb-clusters-with-galera-debian-and-ubuntu.md @@ -18,7 +18,7 @@ external_resources: MariaDB replication with Galera adds redundancy for a site's database. With database replication, multiple servers act as a database cluster. Database clustering is particularly useful for high availability website configurations. This guide uses three separate Linodes to configure database replication, each with private IPv4 addresses on Debian and Ubuntu. {{< note >}} -Communication between nodes are unecrypted. This guide assumes that your Linodes are each configured with a [Private IP Address](/docs/networking/remote-access#adding-private-ip-addresses) and located within the same data center. +Communication between nodes are unencrypted. This guide assumes that your Linodes are each configured with a [Private IP Address](/docs/networking/remote-access#adding-private-ip-addresses) and located within the same data center. {{< /note >}} Additionally: diff --git a/docs/development/ror/ruby-on-rails-with-apache-on-ubuntu-9-04-jaunty.md b/docs/development/ror/ruby-on-rails-with-apache-on-ubuntu-9-04-jaunty.md index 3df1eb86d5f..4415b72b26c 100644 --- a/docs/development/ror/ruby-on-rails-with-apache-on-ubuntu-9-04-jaunty.md +++ b/docs/development/ror/ruby-on-rails-with-apache-on-ubuntu-9-04-jaunty.md @@ -39,7 +39,7 @@ Before we get started there are a number of system-level dependencies that you w apt-get install make build-essential -We going to add a repository to our `/etc/apt/sources.list` to install pakages of Passenger from Ubuntu's "universe" repository. Add the following lines to your `sources.list` with the text editor of your choice: +We going to add a repository to our `/etc/apt/sources.list` to install packages of Passenger from Ubuntu's "universe" repository. Add the following lines to your `sources.list` with the text editor of your choice: {{< file "/etc/apt/sources.list" >}} deb http://us.archive.ubuntu.com/ubuntu/ jaunty universe diff --git a/docs/networking/dns/previewing-websites-without-dns.md b/docs/networking/dns/previewing-websites-without-dns.md index b6872cb1dd4..7554a85eacd 100644 --- a/docs/networking/dns/previewing-websites-without-dns.md +++ b/docs/networking/dns/previewing-websites-without-dns.md @@ -73,11 +73,11 @@ Next, you'll need your Linode's IP address. 3. Select your Linode. 4. Click the **Remote Access** tab. The webpage shown below appears. - [![Select a data center.](/docs/assets/1534-linode-manager-6-1-small.png)](/docs/assets/1535-linode-manager-6-1.png) + [![Select a data center.](/docs/assets/1534-linode-manager-6-1-small.png)](/docs/assets/1535-linode-manager-6-1.png) 5. Copy the addresses in the Public IPs section. -In this example, the Linode's IPv4 address is 96.126.108.183 and its IPv6 address is 2600:3c03::f03c:91ff:fedf:d693. Unless your Internet service provider supports IPv6, you'll want to the use the IPv4 address. +In this example, the Linode's IPv4 address is 96.126.108.183 and its IPv6 address is `2600:3c03::f03c:91ff:fedf:d693`. Unless your Internet service provider supports IPv6, you'll want to the use the IPv4 address. ## Updating the Hosts File diff --git a/docs/networking/ssh/setting-up-an-ssh-tunnel-with-your-linode-for-safe-browsing.md b/docs/networking/ssh/setting-up-an-ssh-tunnel-with-your-linode-for-safe-browsing.md index 8b3dbae1c03..bdcaf56f2d0 100644 --- a/docs/networking/ssh/setting-up-an-ssh-tunnel-with-your-linode-for-safe-browsing.md +++ b/docs/networking/ssh/setting-up-an-ssh-tunnel-with-your-linode-for-safe-browsing.md @@ -19,7 +19,7 @@ external_resources: ![SSH Tunnel for Safe Browsing](/docs/assets/ssh-tunnel/Setting_up_an_SSH_Tunnel_with_Your_Linode_for_Safe_Browsing_smg.jpg) -Often you may need to browse the web from a public Wi-Fi access point, such as a coffee shop or library, where you do not know the security measures taken by the administrator. Your communications could be snooped on by a malicious user or even by the network owner. +Often you may need to browse the web from a public WiFi access point, such as a coffee shop or library, where you do not know the security measures taken by the administrator. Your communications could be snooped on by a malicious user or even by the network owner. This guide will show you how to establish a secure connection for browsing the web through a tunnel between your computer and your Linode. With this method, you will set up a tunnel between your computer and your Linode. All your web traffic will be encrypted and forwarded from your Linode on to its final destination. diff --git a/docs/networking/vpn/set-up-wireguard-vpn-on-ubuntu.md b/docs/networking/vpn/set-up-wireguard-vpn-on-ubuntu.md index f59aa11da96..6e3e6c814c7 100644 --- a/docs/networking/vpn/set-up-wireguard-vpn-on-ubuntu.md +++ b/docs/networking/vpn/set-up-wireguard-vpn-on-ubuntu.md @@ -105,7 +105,7 @@ PostDown = iptables -D FORWARD -i wg0 -j ACCEPT; iptables -t nat -D POSTROUTING SaveConfig = true {{< /file >}} - **Address** defines the private IPv4 and IPv6 addresses for the WireGuard server. Each peer in the VPN network should have a unique value for this field. This guide will use the 192.168.2.0/24 address block for IPv4 and the fd86:ea04:1115::0/64 block for IPv6. + **Address** defines the private IPv4 and IPv6 addresses for the WireGuard server. Each peer in the VPN network should have a unique value for this field. This guide will use the 192.168.2.0/24 address block for IPv4 and the `fd86:ea04:1115::0/64` block for IPv6. **ListenPort** specifies the port that WireGuard will use for incoming connections. diff --git a/docs/quick-answers/linux/how-to-use-git.md b/docs/quick-answers/linux/how-to-use-git.md index 3c1feff3b39..90aa0ff2801 100644 --- a/docs/quick-answers/linux/how-to-use-git.md +++ b/docs/quick-answers/linux/how-to-use-git.md @@ -68,7 +68,7 @@ Git is a [version control system](https://en.wikipedia.org/wiki/Version_control) file2.txt file3.txt -5. To commit the changes of `file.txt` to the version control system, use `git commit`. Git requires you to write a commit message, a message will help you remember the changes you have made to your files. In this example, use the `-am` options to commit `a`ll modified files, specifically the ones Git is tracking, and include a commit `m`essage: +5. To commit the changes of `file.txt` to the version control system, use `git commit`. Git requires you to write a commit message, a message will help you remember the changes you have made to your files. In this example, use the `-am` options to commit `a`ll modified files, specifically the ones Git is tracking, and include a commit message: git commit -am "Added Hello Linode to file.txt" diff --git a/docs/quick-answers/linux/how-to-use-wget.md b/docs/quick-answers/linux/how-to-use-wget.md index 7e8c160eab1..4066e3ccae6 100644 --- a/docs/quick-answers/linux/how-to-use-wget.md +++ b/docs/quick-answers/linux/how-to-use-wget.md @@ -79,7 +79,7 @@ Picking the right location for your Linode is important, you have to decide what Continuing in background, pid 8764. Output will be written to ‘wget-log’. - If the file is too large, or you need to resume the download at a later time, you can use the `-c` option to `c`ontinue the download: + If the file is too large, or you need to resume the download at a later time, you can use the `-c` option to continue the download: wget -c http://speedtest.newark.linode.com/100MB-newark.bin diff --git a/docs/tools-reference/tools/how-to-install-midnight-commander.md b/docs/tools-reference/tools/how-to-install-midnight-commander.md index 64cd4814361..9b2e20f2f11 100644 --- a/docs/tools-reference/tools/how-to-install-midnight-commander.md +++ b/docs/tools-reference/tools/how-to-install-midnight-commander.md @@ -84,7 +84,7 @@ First, install the utility: These are drop-down menus that can be accessed by pressing **F9** and then navigating with your arrow keys. Press **F9** and then the **DOWN** arrow key multiple times until **Tree** is highlighted. Press **ENTER**. The panel has now changed to tree view. -4. Once you hit the **F9** key, some letters get highlighted, e.g., **C** in **C**ommand. These are keys that you can press to navigate the menus faster. Let's return to your previous view: press **F9** then **l** (L) and then **g** to get back to **File listing**. When an input field is selected, hold **ALT** down before pressing on the highlighted letter. +4. Once you hit the **F9** key, some letters get highlighted, e.g., **C** in Command. These are keys that you can press to navigate the menus faster. Let's return to your previous view: press **F9** then **l** (L) and then **g** to get back to **File listing**. When an input field is selected, hold **ALT** down before pressing on the highlighted letter. 5. Shortcut keys are a combination of keys pressed together that allow you to quickly access specific actions. For example, try pressing **CTRL+O**. This lets you focus on the command line or see previous command output while Midnight Commander runs in the background. You can quickly return to its interface by hitting the same key combination. diff --git a/docs/web-servers/nginx/how-to-configure-nginx.md b/docs/web-servers/nginx/how-to-configure-nginx.md index bd8d8bd15f3..f98072b8c22 100644 --- a/docs/web-servers/nginx/how-to-configure-nginx.md +++ b/docs/web-servers/nginx/how-to-configure-nginx.md @@ -350,7 +350,7 @@ server_name localhost linode galloway; {{< /file-excerpt >}} -nginx allows you to specify names for virtual hosts that are not valid domain names. nginx uses the name from the HTTP header to answer requests; it doesn't matter to nginx whether the domain name is valid or not. In this case, the hostames can be specified in the [/etc/hosts file](/docs/tools-reference/linux-system-administration-basics#configure-the-etchosts-file). +nginx allows you to specify names for virtual hosts that are not valid domain names. nginx uses the name from the HTTP header to answer requests; it doesn't matter to nginx whether the domain name is valid or not. In this case, the hostnames can be specified in the [/etc/hosts file](/docs/tools-reference/linux-system-administration-basics#configure-the-etchosts-file). Using non-domain hostnames may be useful if your nginx server is deployed on a LAN, or if you already know all of the clients that will be making requests of the server. This includes front-end proxy servers that preconfigured `/etc/hosts` entries for the IP address on which nginx is listening. diff --git a/docs/web-servers/nginx/installing-nginx-on-ubuntu-12-04-lts-precise-pangolin.md b/docs/web-servers/nginx/installing-nginx-on-ubuntu-12-04-lts-precise-pangolin.md index 74d0de5f0bd..c5339da4ce0 100644 --- a/docs/web-servers/nginx/installing-nginx-on-ubuntu-12-04-lts-precise-pangolin.md +++ b/docs/web-servers/nginx/installing-nginx-on-ubuntu-12-04-lts-precise-pangolin.md @@ -59,7 +59,7 @@ This method is the easiest and it ensures that Nginx has been tested to run at i ### Installing from NGINX -Nginx's [downloads page](https://www.nginx.com/download-oss-information/) has two more ways to install the web server: Using pre-built packages from the official Nginx repository or by building from source code. Either method will give you a more current version than what's available in Trusty Tahr but with a slightly higher chance of encountering unforseen issues because of newly-introduced bugs, and that these releases are not tested exclusively for a specific Linux distribution. +Nginx's [downloads page](https://www.nginx.com/download-oss-information/) has two more ways to install the web server: Using pre-built packages from the official Nginx repository or by building from source code. Either method will give you a more current version than what's available in Trusty Tahr but with a slightly higher chance of encountering unforeseen issues because of newly-introduced bugs, and that these releases are not tested exclusively for a specific Linux distribution. #### Installing from the Official Nginx Repository diff --git a/docs/websites/cms/how-to-install-and-configure-wordpress.md b/docs/websites/cms/how-to-install-and-configure-wordpress.md index ad0c682ac6a..a15b587b35f 100644 --- a/docs/websites/cms/how-to-install-and-configure-wordpress.md +++ b/docs/websites/cms/how-to-install-and-configure-wordpress.md @@ -113,7 +113,7 @@ define('FS_METHOD', 'direct'); Restart Apache. {{< note >}} -If using permalinks to set your posts' URLs, Apache will need to be updated to allow individual sites to update the `.htaccess` file. To permit this, add the following to you WordPress website's *VirtualHosts* codeblock: +If using permalinks to set your posts' URLs, Apache will need to be updated to allow individual sites to update the `.htaccess` file. To permit this, add the following to you WordPress website's *VirtualHosts* code block: {{< file-excerpt >}} diff --git a/docs/websites/wikis/confluence-on-centos-5.md b/docs/websites/wikis/confluence-on-centos-5.md index 6a4498b5878..461a144b2d6 100644 --- a/docs/websites/wikis/confluence-on-centos-5.md +++ b/docs/websites/wikis/confluence-on-centos-5.md @@ -17,7 +17,7 @@ external_resources: - '[Confluence Documentation](http://confluence.atlassian.com/display/DOC/Confluence+Documentation+Home)' --- -[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your CentOS 5 Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluece; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. +[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your CentOS 5 Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluence; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. ## Set the Hostname diff --git a/docs/websites/wikis/confluence-on-debian-5-lenny.md b/docs/websites/wikis/confluence-on-debian-5-lenny.md index 78fe4eb07ab..39c1e58644f 100644 --- a/docs/websites/wikis/confluence-on-debian-5-lenny.md +++ b/docs/websites/wikis/confluence-on-debian-5-lenny.md @@ -14,7 +14,7 @@ published: 2010-09-06 title: 'Confluence on Debian 5 (Lenny)' --- -[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Debian 5 (Lenny) Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluece; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. +[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Debian 5 (Lenny) Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluence; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. # Set the Hostname diff --git a/docs/websites/wikis/confluence-on-fedora-13.md b/docs/websites/wikis/confluence-on-fedora-13.md index 42f7cc6885b..c52f065c6e0 100644 --- a/docs/websites/wikis/confluence-on-fedora-13.md +++ b/docs/websites/wikis/confluence-on-fedora-13.md @@ -16,7 +16,7 @@ title: Confluence on Fedora 13 -[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Fedora 13 Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluece; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. +[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Fedora 13 Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluence; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. # Set the Hostname diff --git a/docs/websites/wikis/confluence-on-ubuntu-10-04-lucid.md b/docs/websites/wikis/confluence-on-ubuntu-10-04-lucid.md index d1b8b01f5c2..699069eb035 100644 --- a/docs/websites/wikis/confluence-on-ubuntu-10-04-lucid.md +++ b/docs/websites/wikis/confluence-on-ubuntu-10-04-lucid.md @@ -14,7 +14,7 @@ published: 2010-09-05 title: 'Confluence on Ubuntu 10.04 (Lucid)' --- -[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Ubuntu 10.04 (Lucid) Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluece; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. +[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Ubuntu 10.04 (Lucid) Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluence; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. # Set the Hostname diff --git a/docs/websites/wikis/confluence-on-ubuntu-9-10-karmic.md b/docs/websites/wikis/confluence-on-ubuntu-9-10-karmic.md index 11dfc62b46e..cb626168e06 100644 --- a/docs/websites/wikis/confluence-on-ubuntu-9-10-karmic.md +++ b/docs/websites/wikis/confluence-on-ubuntu-9-10-karmic.md @@ -15,7 +15,7 @@ title: 'Confluence on Ubuntu 9.10 (Karmic)' --- -[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Ubuntu 9.10 (Karmic) Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluece; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. +[Confluence](http://www.atlassian.com/software/confluence/) is a popular wiki system that features easy editing and publishing, Microsoft Office and SharePoint integration, the ability to add custom features via plugins, and more. It is [free for use](http://www.atlassian.com/software/jira/licensing.jsp#nonprofit) by official non-profit organizations, charities, educational institutions, and established open source projects. These guides will help you get started with Confluence on your Ubuntu 9.10 (Karmic) Linode. It is assumed that you're starting with a freshly deployed system. If you've already deployed applications to your Linode, you may need to make some adjustments to these instructions to accommodate your existing setup. It is also assumed that you've already obtained a license key for Confluence; if not, please do so before proceeding. These steps should be performed as the "root" user via an SSH session. # Set the Hostname diff --git a/docs/websites/wikis/ikiwiki-on-ubuntu-9-10-karmic.md b/docs/websites/wikis/ikiwiki-on-ubuntu-9-10-karmic.md index 76429c053ce..3be565796fc 100644 --- a/docs/websites/wikis/ikiwiki-on-ubuntu-9-10-karmic.md +++ b/docs/websites/wikis/ikiwiki-on-ubuntu-9-10-karmic.md @@ -101,19 +101,17 @@ It's important to set up a git repository that will be the "origin" repository f Edit the `~/wiki/.git/config` file to create the remote repository so that it looks something like the following example: -{{< file >}} -\~/wiki/.git/config -{{< /file >}} +{{< file-excerpt "~/wiki/.git/config" >}} +[core] +: repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true + +[remote "origin"] +: fetch = +refs/heads/*:refs/remotes/origin/* url = /srv/git/wiki.git + +[branch "master"] +: remote = origin merge = refs/heads/master +{{< /file-excerpt >}} -> [core] -> : repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true -> -> [remote "origin"] -> : fetch = +refs/heads/*:refs/remotes/origin/* url = /srv/git/wiki.git -> -> [branch "master"] -> : remote = origin merge = refs/heads/master -> Now perform the first push using the following sequence of commands. This will update the "origin" repository with the first commit created above: cd ~/wiki/ @@ -158,19 +156,17 @@ The process for creating a bare repository to push/pull the `wiki-admin` git rep Next, edit the `~/wiki-admin/.git/config` file to set up the remote repository. Use the following example as a guideline. -{{< file >}} -\~/wiki/.git/config -{{< /file >}} +{{< file-excerpt "~/wiki/.git/config" >}} +[core] +: repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true + +[remote "origin"] +: fetch = +refs/heads/*:refs/remotes/origin/* url = /srv/git/wiki-admin.git + +[branch "master"] +: remote = origin merge = refs/heads/master +{{< /file-excerpt >}} -> [core] -> : repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true -> -> [remote "origin"] -> : fetch = +refs/heads/*:refs/remotes/origin/* url = /srv/git/wiki-admin.git -> -> [branch "master"] -> : remote = origin merge = refs/heads/master -> Now you can perform the first push for the `wiki-admin` repository by issuing the following commands: cd ~/wiki-admin/ From 78d2d90a9c2d80eeb68c6b8708ffca59889b748c Mon Sep 17 00:00:00 2001 From: sfoo Date: Sun, 11 Feb 2018 17:43:58 -0500 Subject: [PATCH 2/2] Correct modified by date --- ...w-to-install-and-configure-a-redis-cluster-on-ubuntu-1604.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/applications/big-data/how-to-install-and-configure-a-redis-cluster-on-ubuntu-1604.md b/docs/applications/big-data/how-to-install-and-configure-a-redis-cluster-on-ubuntu-1604.md index bc369afdedb..604822c1ef1 100644 --- a/docs/applications/big-data/how-to-install-and-configure-a-redis-cluster-on-ubuntu-1604.md +++ b/docs/applications/big-data/how-to-install-and-configure-a-redis-cluster-on-ubuntu-1604.md @@ -7,7 +7,7 @@ og_description: 'Learn to set up a Redis cluster using three Linode servers and keywords: ["redis cluster installation", "data store", "cache", "sharding"] license: '[CC BY-ND 4.0](http://creativecommons.org/licenses/by-nd/4.0)' aliases: ['applications/big-data/redis-cluster'] -modified: 2018-08-14 +modified: 2018-02-11 modified_by: name: Sam Foo published: 2017-08-14