diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Readme.md | 2 | ||||
| -rw-r--r-- | docs/source/conf.py | 18 | ||||
| -rw-r--r-- | docs/source/markdown/podman-build.1.md | 6 | ||||
| -rw-r--r-- | docs/tutorials/mac_win_client.md | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/docs/Readme.md b/docs/Readme.md index c517052b3..ae0067be6 100644 --- a/docs/Readme.md +++ b/docs/Readme.md @@ -51,4 +51,4 @@ If reloading the page, or clearing your local cache does not fix the problem, it likely caused by broken metadata needed to protect clients from cross-site-scripting style attacks. Please [notify a maintainer](https://github.com/containers/podman#communications) so they may investigate how/why the `swagger.yaml` file's CORS-metadata is -incorrect, or the file isn't accessable for some other reason. +incorrect, or the file isn't accessible for some other reason. diff --git a/docs/source/conf.py b/docs/source/conf.py index 6adaf4308..aad458a9b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -17,9 +17,9 @@ # -- Project information ----------------------------------------------------- -project = 'Podman' -copyright = '2019, team' -author = 'team' +project = "Podman" +copyright = "2019, team" +author = "team" # -- General configuration --------------------------------------------------- @@ -28,33 +28,33 @@ author = 'team' # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'recommonmark', + "recommonmark", ] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. exclude_patterns = [] -master_doc = 'index' +master_doc = "index" # -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'alabaster' +html_theme = "alabaster" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] html_css_files = [ - 'custom.css', + "custom.css", ] # -- Extension configuration ------------------------------------------------- diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index d785d6c37..6fdfc6aec 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -438,9 +438,9 @@ When the option is specified or set to "true", pull the image from the first registry it is found in as listed in registries.conf. Raise an error if not found in the registries, even if the image is present locally. -If the option is disabled (with *--pull=false*), or not specified, pull the +If the option is disabled (with *--pull=false*) or not specified, pull the image from the registry only if the image is not present locally. Raise an -error if the image is not found in the registries. +error if the image is not found in the registries and is not present locally. #### **--pull-always** @@ -721,7 +721,7 @@ container. When the mount propagation policy is set to `slave`, one way mount propagation is enabled and any mounts completed on the host for that volume will be visible only inside of the container. To control the mount propagation property of volume use the `:[r]shared`, `:[r]slave` or `:[r]private` -propagation flag. The propagation property canbe specified only for bind mounted +propagation flag. The propagation property can be specified only for bind mounted volumes and not for internal volumes or named volumes. For mount propagation to work on the source mount point (mount point where source dir is mounted on) has to have the right propagation properties. For shared volumes, the source mount diff --git a/docs/tutorials/mac_win_client.md b/docs/tutorials/mac_win_client.md index 63830a5b1..9e0798bbf 100644 --- a/docs/tutorials/mac_win_client.md +++ b/docs/tutorials/mac_win_client.md @@ -29,9 +29,9 @@ $ brew install podman ### Enable the Podman service on the server machine. -Before performing any Podman client commands, you must enable the podman.sock SystemD service on the Linux server. In these examples, we are running Podman as a normal, unprivileged user, also known as a rootless user. By default, the rootless socket listens at `/run/user/${UID}/podman/podman.sock`. You can enable this socket, permanently using the following command: +Before performing any Podman client commands, you must enable the podman.sock SystemD service on the Linux server. In these examples, we are running Podman as a normal, unprivileged user, also known as a rootless user. By default, the rootless socket listens at `/run/user/${UID}/podman/podman.sock`. You can enable and start this socket permanently, using the following commands: ``` -$ systemctl --user enable podman.socket +$ systemctl --user enable --now podman.socket ``` You will need to enable linger for this user in order for the socket to work when the user is not logged in. |