From 4c36d8081ef6e752ca1eecbd18fdb39054c054c2 Mon Sep 17 00:00:00 2001 From: St-Ranger Date: Mon, 3 Apr 2017 23:45:48 -0500 Subject: [PATCH 1/3] Correct info fro FreeBSD 1. Replace the outdated reference to "vritualenv", "see below" -> "see above". 2. Replace the awkward sentence (partially incorrect) about installing on FreeBSD. It can be installed via different ways: "pkg" is not exclusive. I am not aware of any reason why it canNOT be installed from ports. Some people prefer build and install everything from ports. (The previous version of the description implies that ports cannot be used.) --- docs/contributing.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index 9c7f0636f..4012895b8 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -427,8 +427,12 @@ For squeeze you will need to: FreeBSD ------- -Package installation for FreeBSD uses ``pkg``, not ports. +The package can be installed FreeBSD using ``pkg`` (e.g. ``pkg install py27-certbot``), +or any other port-management tool (``portupgrade``, ``portmanager``, etc.) +from the pre-compiled package or can be built and installed from ports. +Either way will ensure proper installation of all the dependencies required +to run ``certbot``. FreeBSD by default uses ``tcsh``. In order to activate virtualenv (see -below), you will need a compatible shell, e.g. ``pkg install bash && +above), you will need a compatible shell, e.g. ``pkg install bash && bash``. From 035e5b93ea2ef12f1738c172915b8256bfb504e6 Mon Sep 17 00:00:00 2001 From: St-Ranger Date: Tue, 4 Apr 2017 00:41:55 -0500 Subject: [PATCH 2/3] Futher improvement re: FreeBSD packages Further improved the previous change to make it more clear. --- docs/contributing.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index 4012895b8..f3879f53f 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -427,11 +427,11 @@ For squeeze you will need to: FreeBSD ------- -The package can be installed FreeBSD using ``pkg`` (e.g. ``pkg install py27-certbot``), +Packages can be installed FreeBSD using ``pkg``, or any other port-management tool (``portupgrade``, ``portmanager``, etc.) -from the pre-compiled package or can be built and installed from ports. +from the pre-built package or can be built and installed from ports. Either way will ensure proper installation of all the dependencies required -to run ``certbot``. +for the package. FreeBSD by default uses ``tcsh``. In order to activate virtualenv (see above), you will need a compatible shell, e.g. ``pkg install bash && From d11443ac050ab31ca547214b05cd8fcbac0e1903 Mon Sep 17 00:00:00 2001 From: St-Ranger Date: Thu, 13 Apr 2017 20:36:32 -0500 Subject: [PATCH 3/3] Missing word is inserted. --- docs/contributing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index f3879f53f..6237ad3ba 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -427,7 +427,7 @@ For squeeze you will need to: FreeBSD ------- -Packages can be installed FreeBSD using ``pkg``, +Packages can be installed on FreeBSD using ``pkg``, or any other port-management tool (``portupgrade``, ``portmanager``, etc.) from the pre-built package or can be built and installed from ports. Either way will ensure proper installation of all the dependencies required