Skip to content

Commit

Permalink
Merge pull request #43 from docker/17.06
Browse files Browse the repository at this point in the history
Update compliance narratives and docs for 17.06
  • Loading branch information
anweiss authored Sep 21, 2017
2 parents 1bf6278 + 91992bc commit 6891d02
Show file tree
Hide file tree
Showing 32 changed files with 4,825 additions and 1,913 deletions.
166 changes: 165 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,168 @@ jspm_packages
*.tgz

# Yarn Integrity file
.yarn-integrity
.yarn-integrity

### Ruby ###
*.gem
*.rbc
/.config
/coverage/
/InstalledFiles
/pkg/
/spec/reports/
/spec/examples.txt
/test/tmp/
/test/version_tmp/
/tmp/

# Used by dotenv library to load environment variables.
# .env

## Specific to RubyMotion:
.dat*
.repl_history
build/
*.bridgesupport
build-iPhoneOS/
build-iPhoneSimulator/

## Specific to RubyMotion (use of CocoaPods):
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# vendor/Pods/

## Documentation cache and generated files:
/.yardoc/
/_yardoc/
/doc/
/rdoc/

## Environment normalization:
/.bundle/
/vendor/bundle
/lib/bundler/man/

# for a library or gem, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# Gemfile.lock
# .ruby-version
# .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

### RubyMine ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### RubyMine+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### RubyMine+all Patch ###
# Ignores the whole idea folder
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/


profile-attribute.yml
ucp-bundle*
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ By licensing this project under the CC0 Public Domain, we've made it easy to mak

## Reporting issues

Much of this content is based on the existing documentation provided at https://docs.docker.com/. Bear in mind that this repository is not meant to house issues specific to the Docker docs site. Please refer to the public source repo at https://github.com/docker/docker.github.io for any issues related to those docs.
Much of this content is based on the existing documentation provided at https://docs.docker.com/. Bear in mind that this repository is not meant to house issues specific to the Docker docs site. Please refer to the public source repo at https://github.com/docker/docker.github.io for any issues related to those docs. We do, however, maintain a subset of compliance documentation for docs.docker.com in the [`docs/`](https://github.com/docker/compliance/tree/17.06/docs/compliance) directory. Issues related to those docs can be submitted in this repository.

Instead, this project should be used to report issues specific to wording in the narratives, typos, bugs in the nlp tool, and/or content/feature requests.
This project should be used to report issues specific to wording in the narratives, typos, bugs in any of the tooling, and/or content/feature requests.

## Submitting pull requests

To keep things simple, we're encouraging folks to adopt the forking workflow. Pull requests should be submitted on a separate branch from your own fork of the repository. Any updates and commentary should be clear and concise. If you're looking to make changes to the `component.yaml` files, please try to limit each narrative's text block line length to 80 characters. There are various tools and editor extensions that can help automate this.
To keep things simple, we're encouraging folks to adopt the forking workflow. Pull requests should be submitted on a separate branch from your own fork of the repository. Any updates and commentary should be clear and concise. If you're looking to make changes to the `component.yaml` files, please try to limit each narrative's text block line length to 80 characters. There are various tools and editor extensions that can help automate this.
Loading

0 comments on commit 6891d02

Please sign in to comment.