docs: rename "doc" directory to "docs"

Also remove `CONTRIBUTING.adoc` and `FAQ.adoc` from project root since GitHub knows to pick them up from the docs directory. Fixes #2273
nix-community · Aug 17, 2021 · 7ef3db3 · 7ef3db3
1 parent ad0fc08
commit 7ef3db3
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 6 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,7 +15,7 @@ pull-request.
 
 Also make sure to read the guidelines found at
 
-  https://github.com/nix-community/home-manager/blob/master/doc/contributing.adoc#sec-guidelines
+  https://github.com/nix-community/home-manager/blob/master/docs/contributing.adoc#sec-guidelines
 
 -->
 
@@ -35,7 +35,7 @@ Also make sure to read the guidelines found at
     {long description}
     ```
 
-    See [CONTRIBUTING](https://github.com/nix-community/home-manager/blob/master/doc/contributing.adoc#sec-commit-style) for more information and [recent commit messages](https://github.com/nix-community/home-manager/commits/master) for examples.
+    See [CONTRIBUTING](https://github.com/nix-community/home-manager/blob/master/docs/contributing.adoc#sec-commit-style) for more information and [recent commit messages](https://github.com/nix-community/home-manager/commits/master) for examples.
 
 - If this PR adds a new module
 

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
diff --git a/FAQ.adoc b/FAQ.adoc
diff --git a/default.nix b/default.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { } }:
 
 rec {
-  docs = with import ./doc { inherit pkgs; }; {
+  docs = with import ./docs { inherit pkgs; }; {
     html = manual.html;
     manPages = manPages;
     json = options.json;

diff --git a/doc/contributing.adoc → docs/contributing.adoc b/doc/contributing.adoc → docs/contributing.adoc
diff --git a/doc/default.nix → docs/default.nix b/doc/default.nix → docs/default.nix
diff --git a/doc/faq.adoc → docs/faq.adoc b/doc/faq.adoc → docs/faq.adoc
diff --git a/doc/installation.adoc → docs/installation.adoc b/doc/installation.adoc → docs/installation.adoc
diff --git a/doc/man-configuration.xml → docs/man-configuration.xml b/doc/man-configuration.xml → docs/man-configuration.xml
diff --git a/doc/man-home-manager.xml → docs/man-home-manager.xml b/doc/man-home-manager.xml → docs/man-home-manager.xml
diff --git a/doc/man-pages.xml → docs/man-pages.xml b/doc/man-pages.xml → docs/man-pages.xml
diff --git a/doc/manual.xml → docs/manual.xml b/doc/manual.xml → docs/manual.xml
diff --git a/doc/release-notes/release-notes.adoc → docs/release-notes/release-notes.adoc b/doc/release-notes/release-notes.adoc → docs/release-notes/release-notes.adoc
diff --git a/doc/release-notes/rl-1809.adoc → docs/release-notes/rl-1809.adoc b/doc/release-notes/rl-1809.adoc → docs/release-notes/rl-1809.adoc
diff --git a/doc/release-notes/rl-1903.adoc → docs/release-notes/rl-1903.adoc b/doc/release-notes/rl-1903.adoc → docs/release-notes/rl-1903.adoc
diff --git a/doc/release-notes/rl-1909.adoc → docs/release-notes/rl-1909.adoc b/doc/release-notes/rl-1909.adoc → docs/release-notes/rl-1909.adoc
diff --git a/doc/release-notes/rl-2003.adoc → docs/release-notes/rl-2003.adoc b/doc/release-notes/rl-2003.adoc → docs/release-notes/rl-2003.adoc
diff --git a/doc/release-notes/rl-2009.adoc → docs/release-notes/rl-2009.adoc b/doc/release-notes/rl-2009.adoc → docs/release-notes/rl-2009.adoc
diff --git a/doc/release-notes/rl-2105.adoc → docs/release-notes/rl-2105.adoc b/doc/release-notes/rl-2105.adoc → docs/release-notes/rl-2105.adoc
diff --git a/doc/release-notes/rl-2111.adoc → docs/release-notes/rl-2111.adoc b/doc/release-notes/rl-2111.adoc → docs/release-notes/rl-2111.adoc
diff --git a/doc/writing-modules.adoc → docs/writing-modules.adoc b/doc/writing-modules.adoc → docs/writing-modules.adoc
diff --git a/modules/manual.nix b/modules/manual.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.manual;
 
-  docs = import ../doc { inherit lib pkgs; };
+  docs = import ../docs { inherit lib pkgs; };
 
 in