[tor-commits] [community/staging] Fix merge conflict in freebsd relay guide

[hiro at torproject.org]

commit 387343ace819fa8ab03180f90a3d15bc7fa10113
Merge: 43c5848 d1be78f
Author: hiro <hiro at torproject.org>
Date:   Fri Aug 30 13:02:56 2019 +0200

    Fix merge conflict in freebsd relay guide

 .../technical-considerations/contents.lr            |  9 ---------
 .../technical-setup/guard/centosrhel/contents.lr    |  2 +-
 .../guard/centosrhel/updates/contents.lr            |  8 +++-----
 .../technical-setup/guard/debianubuntu/contents.lr  |  4 +++-
 .../guard/debianubuntu/updates/contents.lr          |  8 +++-----
 .../technical-setup/guard/fedora/contents.lr        |  6 +++++-
 .../guard/fedora/updates/contents.lr                | 21 ++++++++++-----------
 .../technical-setup/guard/freebsd/contents.lr       |  2 +-
 .../guard/freebsd/updates/contents.lr               | 16 ++++++++--------
 9 files changed, 34 insertions(+), 42 deletions(-)

diff --cc content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
index 6746558,e7411ed..c161419
--- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
+++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
@@@ -12,9 -12,9 +12,9 @@@ body
  
  **NOTE:** _all steps documented on this page are considering that your machine/server/system only provides Tor relay services. please be aware that other services running might stop/restart during the upgrade._
  
--#1. Create the script to perform the updates. 
++#1. Create the script to perform the updates.
  
--Let's use `/root/pkg_upgrade.sh` 
++Let's use `/root/pkg_upgrade.sh`
  
  ```
  #!/usr/bin/env sh
@@@ -24,13 -24,13 +24,13 @@@ sleep ${RAND
  env AUTOCLEAN=YES ASSUME_ALWAYS_YES=YES HANDLE_RC_SCRIPTS=YES pkg upgrade
  ```
  
--#2. Schedule the job to run. 
++#2. Schedule the job to run.
  
  ```
  # echo "0 0 * * * root /bin/sh /root/pkg_upgrade.sh >/dev/null" >> /etc/crontab
  ```
  
--#3. Restart cron's service. 
++#3. Restart cron's service.
  
  ```
  # service cron restart