Re: [PATCH v2 0/2] [doc] Remove gittutorial-2

[Tuomas Ahola <taahol@utu.fi>]

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> wrote:

> This patch series removes gittutorial-2 and all references to it, leaving a
> stub behind to help out any users who might be looking for this
> documentation.
> 
> The goal is to remove obsolete documentation and make it easier to improve
> our tutorial material in the future.
> 
> I tested that the docs are staying internally consistent by running git grep
> tutorial-2 and making sure that the only remaining references are in the
> Makefiles, the document itself, and some example output in user-manual.adoc
> which isn't relevant to the actual manual.
> 
> Changes in v2:
> 
>  * Remove changes to .po files (thanks to Junio)
>  * Reword commit messages to doc: ... (thanks to Tuomas)
> 
> To deal with the conflict with 4ce144a1 (which requires that all guides be
> listed in command-list.txt) I think we need to add another exception to
> lint-manpages.sh (like Tuomas said).
> 

Excluding the po/ stuff, the v1->v2 interdiff looks like this:

$ git diff je/doc-remove-gittutorial-2@{1} je/doc-remove-gittutorial-2 -- ':!po/'
diff --git a/command-list.txt b/command-list.txt
index 5c649c882e..63ae2a67c9 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -244,6 +244,7 @@ gitrepository-layout                    userinterfaces
 gitrevisions                            userinterfaces
 gitsubmodules                           guide
 gittutorial                             guide
+gittutorial-2                           guide
 gitweb                                  ancillaryinterrogators
 gitworkflows                            guide
 scalar                                  mainporcelain


That, as can be guessed, causes git(1) to advertize this "obsolete tutorial".
Perhaps we would like to avoid that.

$ (cd Documentation/ && ./doc-diff je/doc-remove-gittutorial-2@{1} je/doc-remove-gittutorial-2)
diff --git a/7da429d7fb86fe400c48984ea1506a9e0477e80e/home/taahol/share/man/man1/git.1 b/0bf477ce01b45853195f5f3da63642712dc35579/home/taahol/share/man/man1/git.1
index efc100186b..57a7f270c8 100644
--- a/7da429d7fb86fe400c48984ea1506a9e0477e80e/home/taahol/share/man/man1/git.1
+++ b/0bf477ce01b45853195f5f3da63642712dc35579/home/taahol/share/man/man1/git.1
@@ -800,6 +800,9 @@ GUIDES
        gittutorial(7)
            A tutorial introduction to Git.
 
+       gittutorial-2(7)
+           Obsolete tutorial.
+
        gitworkflows(7)
            An overview of recommended workflows with Git.
 

And let's not worry about that exception you mentioned.  After this topic hits
'next', I can rebase mine on top on of this, and deal with all necessary
integration work.

Thanks!