From ed17a45e71ab23c0fe784e162780b5957fc0a1ea Mon Sep 17 00:00:00 2001 From: Kevin Putnam Date: Tue, 13 Nov 2018 11:00:29 -0800 Subject: [PATCH] fixed a couple broken links and escaped some URLs that were incorrectly being automatically hyperlinked by Sphinx. --- source/clear-linux/concepts/security.rst | 3 +-- source/clear-linux/guides/maintenance/autospec.rst | 3 +-- source/clear-linux/tutorials/docker/docker.rst | 2 +- .../tutorials/wordpress/web-server-install.rst | 10 +++++----- source/clear-linux/tutorials/wordpress/wp-install.rst | 6 +++--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/source/clear-linux/concepts/security.rst b/source/clear-linux/concepts/security.rst index 27ec5235..ee744db8 100644 --- a/source/clear-linux/concepts/security.rst +++ b/source/clear-linux/concepts/security.rst @@ -97,7 +97,7 @@ standards. Below are some examples: have been removed such as the `finger` and `tcpwrappers`. * `SFTP` has been disabled by default due to security - considerations. See the `openssh-server reference page`_ for more details. + considerations. Verified trust @@ -182,7 +182,6 @@ good security hygiene. Below are some examples: .. _`documentation about Software Updates`: https://clearlinux.org/documentation/clear-linux/concepts/swupd-about .. _`cve-check-tool`: https://github.com/clearlinux/cve-check-tool -.. _`openssh-server reference page`: https://clearlinux.org/documentation/clear-linux/reference/bundles/openssh-server .. _`blog post about swupd security`: https://clearlinux.org/blogs/security-software-update-clear-linux-os-intel-architecture .. _`rolling release model`: https://en.wikipedia.org/wiki/Rolling_release .. _`clrtrust`: https://github.com/clearlinux/clrtrust diff --git a/source/clear-linux/guides/maintenance/autospec.rst b/source/clear-linux/guides/maintenance/autospec.rst index aa25a6cf..257f8e2c 100644 --- a/source/clear-linux/guides/maintenance/autospec.rst +++ b/source/clear-linux/guides/maintenance/autospec.rst @@ -96,8 +96,7 @@ we build a new helloclear RPM. .. note:: - For a local tarball, use for the *URL*: - file:// + For a local tarball, use this type of *URL*: \file:// #. If build failures or dependency issues occur, continue below. Otherwise, skip directly to `Next steps`_. diff --git a/source/clear-linux/tutorials/docker/docker.rst b/source/clear-linux/tutorials/docker/docker.rst index 284850e2..c61ce9f6 100644 --- a/source/clear-linux/tutorials/docker/docker.rst +++ b/source/clear-linux/tutorials/docker/docker.rst @@ -169,7 +169,7 @@ an the official Docker image for nginx, an open source reverse proxy server. accessible from the |CL| host on port 8080 #. You can access the Welcome to Nginx! splash page running in the container - by browsing to http://127.0.0.1:8080 or by running this :command:`curl` + by browsing to \http://127.0.0.1:8080 or by running this :command:`curl` command from your |CL| machine: .. code-block:: bash diff --git a/source/clear-linux/tutorials/wordpress/web-server-install.rst b/source/clear-linux/tutorials/wordpress/web-server-install.rst index e9788ef3..dce6ed5f 100644 --- a/source/clear-linux/tutorials/wordpress/web-server-install.rst +++ b/source/clear-linux/tutorials/wordpress/web-server-install.rst @@ -55,7 +55,7 @@ Apache software bundle on |CL|. sudo systemctl start httpd.service #. To verify that the Apache server application is running, open a web - browser and navigate to: http://localhost. + browser and navigate to: \http://localhost. If the service is running, a confirmation message will appear, similar to the message shown in figure 1. @@ -157,7 +157,7 @@ default values, and define a custom DocumentRoot for your web server. sudo systemctl stop httpd.service sudo systemctl start httpd.service -#. Go to http://localhost to view the new screen. You should see your updated +#. Go to \http://localhost to view the new screen. You should see your updated default message from step 5. #. Change the configuration back to the default :file:`/var/www/html` @@ -175,7 +175,7 @@ default values, and define a custom DocumentRoot for your web server. sudo systemctl stop httpd.service sudo systemctl start httpd.service -#. Go to http://localhost and verify that you can see the default screen +#. Go to \http://localhost and verify that you can see the default screen again. #. Optionally, remove the /var/www/tutorial directory you previously created. @@ -221,7 +221,7 @@ functionality to your web server, install PHP on your system. -#. Go to http://localhost/phpinfo.php. +#. Go to \http://localhost/phpinfo.php. #. Verify that the PHP information screen appears, similar to figure 2: @@ -409,7 +409,7 @@ You can use the phpMyAdmin web-based tool to manage your databases. Follow the steps below for setting up a database called "WordPress". #. Verify that a successful installation of all LAMP server components by - going to http://localhost/phpMyAdmin. See figure 3. + going to \http://localhost/phpMyAdmin. See figure 3. #. Log in with your root userid and the password you set up when you ran the :ref:`mysql_secure_installation command `. Enter your diff --git a/source/clear-linux/tutorials/wordpress/wp-install.rst b/source/clear-linux/tutorials/wordpress/wp-install.rst index 8b4375e3..d87ff674 100644 --- a/source/clear-linux/tutorials/wordpress/wp-install.rst +++ b/source/clear-linux/tutorials/wordpress/wp-install.rst @@ -42,7 +42,7 @@ Download WordPress and manage directories ========================================= For this tutorial, you will create a WordPress blog that can be accessed at: -http:///blog. +\http:///blog. To accomplish this setup, you must add WordPress components to the :file:`/var/www/html/blog` directory. @@ -87,7 +87,7 @@ Recall that you created a database and user when you installed phpMyAdmin when y set up a |CL| based :ref:`web server `. Next, you must connect WordPress to the database and install WordPress. -To continue with the setup, go to: http:///blog/wp-admin/install.php. +To continue with the setup, go to: \http:///blog/wp-admin/install.php. The WordPress language option screen appears, as shown in figure 1. #. Select :guilabel:`English` and click :guilabel:`Continue`. @@ -177,7 +177,7 @@ Figure 7 shows the WordPress dashboard after a successful login: You are ready to go! To check out your blog as it is seen by the outside world, enter: -http:///blog on your browser. Figure 8 shows the result: +\http:///blog on your browser. Figure 8 shows the result: .. figure:: figures/wp-install-8.png :alt: WordPress blog