Skip to content

Commit eacae64

Browse files
author
Mary Anthony
committed
Moving man pages out of docs
Adding in other areas per comments Updating with comments; equalizing generating man page info Updating with duglin's comments Doug is right here again;fixing. Signed-off-by: Mary Anthony <mary@docker.com>
1 parent add64dc commit eacae64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+60
-62
lines changed

‎contrib/mkimage-rinse.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ sudo mkdir -m 755 dev
8080
# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
8181
# locales
8282
sudo rm -rf usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
83-
# docs
83+
# docs and man pages
8484
sudo rm -rf usr/share/{man,doc,info,gnome/help}
8585
# cracklib
8686
sudo rm -rf usr/share/cracklib

‎contrib/mkimage/.febootstrap-minimize‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ shift
1010
# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
1111
# locales
1212
rm -rf usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
13-
# docs
13+
# docs and man pages
1414
rm -rf usr/share/{man,doc,info,gnome/help}
1515
# cracklib
1616
rm -rf usr/share/cracklib

‎docs/README.md‎

Lines changed: 4 additions & 17 deletions

‎docs/man/README.md‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎hack/make/.build-deb/docker-engine.manpages‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docs/man/man*/*
1+
man/man*/*

‎hack/make/.build-deb/rules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ override_dh_gencontrol:
99

1010
override_dh_auto_build:
1111
./hack/make.sh dynbinary
12-
# ./docs/man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
12+
# ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
1313

1414
override_dh_auto_test:
1515
./bundles/$(VERSION)/dynbinary/docker -v

‎hack/make/.build-rpm/docker-engine.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ depending on a particular stack or provider.
7171

7272
%build
7373
./hack/make.sh dynbinary
74-
# ./docs/man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
74+
# ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
7575

7676
%check
7777
./bundles/%{_origversion}/dynbinary/docker -v
@@ -113,9 +113,9 @@ install -p -m 644 contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/
113113

114114
# install manpages
115115
install -d %{buildroot}%{_mandir}/man1
116-
install -p -m 644 docs/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1
116+
install -p -m 644 man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1
117117
install -d %{buildroot}%{_mandir}/man5
118-
install -p -m 644 docs/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
118+
install -p -m 644 man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
119119

120120
# add vimfiles
121121
install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc

‎hack/make/build-deb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set -e
3434
debDate="$(date --rfc-2822)"
3535

3636
# if go-md2man is available, pre-generate the man pages
37-
./docs/man/md2man-all.sh -q || true
37+
./man/md2man-all.sh -q || true
3838
# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
3939

4040
# TODO add a configurable knob for _which_ debs to build so we don't have to modify the file or build all of them every time we need to test

‎hack/make/build-rpm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set -e
3838
rpmDate="$(date +'%a %b %d %Y')"
3939

4040
# if go-md2man is available, pre-generate the man pages
41-
./docs/man/md2man-all.sh -q || true
41+
./man/md2man-all.sh -q || true
4242
# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
4343

4444
# TODO add a configurable knob for _which_ rpms to build so we don't have to modify the file or build all of them every time we need to test

‎hack/make/ubuntu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ bundle_ubuntu() {
6060
cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/"
6161

6262
# Include contributed man pages
63-
docs/man/md2man-all.sh -q
63+
man/md2man-all.sh -q
6464
manRoot="$DIR/usr/share/man"
6565
mkdir -p "$manRoot"
66-
for manDir in docs/man/man?; do
66+
for manDir in man/man?; do
6767
manBase="$(basename "$manDir")" # "man1"
6868
for manFile in "$manDir"/*; do
6969
manName="$(basename "$manFile")" # "docker-build.1"

0 commit comments

Comments
 (0)