Feature #6340

Spell Whisperback consistently

Added by intrigeri 2013-10-06 02:48:48 . Updated 2013-11-05 03:43:05 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Target version:
Start date:
2013-10-06
Due date:
% Done:

100%

Feature Branch:
doc/one_whisperback_spell
Type of work:
End-user documentation
Blueprint:

Starter:
0
Affected tool:
Deliverable for:

Description

In the Tails documentation, Whisperback is sometimes spelled WhisperBack (its upstream name), and sometimes Whisperback. We should pick one and use it consistently.

Subtasks

History

#1 Updated by mercedes508 2013-10-11 08:00:55

  • Status changed from Confirmed to Resolved
  • % Done changed from 0 to 100
  • QA Check set to Pass
  • Feature Branch set to doc/one_whisperback_spell

Decided to use it’s upstream name and thus replaced ‘Whisperback’ by ‘WhisperBack’ in Tails website.

commit fcfd37f70, doc/one_whisperback_spell branch, mercedes508 repo.

#2 Updated by intrigeri 2013-11-02 11:50:16

  • Status changed from Resolved to In Progress
  • Assignee set to mercedes508
  • % Done changed from 100 to 50
  • QA Check changed from Pass to Dev Needed

This branch wasn’t merged, so it should not be marked as resolved. Also, it does not merge cleanly into master anymore, so please merge master, fix any conflict, make sure no instance of “Whisperback” was introduced in the meantime, and mark as ready for QA. Thanks :)

#3 Updated by mercedes508 2013-11-02 14:34:24

  • QA Check changed from Dev Needed to Ready for QA

Merged, conflicts fixed, and WhisperBack’s name corrected. Please see commit 55fdfd1. Same branch/repo.

#4 Updated by intrigeri 2013-11-02 17:23:04

  • Assignee changed from mercedes508 to intrigeri

#5 Updated by intrigeri 2013-11-02 17:25:06

  • Assignee changed from intrigeri to mercedes508
  • QA Check changed from Ready for QA to Dev Needed

Please rebase your branch on top of master, so that it does not includes unrelated commits from other unmerged branches (3deeaeb): git rebase -i origin/master should be a good start.

#6 Updated by mercedes508 2013-11-03 04:01:49

  • Assignee changed from mercedes508 to intrigeri
  • QA Check changed from Dev Needed to Ready for QA

Hopefully it’s now cleaned. Commit deb343b.

#7 Updated by intrigeri 2013-11-03 07:35:17

  • Assignee changed from intrigeri to mercedes508
  • QA Check changed from Ready for QA to Dev Needed

The unrelated commit still is part of the proposed branch. You need to rewrite the history of this branch. I would git rebase -i origin/master, pick the two relevant commits only (55fdfd1 and fcfd37f), fix conflicts when needed when git rebase applies these patches, and git push -f the branch.

#8 Updated by mercedes508 2013-11-05 02:56:57

  • Assignee changed from mercedes508 to intrigeri

I did that but I don’t know why I still have that commit. Anyway I manually reverted it. Hope it’s finally good.

commit 74511e1d

#9 Updated by intrigeri 2013-11-05 03:42:18

  • Status changed from In Progress to Resolved
  • Assignee deleted (intrigeri)
  • QA Check changed from Dev Needed to Pass

Unfortunately, reverting is not OK: when we eventually merge your other branch that added this commit, the revert commit will keep this change out.

Anyway, I’m merging this branch before we get too tired of it :) We’ll just need to be careful when the other branch is merged.

To be honest, in the end, starting from scratch and manually re-doing the change would likely have been faster on that one.

#10 Updated by intrigeri 2013-11-05 03:43:06

  • % Done changed from 50 to 100