honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging master into working branch.

This commit is contained in:
Diederik Muylwyk 2019-09-30 09:15:55 -04:00
parent 3e173bb07c 663431f571
commit 8b5888723a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/model/narrative_generation.md
View File

@ -61,7 +61,6 @@ To use your own templates for narrative generation, simply create one or more te
Then create a properties file which describes your templates. In this properties file, each resource to be defined has a pair or properties. Then create a properties file which describes your templates. In this properties file, each resource to be defined has a pair or properties.
The first (name.class) defines the class name of the resource to define a template for. The second (name.narrative) defines the path/classpath to the template file. The format of this path is `file:/path/foo.html` or `classpath:/com/classpath/foo.html`. The first (name.class) defines the class name of the resource to define a template for. The second (name.narrative) defines the path/classpath to the template file. The format of this path is `file:/path/foo.html` or `classpath:/com/classpath/foo.html`.
</p>
```properties ```properties
# Two property lines in the file per template # Two property lines in the file per template

4
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server/cors.md
View File

@ -90,5 +90,7 @@ In your web.xml file (within the WEB-INF directory in your WAR file), the follow
<filter-mapping> <filter-mapping>
<filter-name>CORS Filter</filter-name> <filter-name>CORS Filter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping>]]></source> </filter-mapping>
``` ```