summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJob van der Voort <jobvandervoort@gmail.com>2014-04-02 16:15:55 +0200
committerJob van der Voort <jobvandervoort@gmail.com>2014-04-02 16:15:55 +0200
commit3acad539becb29a778bc438003db9e8e260b6411 (patch)
tree2eea5e3cd001f85257b823ede25ff90060e840e7 /doc
parentc66c84a40d79be3d8d361753c13245093cf7e672 (diff)
downloadgitlab-ce-3acad539becb29a778bc438003db9e8e260b6411.tar.gz
workflow index; newlines; small description
Diffstat (limited to 'doc')
-rw-r--r--doc/README.md2
-rw-r--r--doc/workflow/README.md2
-rw-r--r--doc/workflow/project_features.md23
3 files changed, 21 insertions, 6 deletions
diff --git a/doc/README.md b/doc/README.md
index d85a2d854d3..3b942abc399 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -15,4 +15,4 @@
+ [System hooks](system_hooks/system_hooks.md)
+ [Update](update/README.md)
+ [Web hooks](web_hooks/web_hooks.md)
-+ [Workflow](workflow/workflow.md)
++ [Workflow](workflow/README.md)
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
new file mode 100644
index 00000000000..efc28d06e71
--- /dev/null
+++ b/doc/workflow/README.md
@@ -0,0 +1,2 @@
++ [Workflow](workflow/workflow.md)
++ [Project Features](workflow/project_features.md)
diff --git a/doc/workflow/project_features.md b/doc/workflow/project_features.md
index 6a5ba2639c4..25fe4032570 100644
--- a/doc/workflow/project_features.md
+++ b/doc/workflow/project_features.md
@@ -1,22 +1,35 @@
+When in a Project -> Settings, you will find Features on the bottom of the page that you can toggle.
+Below you will find a more elaborate explanation of each of these.
+
+
## Issues
-Issues is a really powerful, but lightweight issue tracking system. You can make tickets, assign them to people, file them under milestones, order them with labels and have discussion in them. They integrate deeply into GitLab and are easily referenced from anywhere by using # and the issuenumber. Internally, at GitLab.com, we use this for all our project management needs.
+Issues is a really powerful, but lightweight issue tracking system.
+You can make tickets, assign them to people, file them under milestones, order them with labels and have discussion in them.
+They integrate deeply into GitLab and are easily referenced from anywhere by using # and the issuenumber.
+At GitLab.com, we use this for all our project management needs.
## Merge Requests
-Using a merge request, you can review and discuss code before it is merged in the branch of your code. As with issues, it can be assigned; people, issues, etc can be refereced; milestones attached. We see it as an integral part of working together on code and couldn't work without it.
+Using a merge request, you can review and discuss code before it is merged in the branch of your code.
+As with issues, it can be assigned; people, issues, etc. can be refereced; milestones attached.
+We see it as an integral part of working together on code and couldn't work without it.
## Wiki
-This is a separate system for documentation, built right into GitLab. It is source controlled and is very convenient if you don't want to keep you documentation in your source code, but you do want to keep it in your GitLab project.
+This is a separate system for documentation, built right into GitLab.
+It is source controlled and is very convenient if you don't want to keep you documentation in your source code, but you do want to keep it in your GitLab project.
## Wall
-For simple, project specific conversations, the wall can be used. It's very lightweight and simple and works well if you're not interested in using issues, but still want to occasionally communicate within a project.
+For simple, project specific conversations, the wall can be used.
+It's very lightweight and simple and works well if you're not interested in using issues, but still want to occasionally communicate within a project.
## Snippets
-Snippets are little bits of code or text. This is a nice place to put code or text that is used semi-regularly within the project, but does not belong in source control. For example, a specific config file that is used by > the team that is only valid for the people that work on the code.
+Snippets are little bits of code or text.
+This is a nice place to put code or text that is used semi-regularly within the project, but does not belong in source control.
+For example, a specific config file that is used by > the team that is only valid for the people that work on the code.