From dfe360040b5fa3c2e00e0bfc3d6f817dc535ae55 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 17 Feb 2021 21:54:32 -0500 Subject: [PATCH] Spelling * addition * attribute * auditing * availability * available * bandwidth * browser * business * cadence * chartmuseum * client * column * content * demonstrate * described * endpoints * facilitate * github * harbor * information * instance * manual * meaningful * operation * overridden * password * possible * project * refactor * replication * requires * running * scanned * settings * signup * those * unsigned * vulnerability -- Also removes trailing space from a filename Signed-off-by: Josh Soref --- CHANGELOG.md | 8 ++++---- CONTRIBUTING.md | 4 ++-- Makefile | 6 +++--- README.md | 4 ++-- RELEASES.md | 4 ++-- contrib/registryapi/README.md | 2 +- make/photon/prepare/templates/nginx/nginx.http.conf.jinja | 2 +- .../photon/prepare/templates/nginx/nginx.https.conf.jinja | 2 +- make/photon/redis/redis.conf | 4 ++-- src/jobservice/README.md | 2 +- .../edit-project-quotas.component.html | 2 +- .../shared/components/global-search/search.component.scss | 2 +- .../Group1-user-management/1-01-DB-user-registration.md | 2 +- .../1-05-LDAP-user-log-in-log-out.md | 2 +- .../Group1-user-management/1-06-AD-user-log-in-log-out.md | 2 +- .../1-09-admin-create-delete-user.md | 2 +- .../10-04-Clair-data-not-ready-hint.md | 2 +- .../Group10-Vulnerability/10-05-Schedule-daily-scan.md | 2 +- .../10-06-Change-scan-configuration.md | 2 +- ...ot-pull-image-exceed-vulnerability-severity-setting.md | 4 ++-- .../10-09-User-can-pull-scaned-images.md | 6 +++--- .../Group10-Vulnerability/10-10-Manual-scan-all.md | 2 +- .../Group10-Vulnerability/10-11-User-fix-vulnerability.md | 6 +++--- .../Test-10-12-Scan-image-on-push.md | 2 +- .../2-01-DB-user-create-project.md | 2 +- .../2-03-DB-user-push-multiple-projects.md | 2 +- .../2-06-DB-user-delete-projects.md | 2 +- ...reate-project .md => 2-11-LDAP-user-create-project.md} | 0 .../Group2-image-management/2-22-admin-search-projects.md | 2 +- .../Group2-image-management/2-24-admin-delete-projects.md | 2 +- .../3-07-LDAP-usergroup-manage-project-groupmembers.md | 2 +- .../Group5-OVA-install-config/5-06-OVA-Configuration.md | 2 +- .../Group7-Replication/7-01-Proj-replication-rules-add.md | 2 +- .../7-02-Proj-replication-rules-edit.md | 2 +- .../7-04-Proj-replication-rules-filter.md | 2 +- .../Group7-Replication/7-13-Endpoints-endpoints-edit.md | 2 +- .../9-01-DB-user-push-signed-images.md | 6 +++--- .../9-02-DB-user-push-unsigned-images.md | 4 ++-- .../9-03-DB-user-pull-signed-images.md | 2 +- .../9-05-DB-user-delete-signed-images.md | 2 +- .../9-12-LDAP-user-push-unsigned-images.md | 2 +- .../9-13-LDAP-user-pull-signed-images.md | 2 +- .../9-15-LDAP-user-delete-signed-images.md | 2 +- .../9-30-Project-level-content-trust.md | 8 ++++---- tools/migrate_chart/Readme.md | 2 +- tools/swagger/templates/README.md | 6 +++--- 46 files changed, 67 insertions(+), 67 deletions(-) rename tests/testcases/Group2-image-management/{2-11-LDAP-user-create-project .md => 2-11-LDAP-user-create-project.md} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2618ea0b3..8b816aebd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ API explorer integration. End users can now explore and trigger Harbor’s API v * Bumped up Clair to v2.0.8 * Fixed issues in supporting windows images. #6992 #6369 * Removed user-agent check-in notification handler. #5729 -* Fixed the issue global search not working if chartmusuem is not installed #6753 +* Fixed the issue global search not working if chartmuseum is not installed #6753 ## v1.7.4 (2019-03-04) [Full list of issues fixed in v1.7.4](https://github.com/goharbor/harbor/issues?q=is%3Aissue+is%3Aclosed+label%3Atarget%2F1.7.4) @@ -84,7 +84,7 @@ API explorer integration. End users can now explore and trigger Harbor’s API v ## v0.5.0 (2016-12-6) -- Refactory for a new build process +- Refactor for a new build process - Easier configuration for HTTPS in prepare script - Script to collect logs of a Harbor deployment - User can view the storage usage (default location) of Harbor. @@ -100,7 +100,7 @@ For Harbor virtual appliance: ## v0.4.5 (2016-10-31) - Virtual appliance of Harbor for vSphere. -- Refactory for new build process. +- Refactor for new build process. - Easier configuration for HTTPS in prepare step. - Updated documents. - Various bug fixes. @@ -149,6 +149,6 @@ Initial release, key features include - Role based access control (RBAC) - LDAP / AD integration - Graphical user interface (GUI) -- Auditting and logging +- Auditing and logging - RESTful API - Internationalization diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2fdd84a78..1d4fa22be 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,7 +91,7 @@ The folder graph below shows the structure of the source code folder `harbor/src │   ├── scanner │   ├── tag │   ├── task -├── core # Source code for the main busines logic. Contains rest apis and all service infomation. +├── core # Source code for the main business logic. Contains rest apis and all service information. │   ├── api │   ├── auth │   ├── config @@ -336,7 +336,7 @@ Commit changes made in response to review comments to the same branch on your fo ## Reporting issues -It is a great way to contribute to Harbor by reporting an issue. Well-written and complete bug reports are always welcome! Please open an issue on Github and follow the template to fill in required information. +It is a great way to contribute to Harbor by reporting an issue. Well-written and complete bug reports are always welcome! Please open an issue on GitHub and follow the template to fill in required information. Before opening any issue, please look up the existing [issues](https://github.com/goharbor/harbor/issues) to avoid submitting a duplication. If you find a match, you can "subscribe" to it to get notified on updates. If you have additional helpful information about the issue, please leave a comment. diff --git a/Makefile b/Makefile index 969474c71..d1b7a8efa 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # # build: build Harbor docker images from photon baseimage # -# install: include compile binarys, build images, prepare specific \ +# install: include compile binaries, build images, prepare specific \ # version composefile and startup Harbor instance # # start: startup Harbor instance @@ -54,10 +54,10 @@ # cleanpackage: remove online/offline install package # # other example: -# clean specific version binarys and images: +# clean specific version binaries and images: # make clean -e VERSIONTAG=[TAG] # note**: If commit new code to github, the git commit TAG will \ -# change. Better use this commond clean previous images and \ +# change. Better use this command clean previous images and \ # files with specific TAG. # By default DEVFLAG=true, if you want to release new version of Harbor, \ # should setting the flag to false. diff --git a/README.md b/README.md index a1781f38d..e3687462d 100644 --- a/README.md +++ b/README.md @@ -30,12 +30,12 @@ Harbor is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CN * **Cloud native registry**: With support for both container images and [Helm](https://helm.sh) charts, Harbor serves as registry for cloud native environments like container runtimes and orchestration platforms. * **Role based access control**: Users access different repositories through 'projects' and a user can have different permission for images or Helm charts under a project. -* **Policy based replication**: Images and charts can be replicated (synchronized) between multiple registry instances based on policies with using filters (repository, tag and label). Harbor automatically retries a replication if it encounters any errors. This can be used to assist loadbalancing, achieve high availabiliy, and faciliate multi-datacenter deployments in hybrid and multi-cloud scenarios. +* **Policy based replication**: Images and charts can be replicated (synchronized) between multiple registry instances based on policies with using filters (repository, tag and label). Harbor automatically retries a replication if it encounters any errors. This can be used to assist loadbalancing, achieve high availability, and facilitate multi-datacenter deployments in hybrid and multi-cloud scenarios. * **Vulnerability Scanning**: Harbor scans images regularly for vulnerabilities and has policy checks to prevent vulnerable images from being deployed. * **LDAP/AD support**: Harbor integrates with existing enterprise LDAP/AD for user authentication and management, and supports importing LDAP groups into Harbor that can then be given permissions to specific projects. * **OIDC support**: Harbor leverages OpenID Connect (OIDC) to verify the identity of users authenticated by an external authorization server or identity provider. Single sign-on can be enabled to log into the Harbor portal. * **Image deletion & garbage collection**: System admin can run garbage collection jobs so that images(dangling manifests and unreferenced blobs) can be deleted and their space can be freed up periodically. -* **Notary**: Support signing container images using Docker Content Trust (leveraging Notary) for guaranteeing authenticity and provenance. In additon, policies that prevent unsigned images from being deployed can also be activated. +* **Notary**: Support signing container images using Docker Content Trust (leveraging Notary) for guaranteeing authenticity and provenance. In addition, policies that prevent unsigned images from being deployed can also be activated. * **Graphical user portal**: User can easily browse, search repositories and manage projects. * **Auditing**: All the operations to the repositories are tracked through logs. * **RESTful API**: RESTful APIs are provided to facilitate administrative operations, and are easy to use for integration with external systems. An embedded Swagger UI is available for exploring and testing the API. diff --git a/RELEASES.md b/RELEASES.md index b9cf39210..1be17ee36 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -5,10 +5,10 @@ This document describes the versioning and release process of Harbor. This docum Harbor releases will be versioned using dotted triples, similar to [Semantic Version](http://semver.org/). For this specific document, we will refer to the respective components of this triple as `..`. The version number may have additional information, such as "-rc1,-rc2,-rc3" to mark release candidate builds for earlier access. Such releases will be considered as "pre-releases". ### Major and Minor Releases -Major and minor releases of Harbor will be branched from master when the release reaches to `RC(release candidate)` state. The branch format should follow `release-..0`. For example, once the release `v1.0.0` reaches to RC, a branch will be created with the format `release-1.0.0`. When the release reaches to `GA(General Available)` state, The tag with format `v..` and should be made with command `git tag -s v..`. The release cadency is around 3 months, might be adjusted based on open source event, but will communicate it clearly. +Major and minor releases of Harbor will be branched from master when the release reaches to `RC(release candidate)` state. The branch format should follow `release-..0`. For example, once the release `v1.0.0` reaches to RC, a branch will be created with the format `release-1.0.0`. When the release reaches to `GA(General Available)` state, The tag with format `v..` and should be made with command `git tag -s v..`. The release cadence is around 3 months, might be adjusted based on open source event, but will communicate it clearly. ### Patch releases -Patch releases are based on the major/minor release branch, the release cadency for patch release of recent minor release is one month to solve critical community and security issues. The cadency for patch release of recent minus two minor releases are on-demand driven based on the severity of the issue to be fixed. +Patch releases are based on the major/minor release branch, the release cadence for patch release of recent minor release is one month to solve critical community and security issues. The cadence for patch release of recent minus two minor releases are on-demand driven based on the severity of the issue to be fixed. ### Pre-releases `Pre-releases:mainly the different RC builds` will be compiled from their corresponding branches. Please note they are done to assist in the stabilization process, no guarantees are provided. diff --git a/contrib/registryapi/README.md b/contrib/registryapi/README.md index 5a2d71bf4..83be82022 100644 --- a/contrib/registryapi/README.md +++ b/contrib/registryapi/README.md @@ -18,7 +18,7 @@ res = api.deleteManifest('public/ubuntu', '23424545**4343') operations for repo, tag, manifest ``` usage: -./cli.py --username username --password passwrod --registry_endpoint http://www.your_registry_url.com/ target action params +./cli.py --username username --password password --registry_endpoint http://www.your_registry_url.com/ target action params target can be: repo, tag, manifest action can be: list, get, delete diff --git a/make/photon/prepare/templates/nginx/nginx.http.conf.jinja b/make/photon/prepare/templates/nginx/nginx.http.conf.jinja index 0ad9dd73d..a7046e3fb 100644 --- a/make/photon/prepare/templates/nginx/nginx.http.conf.jinja +++ b/make/photon/prepare/templates/nginx/nginx.http.conf.jinja @@ -51,7 +51,7 @@ http { add_header X-Frame-Options DENY; add_header Content-Security-Policy "frame-ancestors 'none'"; - # costumized location config file can place to /etc/nginx/etc with prefix harbor.http. and suffix .conf + # customized location config file can place to /etc/nginx/etc with prefix harbor.http. and suffix .conf include /etc/nginx/conf.d/harbor.http.*.conf; location / { diff --git a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja index cc162e0b8..e05e01ec9 100644 --- a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja +++ b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja @@ -69,7 +69,7 @@ http { add_header X-Frame-Options DENY; add_header Content-Security-Policy "frame-ancestors 'none'"; - # costumized location config file can place to /etc/nginx dir with prefix harbor.https. and suffix .conf + # customized location config file can place to /etc/nginx dir with prefix harbor.https. and suffix .conf include /etc/nginx/conf.d/harbor.https.*.conf; location / { diff --git a/make/photon/redis/redis.conf b/make/photon/redis/redis.conf index 9b56e6573..e36ef8c8c 100644 --- a/make/photon/redis/redis.conf +++ b/make/photon/redis/redis.conf @@ -202,7 +202,7 @@ always-show-logo yes # Will save the DB if both the given number of seconds and the given # number of write operations against the DB occurred. # -# In the example below the behaviour will be to save: +# In the example below the behavior will be to save: # after 900 sec (15 min) if at least 1 key changed # after 300 sec (5 min) if at least 10 keys changed # after 60 sec if at least 10000 keys changed @@ -637,7 +637,7 @@ slave-priority 100 # it with the specified string. # 4) During replication, when a slave performs a full resynchronization with # its master, the content of the whole database is removed in order to -# load the RDB file just transfered. +# load the RDB file just transferred. # # In all the above cases the default is to delete objects in a blocking way, # like if DEL was called. However you can configure each case specifically diff --git a/src/jobservice/README.md b/src/jobservice/README.md index 22fa137b5..efacd760d 100644 --- a/src/jobservice/README.md +++ b/src/jobservice/README.md @@ -172,7 +172,7 @@ ctx.Checkin("30%") Here is a demo job: ```go -// DemoJob is the job to demostrate the job interface. +// DemoJob is the job to demonstrate the job interface. type DemoJob struct{} // MaxFails is implementation of same method in Interface. diff --git a/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html index 8aedc8980..2c900a23a 100644 --- a/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html @@ -31,7 +31,7 @@ data-displayval="100%">