Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Links changed from phpBB to dietpi.com/docs #3 #4128

Merged
merged 9 commits into from
Feb 19, 2021
Merged

Links changed from phpBB to dietpi.com/docs #3 #4128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29f03eb
Link changed from phpBB to dietpi.com/docs #3
StephanStS Feb 19, 2021
afee1fa
Update dietpi-drive_manager
StephanStS Feb 19, 2021
6db5469
Links in dietpi-software
StephanStS Feb 19, 2021
401e053
Links in dietpi-survey
StephanStS Feb 19, 2021
5e49cc7
Links in dietpi-sync
StephanStS Feb 19, 2021
ede38b3
Links in dietpi-backup
StephanStS Feb 19, 2021
f020393
Links in dietpi-globals
StephanStS Feb 19, 2021
ba47e4b
Merge branch 'dev' into StephanStS-patch-1
MichaIng Feb 19, 2021
75c00f1
v7.0
MichaIng Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dietpi/dietpi-cleaner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

G_WHIP_MSG "$G_PROGRAM_NAME is a program that allows you to remove unwanted junk from your DietPi system, freeing up filesystem space in the process.\n
Simply enable the cleaners you require, then select \"Test\" to see what will happen, without modifying your system.\nOnce your satisfied with the Test results, select \"Run\" to clean your system.\n
Further information:\n - https://dietpi.com/phpbb/viewtopic.php?p=623#p623"
Further information:\n - https://dietpi.com/docs/dietpi_tools/#dietpi-cleaner"

;;

Expand Down
4 changes: 2 additions & 2 deletions dietpi/dietpi-drive_manager
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ Do you wish to ignore this warning, and, mount the drive regardless?" || return

if (( $1 == 0 )); then

G_WHIP_MSG "[FAILED]\n\nYour DietPi userdata is currently located on this drive:\n - $FP_USERDATA_CURRENT\n\nThe requested option for this drive is not currently possible.\n\nPlease move your userdata elsewhere, before trying again:\nhttps://dietpi.com/phpbb/viewtopic.php?t=478"
G_WHIP_MSG "[FAILED]\n\nYour DietPi userdata is currently located on this drive:\n - $FP_USERDATA_CURRENT\n\nThe requested option for this drive is not currently possible.\n\nPlease move your userdata elsewhere, before trying again:\nhttps://dietpi.com/docs/dietpi_tools/#quick-selections"

elif (( $1 == 1 )); then

Expand Down Expand Up @@ -1626,7 +1626,7 @@ NB: If you are planning to dedicate the drive to this system, it is recommended

G_WHIP_DEFAULT_ITEM=$FORMAT_FILESYSTEM_TYPE
if G_WHIP_MENU 'Please select a filesystem type for this format:\n\nEXT4:\nHighly recommended if you plan to use this drive solely on this system (dedicated drive).\n
NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU usage during transfers.\n\nFull list of different filesystem types:\nhttps://dietpi.com/phpbb/viewtopic.php?p=2898#p2898'; then
NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU usage during transfers.\n\nFull list of different filesystem types:\nhttps://dietpi.com/docs/dietpi_tools/#dietpi-drive-manager'; then

# Install FS pre-reqs
# - NTFS
Expand Down
4 changes: 2 additions & 2 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17236,7 +17236,7 @@ We allow it to take up to 30 minutes, it's process can be followed, please be pa

G_WHIP_DEFAULT_ITEM=$index_webserver_text
G_WHIP_BUTTON_CANCEL_TEXT='Back'
if G_WHIP_MENU 'Please select a Webserver preference, more info https://dietpi.com/docs/dietpi_tools/#quick-selections:
if G_WHIP_MENU 'Please select a Webserver preference, more info https://dietpi.com/docs/software/webserver_stack/#stacks-for-web-development:
\n- Apache2: Feature-rich and popular. Recommended for beginners and users who are looking to follow Apache2 based guides.
\n- Nginx: Lightweight alternative to Apache2. Nginx claims faster webserver performance compared to Apache2.
\n- Lighttpd: Extremely lightweight and is generally considered to offer the \"best\" webserver performance for SBCs. Recommended for users who expect low webserver traffic.'; then
Expand Down Expand Up @@ -17328,7 +17328,7 @@ Welcome to DietPi:
Use PageUp/Down or Arrow Up/Down to scroll this help screen.
Press ESC, or TAB then ENTER to exit this help screen.\n
Easy to follow, step by step guides for installing DietPi:
https://dietpi.com/docs/user-guide_installation/\n
https://dietpi.com/docs/getting_started/\n
For a list of all installation options and their details:
https://dietpi.com/docs/dietpi_optimised_software/\n
───────────────────────────────────────────────────────────────
Expand Down
2 changes: 1 addition & 1 deletion dietpi/dietpi-survey
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# - Runs after every dietpi-update and dietpi-software install, if user opted in
# - Summary can be visited at: https://dietpi.com/survey/
# - Allows the DietPi project to focus development based on popularity
# - Further info: https://dietpi.com/docs/dietpi_tools/#miscellaneous (see tab 'DietPi Survey')
# - Further info: https://dietpi.com/docs/dietpi_tools/#dietpi-survey
#
# Usage:
# - /boot/dietpi/dietpi-survey Interactive menu to opt in or out
Expand Down
2 changes: 1 addition & 1 deletion dietpi/func/dietpi-globals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,7 @@ $log_content" || break # Exit error handler menu loop on cancel

[[ $G_PROMPT_BACKUP_DISABLED == 1 ]] && return 0

G_WHIP_YESNO 'Would you like to create (or update) a "DietPi-Backup" of the system, before proceeding?\n\n"DietPi-Backup" creates a system restore point, which can be recovered if unexpected issues occur.\n\nFor more information on "DietPi-Backup", please use the link below:\n - https://dietpi.com/phpbb/viewtopic.php?p=255#p255' || return 0
G_WHIP_YESNO 'Would you like to create (or update) a "DietPi-Backup" of the system, before proceeding?\n\n"DietPi-Backup" creates a system restore point, which can be recovered if unexpected issues occur.\n\nFor more information on "DietPi-Backup", please use the link below:\n - https://dietpi.com/docs/dietpi_tools/#dietpi-backup-backuprestore' || return 0

/boot/dietpi/dietpi-backup 1
local exit_code=$?
Expand Down