diff --git a/docs/html/depot_tools.html b/man/html/depot_tools.html similarity index 100% rename from docs/html/depot_tools.html rename to man/html/depot_tools.html diff --git a/docs/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html similarity index 99% rename from docs/html/depot_tools_tutorial.html rename to man/html/depot_tools_tutorial.html index 73c545d85..6a0d578e3 100644 --- a/docs/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -809,7 +809,7 @@ commands mentioned in this tutorial.

If your platform does not support manpages (or you prefer something a bit more expressive than plain text) you can find all documentation in html form in the -[DEPOT_TOOLS]/docs/html folder. +[DEPOT_TOOLS]/man/html folder.
@@ -875,21 +875,13 @@ Litmus Test 
$ git clone https://chromium.googlesource.com/chromium/tools/depot_tools
-

Add depot_tools to the end of your PATH and MANPATH (you will probably want -to put this in your ~/.bashrc or ~/.zshrc). Assuming you cloned -depot_tools to /path/to/depot_tools:

+

Add depot_tools to the end of your PATH (you will probably want to put this +in your ~/.bashrc or ~/.zshrc). Assuming you cloned depot_tools to +/path/to/depot_tools:

-
$ export PATH=$PATH:/path/to/depot_tools
-$ export MANPATH=$MANPATH:/path/to/depot_tools/docs  <1>
+
$ export PATH=$PATH:/path/to/depot_tools
-
    -
  1. -

    -Observe that this path is depot_tools/docs. -

    -
    2. -

WINDOWS

@@ -1587,7 +1579,7 @@ from
diff --git a/docs/html/git-freeze.html b/man/html/git-freeze.html similarity index 100% rename from docs/html/git-freeze.html rename to man/html/git-freeze.html diff --git a/docs/html/git-map-branches.html b/man/html/git-map-branches.html similarity index 100% rename from docs/html/git-map-branches.html rename to man/html/git-map-branches.html diff --git a/docs/html/git-map.html b/man/html/git-map.html similarity index 100% rename from docs/html/git-map.html rename to man/html/git-map.html diff --git a/docs/html/git-mark-merge-base.html b/man/html/git-mark-merge-base.html similarity index 100% rename from docs/html/git-mark-merge-base.html rename to man/html/git-mark-merge-base.html diff --git a/docs/html/git-nav-downstream.html b/man/html/git-nav-downstream.html similarity index 100% rename from docs/html/git-nav-downstream.html rename to man/html/git-nav-downstream.html diff --git a/docs/html/git-nav-upstream.html b/man/html/git-nav-upstream.html similarity index 100% rename from docs/html/git-nav-upstream.html rename to man/html/git-nav-upstream.html diff --git a/docs/html/git-new-branch.html b/man/html/git-new-branch.html similarity index 100% rename from docs/html/git-new-branch.html rename to man/html/git-new-branch.html diff --git a/docs/html/git-rebase-update.html b/man/html/git-rebase-update.html similarity index 100% rename from docs/html/git-rebase-update.html rename to man/html/git-rebase-update.html diff --git a/docs/html/git-rename-branch.html b/man/html/git-rename-branch.html similarity index 100% rename from docs/html/git-rename-branch.html rename to man/html/git-rename-branch.html diff --git a/docs/html/git-reparent-branch.html b/man/html/git-reparent-branch.html similarity index 100% rename from docs/html/git-reparent-branch.html rename to man/html/git-reparent-branch.html diff --git a/docs/html/git-squash-branch.html b/man/html/git-squash-branch.html similarity index 100% rename from docs/html/git-squash-branch.html rename to man/html/git-squash-branch.html diff --git a/docs/html/git-thaw.html b/man/html/git-thaw.html similarity index 100% rename from docs/html/git-thaw.html rename to man/html/git-thaw.html diff --git a/docs/html/git-upstream-diff.html b/man/html/git-upstream-diff.html similarity index 100% rename from docs/html/git-upstream-diff.html rename to man/html/git-upstream-diff.html diff --git a/docs/man1/git-freeze.1 b/man/man1/git-freeze.1 similarity index 100% rename from docs/man1/git-freeze.1 rename to man/man1/git-freeze.1 diff --git a/docs/man1/git-map-branches.1 b/man/man1/git-map-branches.1 similarity index 100% rename from docs/man1/git-map-branches.1 rename to man/man1/git-map-branches.1 diff --git a/docs/man1/git-map.1 b/man/man1/git-map.1 similarity index 100% rename from docs/man1/git-map.1 rename to man/man1/git-map.1 diff --git a/docs/man1/git-mark-merge-base.1 b/man/man1/git-mark-merge-base.1 similarity index 100% rename from docs/man1/git-mark-merge-base.1 rename to man/man1/git-mark-merge-base.1 diff --git a/docs/man1/git-nav-downstream.1 b/man/man1/git-nav-downstream.1 similarity index 100% rename from docs/man1/git-nav-downstream.1 rename to man/man1/git-nav-downstream.1 diff --git a/docs/man1/git-nav-upstream.1 b/man/man1/git-nav-upstream.1 similarity index 100% rename from docs/man1/git-nav-upstream.1 rename to man/man1/git-nav-upstream.1 diff --git a/docs/man1/git-new-branch.1 b/man/man1/git-new-branch.1 similarity index 100% rename from docs/man1/git-new-branch.1 rename to man/man1/git-new-branch.1 diff --git a/docs/man1/git-rebase-update.1 b/man/man1/git-rebase-update.1 similarity index 100% rename from docs/man1/git-rebase-update.1 rename to man/man1/git-rebase-update.1 diff --git a/docs/man1/git-rename-branch.1 b/man/man1/git-rename-branch.1 similarity index 100% rename from docs/man1/git-rename-branch.1 rename to man/man1/git-rename-branch.1 diff --git a/docs/man1/git-reparent-branch.1 b/man/man1/git-reparent-branch.1 similarity index 100% rename from docs/man1/git-reparent-branch.1 rename to man/man1/git-reparent-branch.1 diff --git a/docs/man1/git-squash-branch.1 b/man/man1/git-squash-branch.1 similarity index 100% rename from docs/man1/git-squash-branch.1 rename to man/man1/git-squash-branch.1 diff --git a/docs/man1/git-thaw.1 b/man/man1/git-thaw.1 similarity index 100% rename from docs/man1/git-thaw.1 rename to man/man1/git-thaw.1 diff --git a/docs/man1/git-upstream-diff.1 b/man/man1/git-upstream-diff.1 similarity index 100% rename from docs/man1/git-upstream-diff.1 rename to man/man1/git-upstream-diff.1 diff --git a/docs/man7/depot_tools.7 b/man/man7/depot_tools.7 similarity index 100% rename from docs/man7/depot_tools.7 rename to man/man7/depot_tools.7 diff --git a/docs/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 similarity index 98% rename from docs/man7/depot_tools_tutorial.7 rename to man/man7/depot_tools_tutorial.7 index c8b65ad3a..1b5751419 100644 --- a/docs/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -2,12 +2,12 @@ .\" Title: depot_tools_tutorial .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/14/2014 +.\" Date: 04/28/2014 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools e722300 +.\" Source: depot_tools 32af7d9 .\" Language: English .\" -.TH "DEPOT_TOOLS_TUTORIAL" "7" "04/14/2014" "depot_tools e722300" "Chromium depot_tools Manual" +.TH "DEPOT_TOOLS_TUTORIAL" "7" "04/28/2014" "depot_tools 32af7d9" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -135,7 +135,7 @@ Please refer to the manpages (or \-\-help output) for details about any of the c .ps -1 .br .sp -If your platform does not support manpages (or you prefer something a bit more expressive than plain text) you can find all documentation in \fIhtml\fR form in the [DEPOT_TOOLS]/docs/html folder\&. +If your platform does not support manpages (or you prefer something a bit more expressive than plain text) you can find all documentation in \fIhtml\fR form in the [DEPOT_TOOLS]/man/html folder\&. .sp .5v .RE .SS "PREREQUISITES" @@ -222,23 +222,18 @@ Clone the \fIdepot_tools\fR repository: .\} .sp .sp -Add \fIdepot_tools\fR to the \fIend\fR of your PATH and MANPATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools: +Add \fIdepot_tools\fR to the \fIend\fR of your PATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools: .sp .if n \{\ .RS 4 .\} .nf \fB$ export PATH=$PATH:/path/to/depot_tools\fR -\fB$ export MANPATH=$MANPATH:/path/to/depot_tools/docs\fR \fB(1)\fR .fi .if n \{\ .RE .\} .sp -.sp -\fB1. \fRObserve that this path is -depot_tools/\fBdocs\fR\&. -.br .SS "BOOTSTRAPPING CONFIGURATION" .sp If you have never used git before, you\(cqll need to set some global git configurations; substitute your name and email address in the following commands: diff --git a/docs/push_to_gs.sh b/man/push_to_gs.sh similarity index 100% rename from docs/push_to_gs.sh rename to man/push_to_gs.sh diff --git a/docs/src/.gitignore b/man/src/.gitignore similarity index 100% rename from docs/src/.gitignore rename to man/src/.gitignore diff --git a/docs/src/_aliases.txt b/man/src/_aliases.txt similarity index 100% rename from docs/src/_aliases.txt rename to man/src/_aliases.txt diff --git a/docs/src/_footer.txt b/man/src/_footer.txt similarity index 100% rename from docs/src/_footer.txt rename to man/src/_footer.txt diff --git a/docs/src/_git-freeze_desc.helper.txt b/man/src/_git-freeze_desc.helper.txt similarity index 100% rename from docs/src/_git-freeze_desc.helper.txt rename to man/src/_git-freeze_desc.helper.txt diff --git a/docs/src/_git-map-branches_desc.helper.txt b/man/src/_git-map-branches_desc.helper.txt similarity index 100% rename from docs/src/_git-map-branches_desc.helper.txt rename to man/src/_git-map-branches_desc.helper.txt diff --git a/docs/src/_git-map_desc.helper.txt b/man/src/_git-map_desc.helper.txt similarity index 100% rename from docs/src/_git-map_desc.helper.txt rename to man/src/_git-map_desc.helper.txt diff --git a/docs/src/_git-mark-merge-base_desc.helper.txt b/man/src/_git-mark-merge-base_desc.helper.txt similarity index 100% rename from docs/src/_git-mark-merge-base_desc.helper.txt rename to man/src/_git-mark-merge-base_desc.helper.txt diff --git a/docs/src/_git-nav-downstream_desc.helper.txt b/man/src/_git-nav-downstream_desc.helper.txt similarity index 100% rename from docs/src/_git-nav-downstream_desc.helper.txt rename to man/src/_git-nav-downstream_desc.helper.txt diff --git a/docs/src/_git-nav-upstream_desc.helper.txt b/man/src/_git-nav-upstream_desc.helper.txt similarity index 100% rename from docs/src/_git-nav-upstream_desc.helper.txt rename to man/src/_git-nav-upstream_desc.helper.txt diff --git a/docs/src/_git-new-branch_desc.helper.txt b/man/src/_git-new-branch_desc.helper.txt similarity index 100% rename from docs/src/_git-new-branch_desc.helper.txt rename to man/src/_git-new-branch_desc.helper.txt diff --git a/docs/src/_git-rebase-update_desc.helper.txt b/man/src/_git-rebase-update_desc.helper.txt similarity index 100% rename from docs/src/_git-rebase-update_desc.helper.txt rename to man/src/_git-rebase-update_desc.helper.txt diff --git a/docs/src/_git-rename-branch_desc.helper.txt b/man/src/_git-rename-branch_desc.helper.txt similarity index 100% rename from docs/src/_git-rename-branch_desc.helper.txt rename to man/src/_git-rename-branch_desc.helper.txt diff --git a/docs/src/_git-reparent-branch_desc.helper.txt b/man/src/_git-reparent-branch_desc.helper.txt similarity index 100% rename from docs/src/_git-reparent-branch_desc.helper.txt rename to man/src/_git-reparent-branch_desc.helper.txt diff --git a/docs/src/_git-squash-branch_desc.helper.txt b/man/src/_git-squash-branch_desc.helper.txt similarity index 100% rename from docs/src/_git-squash-branch_desc.helper.txt rename to man/src/_git-squash-branch_desc.helper.txt diff --git a/docs/src/_git-thaw_desc.helper.txt b/man/src/_git-thaw_desc.helper.txt similarity index 100% rename from docs/src/_git-thaw_desc.helper.txt rename to man/src/_git-thaw_desc.helper.txt diff --git a/docs/src/_git-upstream-diff_desc.helper.txt b/man/src/_git-upstream-diff_desc.helper.txt similarity index 100% rename from docs/src/_git-upstream-diff_desc.helper.txt rename to man/src/_git-upstream-diff_desc.helper.txt diff --git a/docs/src/_helper_prefix.txt b/man/src/_helper_prefix.txt similarity index 100% rename from docs/src/_helper_prefix.txt rename to man/src/_helper_prefix.txt diff --git a/docs/src/asciidoc-override.css b/man/src/asciidoc-override.css similarity index 100% rename from docs/src/asciidoc-override.css rename to man/src/asciidoc-override.css diff --git a/docs/src/common_demo_functions.sh b/man/src/common_demo_functions.sh similarity index 100% rename from docs/src/common_demo_functions.sh rename to man/src/common_demo_functions.sh diff --git a/docs/src/demo_repo.sh b/man/src/demo_repo.sh similarity index 100% rename from docs/src/demo_repo.sh rename to man/src/demo_repo.sh diff --git a/docs/src/depot_tools.txt b/man/src/depot_tools.txt similarity index 100% rename from docs/src/depot_tools.txt rename to man/src/depot_tools.txt diff --git a/docs/src/depot_tools_tutorial.demo.walkthrough.sh b/man/src/depot_tools_tutorial.demo.walkthrough.sh similarity index 100% rename from docs/src/depot_tools_tutorial.demo.walkthrough.sh rename to man/src/depot_tools_tutorial.demo.walkthrough.sh diff --git a/docs/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt similarity index 97% rename from docs/src/depot_tools_tutorial.txt rename to man/src/depot_tools_tutorial.txt index 6c81e6882..91d65e98b 100644 --- a/docs/src/depot_tools_tutorial.txt +++ b/man/src/depot_tools_tutorial.txt @@ -29,7 +29,7 @@ commands mentioned in this tutorial. [NOTE] If your platform does not support manpages (or you prefer something a bit more expressive than plain text) you can find all documentation in 'html' form in the -`[DEPOT_TOOLS]/docs/html` folder. +`[DEPOT_TOOLS]/man/html` folder. PREREQUISITES ~~~~~~~~~~~~~ @@ -74,16 +74,14 @@ Clone the 'depot_tools' repository: [white]**$ git clone https://chromium.googlesource.com/chromium/tools/depot_tools** ---- -Add 'depot_tools' to the 'end' of your PATH and MANPATH (you will probably want -to put this in your `~/.bashrc` or `~/.zshrc`). Assuming you cloned -'depot_tools' to `/path/to/depot_tools`: +Add 'depot_tools' to the 'end' of your PATH (you will probably want to put this +in your `~/.bashrc` or `~/.zshrc`). Assuming you cloned 'depot_tools' to +`/path/to/depot_tools`: [postsubs="quotes"] ---- [white]**$ export PATH=$PATH:/path/to/depot_tools** -[white]**$ export MANPATH=$MANPATH:/path/to/depot_tools/docs** <1> ---- -<1> Observe that this path is +depot_tools/+**+docs+**. // No need to show the Windows stuff on the manpage output. ifdef::backend-xhtml11[] diff --git a/docs/src/filter_demo_output.py b/man/src/filter_demo_output.py similarity index 100% rename from docs/src/filter_demo_output.py rename to man/src/filter_demo_output.py diff --git a/docs/src/git-freeze.demo.1.sh b/man/src/git-freeze.demo.1.sh similarity index 100% rename from docs/src/git-freeze.demo.1.sh rename to man/src/git-freeze.demo.1.sh diff --git a/docs/src/git-freeze.txt b/man/src/git-freeze.txt similarity index 100% rename from docs/src/git-freeze.txt rename to man/src/git-freeze.txt diff --git a/docs/src/git-map-branches.demo.1.sh b/man/src/git-map-branches.demo.1.sh similarity index 100% rename from docs/src/git-map-branches.demo.1.sh rename to man/src/git-map-branches.demo.1.sh diff --git a/docs/src/git-map-branches.txt b/man/src/git-map-branches.txt similarity index 100% rename from docs/src/git-map-branches.txt rename to man/src/git-map-branches.txt diff --git a/docs/src/git-map.demo.1.sh b/man/src/git-map.demo.1.sh similarity index 100% rename from docs/src/git-map.demo.1.sh rename to man/src/git-map.demo.1.sh diff --git a/docs/src/git-map.txt b/man/src/git-map.txt similarity index 100% rename from docs/src/git-map.txt rename to man/src/git-map.txt diff --git a/docs/src/git-mark-merge-base.txt b/man/src/git-mark-merge-base.txt similarity index 100% rename from docs/src/git-mark-merge-base.txt rename to man/src/git-mark-merge-base.txt diff --git a/docs/src/git-nav-downstream.demo.1.sh b/man/src/git-nav-downstream.demo.1.sh similarity index 100% rename from docs/src/git-nav-downstream.demo.1.sh rename to man/src/git-nav-downstream.demo.1.sh diff --git a/docs/src/git-nav-downstream.txt b/man/src/git-nav-downstream.txt similarity index 100% rename from docs/src/git-nav-downstream.txt rename to man/src/git-nav-downstream.txt diff --git a/docs/src/git-nav-upstream.demo.1.sh b/man/src/git-nav-upstream.demo.1.sh similarity index 100% rename from docs/src/git-nav-upstream.demo.1.sh rename to man/src/git-nav-upstream.demo.1.sh diff --git a/docs/src/git-nav-upstream.txt b/man/src/git-nav-upstream.txt similarity index 100% rename from docs/src/git-nav-upstream.txt rename to man/src/git-nav-upstream.txt diff --git a/docs/src/git-new-branch.demo.1.sh b/man/src/git-new-branch.demo.1.sh similarity index 100% rename from docs/src/git-new-branch.demo.1.sh rename to man/src/git-new-branch.demo.1.sh diff --git a/docs/src/git-new-branch.txt b/man/src/git-new-branch.txt similarity index 100% rename from docs/src/git-new-branch.txt rename to man/src/git-new-branch.txt diff --git a/docs/src/git-rebase-update.txt b/man/src/git-rebase-update.txt similarity index 100% rename from docs/src/git-rebase-update.txt rename to man/src/git-rebase-update.txt diff --git a/docs/src/git-rename-branch.txt b/man/src/git-rename-branch.txt similarity index 100% rename from docs/src/git-rename-branch.txt rename to man/src/git-rename-branch.txt diff --git a/docs/src/git-reparent-branch.txt b/man/src/git-reparent-branch.txt similarity index 100% rename from docs/src/git-reparent-branch.txt rename to man/src/git-reparent-branch.txt diff --git a/docs/src/git-squash-branch.demo.1.sh b/man/src/git-squash-branch.demo.1.sh similarity index 100% rename from docs/src/git-squash-branch.demo.1.sh rename to man/src/git-squash-branch.demo.1.sh diff --git a/docs/src/git-squash-branch.txt b/man/src/git-squash-branch.txt similarity index 100% rename from docs/src/git-squash-branch.txt rename to man/src/git-squash-branch.txt diff --git a/docs/src/git-thaw.txt b/man/src/git-thaw.txt similarity index 100% rename from docs/src/git-thaw.txt rename to man/src/git-thaw.txt diff --git a/docs/src/git-upstream-diff.txt b/man/src/git-upstream-diff.txt similarity index 100% rename from docs/src/git-upstream-diff.txt rename to man/src/git-upstream-diff.txt diff --git a/docs/src/make_docs.sh b/man/src/make_docs.sh similarity index 100% rename from docs/src/make_docs.sh rename to man/src/make_docs.sh diff --git a/docs/src/prep_demo_repo.sh b/man/src/prep_demo_repo.sh similarity index 100% rename from docs/src/prep_demo_repo.sh rename to man/src/prep_demo_repo.sh