]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Revert "Update contributing.md with correct branch (`v4-dev` instead of `master`)"
authorXhmikosR <xhmikosr@gmail.com>
Mon, 24 Sep 2018 19:47:02 +0000 (22:47 +0300)
committerXhmikosR <xhmikosr@gmail.com>
Mon, 8 Oct 2018 17:12:34 +0000 (20:12 +0300)
CONTRIBUTING.md

index acde27cf0b73f80c55af6e95ce4c51791ae266b5..13be35f1e6d7acc23a82bf9dcb45a2584326883d 100644 (file)
@@ -157,12 +157,13 @@ project (indentation, accurate comments, etc.) and any other requirements
 
 **Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js`
 directly!** Those files are automatically generated. You should edit the
-source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss)
-and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/v4-dev/js) instead.
+source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less),
+[`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss) (for Bootstrap v4),
+and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead.
 
 Similarly, when contributing to Bootstrap's documentation, you should edit the
 documentation source files in
-[the `/bootstrap/docs/4.0` directory of the `v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev/docs/4.0).
+[the `/bootstrap/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/docs).
 **Do not edit the `gh-pages` branch.** That branch is generated from the
 documentation source files and is managed separately by the Bootstrap Core Team.
 
@@ -184,8 +185,8 @@ included in the project:
 2. If you cloned a while ago, get the latest changes from upstream:
 
    ```bash
-   git checkout v4-dev
-   git pull upstream v4-dev
+   git checkout master
+   git pull upstream master
    ```
 
 3. Create a new topic branch (off the main project development branch) to
@@ -204,7 +205,7 @@ included in the project:
 5. Locally merge (or rebase) the upstream development branch into your topic branch:
 
    ```bash
-   git pull [--rebase] upstream v4-dev
+   git pull [--rebase] upstream master
    ```
 
 6. Push your topic branch up to your fork:
@@ -214,7 +215,7 @@ included in the project:
    ```
 
 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
-    with a clear title and description against the `v4-dev` branch.
+    with a clear title and description against the `master` branch.
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
 license your work under the terms of the [MIT License](LICENSE) (if it