Fixes #5350 - Update screenshots for Rudder 2.11
Merge pull request #80 from jooooooon/bug_5350/dev/update_rudder_2_11_screenshots

Fixes #5350 - Update screenshots for Rudder 2.11
Fixes #5611: Modified upgrading techniques section so new techniques are added as well
Merge pull request #77 from fanf/bug_5611/correct_technique_upgrade_git_command

Fixes #5611: Modified upgrading techniques section so new techniques are...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Conflicts:
	23_administration/60_technique_upgrade.txt