Skip to content

Commit

Permalink
Update new_docs -> docs everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
gmarz committed Jul 22, 2014
1 parent 27de12e commit 73f2331
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .deployment
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[config]
project = new_docs/build
project = docs/build
2 changes: 1 addition & 1 deletion build/build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ let buildDocs = fun action ->
let node = @"build\tools\Node.js\node.exe"
let wintersmith = @"..\build\tools\node_modules\wintersmith\bin\wintersmith"
ExecProcess (fun p ->
p.WorkingDirectory <- "new_docs"
p.WorkingDirectory <- "docs"
p.FileName <- node
p.Arguments <- sprintf "\"%s\" %s" wintersmith action
)
Expand Down
2 changes: 1 addition & 1 deletion docs/build/building.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2 id="buildscript">Buildscript</h2>
<h3 id="build-target">Build target</h3>
<p>Running <code>build.bat</code> will default to running the <code>Build</code> target which will create certificates in the right place if they do not exist, build the application and run all the unit tests. The resulting assemblies are placed in <code>build/output</code>.</p>
<h3 id="docpreview-target">DocPreview target</h3>
<p>Running <code>build.bat DocPreview</code> will serve the files under <code>new_docs</code> at <code>http://localhost:8080</code> with live-reload setup. Usefull only when you are working on documentation.</p>
<p>Running <code>build.bat DocPreview</code> will serve the files under <code>docs</code> at <code>http://localhost:8080</code> with live-reload setup. Usefull only when you are working on documentation.</p>
<h3 id="release-target">Release target</h3>
<p>Running <code>build.bat Release versionnumber</code> will create nuget packages in <code>output/_packages</code>. This could be useful if you need a feature that is not yet released you can temporarily switch to local nuget packages.</p>
<p>Release will call the build target and in addition patch the assembly files, build the documentation files. </p>
Expand Down
2 changes: 1 addition & 1 deletion docs/contents/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ All of these will be downloaded and installed locally in your repository the fir
Running `build.bat` will default to running the `Build` target which will create certificates in the right place if they do not exist, build the application and run all the unit tests. The resulting assemblies are placed in `build/output`.

### DocPreview target
Running `build.bat DocPreview` will serve the files under `new_docs` at `http://localhost:8080` with live-reload setup. Usefull only when you are working on documentation.
Running `build.bat DocPreview` will serve the files under `docs` at `http://localhost:8080` with live-reload setup. Usefull only when you are working on documentation.

### Release target
Running `build.bat Release versionnumber` will create nuget packages in `output/_packages`. This could be useful if you need a feature that is not yet released you can temporarily switch to local nuget packages.
Expand Down
16 changes: 8 additions & 8 deletions src/Elasticsearch.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Tests.Integration", "T
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Documentation", "_Documentation", "{E30CA256-C9A8-487A-94B7-D6B79D70F774}"
ProjectSection(SolutionItems) = preProject
..\new_docs\config.json = ..\new_docs\config.json
..\docs\config.json = ..\docs\config.json
..\license.txt = ..\license.txt
..\new_docs\package.json = ..\new_docs\package.json
..\docs\package.json = ..\docs\package.json
..\README.markdown = ..\README.markdown
EndProjectSection
EndProject
Expand Down Expand Up @@ -67,41 +67,41 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "contents", "http://localhos
UseIISExpress = "true"
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
Debug.AspNetCompiler.VirtualPath = "/localhost_65293"
Debug.AspNetCompiler.PhysicalPath = "..\new_docs\contents\"
Debug.AspNetCompiler.PhysicalPath = "..\docs\contents\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_65293\"
Debug.AspNetCompiler.Updateable = "true"
Debug.AspNetCompiler.ForceOverwrite = "true"
Debug.AspNetCompiler.FixedNames = "false"
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.VirtualPath = "/localhost_65293"
Release.AspNetCompiler.PhysicalPath = "..\new_docs\contents\"
Release.AspNetCompiler.PhysicalPath = "..\docs\contents\"
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_65293\"
Release.AspNetCompiler.Updateable = "true"
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
SlnRelativePath = "..\new_docs\contents\"
SlnRelativePath = "..\docs\contents\"
EndProjectSection
EndProject
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "templates", "http://localhost:65311", "{DF8388A1-4778-411E-A3F5-1062CDE8621F}"
ProjectSection(WebsiteProperties) = preProject
UseIISExpress = "true"
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
Debug.AspNetCompiler.VirtualPath = "/localhost_65311"
Debug.AspNetCompiler.PhysicalPath = "..\new_docs\templates\"
Debug.AspNetCompiler.PhysicalPath = "..\docs\templates\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_65311\"
Debug.AspNetCompiler.Updateable = "true"
Debug.AspNetCompiler.ForceOverwrite = "true"
Debug.AspNetCompiler.FixedNames = "false"
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.VirtualPath = "/localhost_65311"
Release.AspNetCompiler.PhysicalPath = "..\new_docs\templates\"
Release.AspNetCompiler.PhysicalPath = "..\docs\templates\"
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_65311\"
Release.AspNetCompiler.Updateable = "true"
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
SlnRelativePath = "..\new_docs\templates\"
SlnRelativePath = "..\docs\templates\"
EndProjectSection
EndProject
Global
Expand Down

0 comments on commit 73f2331

Please sign in to comment.