浏览代码

Clean difference between master any my development branch

Robert Middleswarth 3 年之前
父节点
当前提交
d6775877d1
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 5 1
      docs/README.md
  2. 1 1
      pi-hosted_template/template/portainer-v2.json

+ 5 - 1
docs/README.md

@@ -33,6 +33,7 @@ You're done! Now just click App Templates and deploy applications!
 
 [![Pi-Hosted Playlist](https://i.ytimg.com/vi/cO2-gQ09Jj0/hqdefault.jpg?sqp=-oaymwEXCNACELwBSFryq4qpAwkIARUAAIhCGAE=&rs=AOn4CLAfgdX8HlHas2CddSmgwJzergnTzQ)](https://www.youtube.com/watch?v=cO2-gQ09Jj0&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc)
 
+
 |   | Episode                                                                                                                                                                       |
 |---|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | 1 | [Raspberry Pi 4 Server Setup, Docker Install, Portainer Install, Shell In A Box](https://www.youtube.com/watch?v=cO2-gQ09Jj0&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=1) |
@@ -43,10 +44,13 @@ You're done! Now just click App Templates and deploy applications!
 | 6 |     [Portainer.io App Template for Raspberry Pi arm/arm64 I Need Your Help!](https://www.youtube.com/watch?v=Zn-VELlaIN4&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=6)     |
 | 7 |                   [Upgrading Portainer and Updating Containers](https://www.youtube.com/watch?v=q3wKqk8qVS8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=7)                  |
 | 8 |                         [Raspberry Pi Docker Monitoring](https://www.youtube.com/watch?v=IoD3vFuep64&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=8)                         |
-
+=======
 ### Addition Documentation can be found in the Docs Folder
+
 https://github.com/novaspirit/pi-hosted/tree/master/docs
 
+
+
 ### Contributors
 
 See the list of [contributors](https://github.com/novaspirit/pi-hosted/graphs/contributors) who participated in this project.

+ 1 - 1
pi-hosted_template/template/portainer-v2.json

@@ -1344,7 +1344,7 @@
 				"Proxy",
 				"Tools"
 			],
-			"description": "Nginx Proxy Manager enables you to easily forward to your websites running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.  Requires running the script rpi_nginx-proxy-manager.sh before installing the template",
+			"description": "Nginx Proxy Manager enables you to easily forward to your websites running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.  Please see the install document at https://github.com/novaspirit/pi-hosted/tree/master/docs installing the template",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/pi-hosted_template/images/proxy_mgr.png",
 			"name": "nginx-proxy-manager",
 			"platform": "linux",